From 9a250f78dfd63c8b93938e332838738bada62c8b Mon Sep 17 00:00:00 2001 From: Default email Date: Sun, 3 May 2020 19:38:23 +0200 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: 8536aeb4154f5458994080bc4cf542695c144739 --- third_party/nixpkgs/.github/CODEOWNERS | 3 +- third_party/nixpkgs/.github/CONTRIBUTING.md | 9 +- .../nixpkgs/.github/PULL_REQUEST_TEMPLATE.md | 11 +- .../doc/contributing/submitting-changes.xml | 48 +- .../doc/languages-frameworks/index.xml | 1 + .../doc/languages-frameworks/php.section.md | 105 +- third_party/nixpkgs/lib/tests/maintainers.nix | 11 +- third_party/nixpkgs/lib/tests/release.nix | 15 +- .../nixpkgs/maintainers/maintainer-list.nix | 36 +- third_party/nixpkgs/maintainers/team-list.nix | 23 + .../doc/manual/configuration/x-windows.xml | 1 + .../doc/manual/installation/installing.xml | 5 + .../doc/manual/release-notes/rl-2009.xml | 145 +- .../nixos/lib/test-driver/test-driver.py | 26 +- .../azure-new/examples/basic/image.nix | 2 +- .../nixos/modules/config/fonts/fontdir.nix | 1 + .../modules/config/fonts/ghostscript.nix | 1 + .../nixpkgs/nixos/modules/config/ldap.nix | 2 + .../nixpkgs/nixos/modules/config/nsswitch.nix | 139 +- .../installer/cd-dvd/installation-cd-base.nix | 5 +- .../nixpkgs/nixos/modules/module-list.nix | 1 - .../modules/profiles/docker-container.nix | 9 +- .../nixos/modules/programs/chromium.nix | 10 +- .../nixpkgs/nixos/modules/programs/fish.nix | 4 + .../nixpkgs/nixos/modules/programs/xonsh.nix | 27 +- third_party/nixpkgs/nixos/modules/rename.nix | 4 + .../nixpkgs/nixos/modules/security/acme.nix | 4 +- .../nixos/modules/security/apparmor-suid.nix | 1 + .../nixos/modules/security/google_oslogin.nix | 1 + .../nixpkgs/nixos/modules/security/pam.nix | 27 +- .../nixpkgs/nixos/modules/security/prey.nix | 51 - .../modules/services/cluster/k3s/default.nix | 4 +- .../continuous-integration/gitlab-runner.nix | 540 +- .../nixos/modules/services/mail/postfix.nix | 1 + .../nixos/modules/services/mail/roundcube.nix | 2 +- .../modules/services/mail/spamassassin.nix | 1 + .../nixos/modules/services/misc/autofs.nix | 1 + .../nixos/modules/services/misc/disnix.nix | 5 +- .../nixos/modules/services/misc/gitlab.nix | 2 +- .../nixos/modules/services/misc/octoprint.nix | 9 +- .../nixos/modules/services/misc/pykms.nix | 1 + .../nixos/modules/services/misc/sssd.nix | 5 + .../services/networking/gogoclient.nix | 1 + .../modules/services/networking/hostapd.nix | 2 + .../modules/services/networking/openfire.nix | 1 + .../modules/services/networking/prosody.nix | 387 +- .../modules/services/networking/prosody.xml | 88 + .../modules/services/networking/ssh/lshd.nix | 6 + .../modules/services/networking/tcpcrypt.nix | 1 + .../modules/services/networking/thelounge.nix | 1 - .../modules/services/networking/wicd.nix | 1 + .../modules/services/networking/yggdrasil.nix | 11 +- .../nixos/modules/services/printing/cupsd.nix | 16 +- .../nixos/modules/services/system/nscd.nix | 6 +- .../nixos/modules/services/torrent/deluge.nix | 4 +- .../modules/services/web-apps/mediawiki.nix | 23 +- .../modules/services/web-apps/nextcloud.nix | 4 +- .../web-servers/apache-httpd/default.nix | 45 +- .../apache-httpd/vhost-options.nix | 2 +- .../services/web-servers/jboss/default.nix | 1 + .../x11/desktop-managers/pantheon.xml | 2 +- .../services/x11/display-managers/gdm.nix | 3 +- .../services/x11/hardware/digimend.nix | 7 +- .../nixos/modules/system/boot/networkd.nix | 141 +- .../nixos/modules/virtualisation/ec2-amis.nix | 54 +- .../virtualisation/nixos-containers.nix | 2 +- .../nixos/modules/virtualisation/podman.nix | 44 +- .../nixos/modules/virtualisation/qemu-vm.nix | 2 +- .../nixos/modules/virtualisation/xen-dom0.nix | 11 +- .../nixpkgs/nixos/release-combined.nix | 2 + third_party/nixpkgs/nixos/release.nix | 8 +- third_party/nixpkgs/nixos/tests/acme.nix | 5 +- third_party/nixpkgs/nixos/tests/all-tests.nix | 2 + third_party/nixpkgs/nixos/tests/elk.nix | 1 + .../nixos/tests/google-oslogin/default.nix | 18 +- .../nixos/tests/google-oslogin/server.py | 79 +- third_party/nixpkgs/nixos/tests/mediawiki.nix | 7 + third_party/nixpkgs/nixos/tests/php/fpm.nix | 4 +- third_party/nixpkgs/nixos/tests/php/httpd.nix | 4 +- third_party/nixpkgs/nixos/tests/php/pcre.nix | 4 +- ...ystemd-networkd-ipv6-prefix-delegation.nix | 295 + .../nixpkgs/nixos/tests/xmpp/prosody.nix | 85 +- .../nixos/tests/xmpp/xmpp-sendmessage.nix | 91 +- .../applications/audio/clementine/default.nix | 4 +- .../applications/audio/ft2-clone/default.nix | 4 +- .../audio/pulseeffects/default.nix | 5 + .../applications/audio/puredata/default.nix | 4 +- .../applications/audio/qmidinet/default.nix | 4 +- .../audio/schismtracker/default.nix | 29 +- .../applications/blockchains/bitcoin-abc.nix | 4 +- .../applications/blockchains/clightning.nix | 4 +- .../pkgs/applications/blockchains/lnd.nix | 8 +- .../blockchains/monero-gui/default.nix | 4 +- .../blockchains/monero/default.nix | 4 +- .../applications/blockchains/vertcoin.nix | 4 +- .../zcash/librustzcash/default.nix | 2 +- .../editors/android-studio/default.nix | 12 +- .../editors/emacs-modes/elpa-generated.nix | 96 +- .../editors/emacs-modes/emacspeak/default.nix | 43 + .../emacs-modes/filesets-plus/default.nix | 22 - .../editors/emacs-modes/header2/default.nix | 23 - .../editors/emacs-modes/hexrgb/default.nix | 23 - .../editors/emacs-modes/icicles/default.nix | 43 - .../emacs-modes/lib-requires/default.nix | 23 - .../editors/emacs-modes/libgenerated.nix | 9 +- .../editors/emacs-modes/manual-packages.nix | 17 +- .../editors/emacs-modes/melpa-packages.nix | 155 +- .../emacs-modes/recipes-archive-melpa.json | 5614 ++++++++++------- .../emacs-modes/thingatpt-plus/default.nix | 23 - .../editors/emacs-modes/yaoddmuse/default.nix | 30 - .../applications/editors/jetbrains/common.nix | 6 +- .../editors/jetbrains/default.nix | 20 +- .../applications/editors/rstudio/default.nix | 16 +- .../graphics/azpainter/default.nix | 15 +- .../graphics/darktable/default.nix | 4 +- .../applications/graphics/drawio/default.nix | 4 +- .../applications/graphics/fstl/default.nix | 4 +- .../applications/graphics/qimgv/default.nix | 17 +- .../graphics/qimgv/qt5-12-compat.diff | 13 + .../sane/backends/brscan4/default.nix | 6 +- .../applications/graphics/sane/frontends.nix | 4 +- .../pkgs/applications/graphics/sane/xsane.nix | 4 +- .../pkgs/applications/kde/ark/default.nix | 4 +- .../nixpkgs/pkgs/applications/kde/kate.nix | 10 + .../pkgs/applications/kde/konqueror.nix | 10 +- .../nixpkgs/pkgs/applications/kde/okular.nix | 9 + .../applications/misc/1password/default.nix | 8 +- .../applications/misc/alacritty/default.nix | 2 +- .../applications/misc/birdtray/default.nix | 4 +- .../pkgs/applications/misc/clipit/default.nix | 17 +- .../applications/misc/dbeaver/default.nix | 4 +- .../pkgs/applications/misc/ddgr/default.nix | 9 +- .../misc/digitalbitbox/default.nix | 4 +- .../pkgs/applications/misc/dmenu/wayland.nix | 6 +- .../misc/garmin-plugin/default.nix | 4 +- .../misc/golden-cheetah/default.nix | 10 +- .../applications/misc/googler/default.nix | 4 +- .../pkgs/applications/misc/gpxsee/default.nix | 6 +- .../pkgs/applications/misc/havoc/default.nix | 35 + .../pkgs/applications/misc/hugo/default.nix | 6 +- .../applications/misc/latte-dock/default.nix | 4 +- .../applications/misc/lutris/chrootenv.nix | 2 +- .../pkgs/applications/misc/nut/default.nix | 6 +- .../applications/misc/octoprint/default.nix | 155 +- .../applications/misc/octoprint/plugins.nix | 478 +- .../applications/misc/perkeep/default.nix | 6 +- .../applications/misc/playonlinux/default.nix | 60 +- .../misc/qlandkartegt/garmindev.nix | 4 +- .../applications/misc/qlcplus/default.nix | 4 +- .../applications/misc/rescuetime/default.nix | 6 +- .../misc/rofi-file-browser/default.nix | 34 + .../pkgs/applications/misc/st/default.nix | 9 +- .../applications/misc/subsurface/default.nix | 4 +- .../applications/misc/terminator/default.nix | 64 +- .../pkgs/applications/misc/tuir/default.nix | 4 +- .../pkgs/applications/misc/tut/default.nix | 4 +- .../pkgs/applications/misc/tut/deps.nix | 69 +- .../pkgs/applications/misc/wtf/default.nix | 6 +- .../browsers/chromium/upstream-info.nix | 18 +- .../networking/browsers/palemoon/default.nix | 102 +- .../browsers/qutebrowser/default.nix | 4 +- .../browsers/ungoogled-chromium/common.nix | 17 +- .../browsers/ungoogled-chromium/default.nix | 24 +- ... => enable-vdpau-support-for-nvidia.patch} | 0 .../enable-video-acceleration-on-linux.patch | 48 + .../browsers/ungoogled-chromium/plugins.nix | 4 +- .../ungoogled-chromium/ungoogled-src.nix | 6 +- .../ungoogled-chromium/upstream-info.nix | 18 +- .../cluster/docker-machine/default.nix | 14 +- .../cluster/docker-machine/hyperkit.nix | 13 +- .../cluster/docker-machine/kvm2.nix | 19 +- .../networking/cluster/helm/default.nix | 6 +- .../networking/cluster/heptio-ark/default.nix | 2 +- .../networking/cluster/k9s/default.nix | 6 +- .../networking/cluster/kompose/default.nix | 7 +- .../networking/cluster/kops/default.nix | 31 +- .../networking/cluster/kubernix/default.nix | 24 + .../networking/cluster/minikube/default.nix | 67 +- .../networking/cluster/nomad/default.nix | 4 +- .../networking/cluster/openshift/default.nix | 29 +- .../networking/cluster/stern/default.nix | 12 +- .../cluster/terraform-providers/data.nix | 334 +- .../cluster/terraform-providers/default.nix | 10 +- .../terraform-providers/ibm/default.nix | 38 - .../cluster/terraform-providers/update-all | 2 + .../terraform-providers/vpsadmin/default.nix | 27 + .../networking/cluster/terraform/default.nix | 10 +- .../networking/dyndns/cfdyndns/default.nix | 2 +- .../networking/gmailctl/default.nix | 6 +- .../gopher/gopherclient/default.nix | 45 - .../networking/hydroxide/default.nix | 14 +- .../instant-messengers/jackline/default.nix | 8 +- .../instant-messengers/nheko/default.nix | 111 +- .../instant-messengers/quaternion/default.nix | 77 +- .../instant-messengers/rambox/default.nix | 2 +- .../signal-desktop/default.nix | 9 +- .../skypeforlinux/default.nix | 5 +- .../instant-messengers/slack/default.nix | 15 +- .../instant-messengers/teams/default.nix | 22 + .../telegram/tdesktop/default.nix | 9 +- .../instant-messengers/zoom-us/default.nix | 4 +- .../networking/mailreaders/mutt/default.nix | 4 +- .../mailreaders/neomutt/default.nix | 17 +- .../mailreaders/notmuch/default.nix | 2 +- .../applications/networking/msmtp/default.nix | 11 +- .../applications/networking/nym/default.nix | 54 + .../applications/networking/nym/update.sh | 37 + .../applications/networking/pjsip/default.nix | 21 +- .../networking/remote/rdesktop/default.nix | 10 +- .../networking/sync/rclone/default.nix | 13 +- .../networking/sync/unison/default.nix | 4 +- .../applications/office/gnucash/default.nix | 5 +- .../applications/office/jameica/default.nix | 8 +- .../office/ledger-autosync/default.nix | 4 +- .../applications/office/scribus/unstable.nix | 2 +- .../applications/office/watson/default.nix | 12 +- .../applications/radio/sdrangel/default.nix | 4 +- .../applications/radio/soapysdr/default.nix | 4 +- .../applications/radio/welle-io/default.nix | 4 +- .../science/biology/dcm2niix/default.nix | 4 +- .../science/electronics/eagle/eagle.nix | 4 +- .../science/electronics/kicad/update.sh | 30 +- .../science/electronics/kicad/versions.nix | 28 +- .../magic-vlsi/0001-strip-bin-prefix.patch | 10 + .../magic-vlsi/0002-fix-format-security.patch | 19 + .../electronics/magic-vlsi/default.nix | 36 + .../science/logic/lean/default.nix | 4 +- .../machine-learning/fasttext/default.nix | 4 +- ...01-Disable-test-pending-upstream-fix.patch | 26 - .../applications/science/math/R/default.nix | 15 +- .../science/math/R/fix-failing-test.patch | 25 + .../science/math/cemu/default.nix | 4 +- .../science/math/mxnet/default.nix | 4 +- .../science/math/sage/sage-src.nix | 8 + .../science/misc/foldingathome/client.nix | 4 +- .../science/misc/foldingathome/control.nix | 4 +- .../science/misc/foldingathome/viewer.nix | 4 +- .../science/misc/rink/default.nix | 2 +- .../science/misc/snakemake/default.nix | 6 +- .../science/physics/elmerfem/default.nix | 49 + .../science/physics/elmerfem/fix-cmake.patch | 13 + .../science/physics/sherpa/default.nix | 16 +- .../science/robotics/gazebo/default.nix | 4 +- .../version-management/arch/default.nix | 13 +- .../git-and-tools/default.nix | 4 + .../git-and-tools/delta/default.nix | 14 +- .../git-and-tools/git-ignore/default.nix | 7 +- .../git-and-tools/git/default.nix | 5 +- .../git-and-tools/gitstatus/default.nix | 6 +- .../git-and-tools/gitui/default.nix | 24 + .../git-and-tools/hub/default.nix | 12 +- .../version-management/git-lfs/1.nix | 8 +- .../version-management/git-lfs/default.nix | 20 +- .../version-management/gitlab/data.json | 10 +- .../gitlab/gitaly/Gemfile.lock | 2 +- .../gitlab/gitaly/default.nix | 4 +- .../gitlab/gitaly/gemset.nix | 4 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../version-management/gitlab/rubyEnv/Gemfile | 2 +- .../gitlab/rubyEnv/Gemfile.lock | 16 +- .../gitlab/rubyEnv/gemset.nix | 16 +- .../version-management/gitlab/update.py | 19 +- .../version-management/mercurial/default.nix | 4 +- .../pkgs/applications/video/kodi/default.nix | 6 +- ...bsPluginHelpers.cmake-in-the-obs-src.patch | 25 - .../video/obs-studio/v4l2sink.nix | 57 +- .../video/qstopmotion/default.nix | 55 +- .../applications/video/tartube/default.nix | 68 + .../virtualization/cri-o/default.nix | 14 +- .../libnvc-ldconfig-and-path-fixes.patch | 12 +- .../virtualization/nvidia-docker/libnvc.nix | 8 +- .../virtualization/podman/default.nix | 4 +- .../virtualization/podman/wrapper.nix | 48 + .../virtualization/runc/default.nix | 2 - .../virtualization/spike/default.nix | 6 +- .../virtualization/virtualbox/default.nix | 4 + .../window-managers/herbstluftwm/default.nix | 47 +- .../applications/window-managers/i3/gaps.nix | 4 +- .../window-managers/spectrwm/default.nix | 38 +- .../alternatives/lapack/default.nix | 8 - .../build-support/appimage/appimage-exec.sh | 4 +- .../pkgs/build-support/docker/default.nix | 51 +- .../docker/nix-prefetch-docker.nix | 4 +- .../nixpkgs/pkgs/build-support/ocaml/dune.nix | 8 +- .../pkgs/build-support/src-only/default.nix | 29 +- .../data/fonts/jetbrains-mono/default.nix | 4 +- .../data/icons/arc-icon-theme/default.nix | 15 +- .../elementary-xfce-icon-theme/default.nix | 13 +- .../data/icons/faba-icon-theme/default.nix | 11 +- .../data/icons/faba-mono-icons/default.nix | 12 +- .../icons/flat-remix-icon-theme/default.nix | 19 +- .../icons/hicolor-icon-theme/setup-hook.sh | 40 + .../pkgs/data/icons/iconpack-jade/default.nix | 10 +- .../data/icons/iconpack-obsidian/default.nix | 11 +- .../data/icons/maia-icon-theme/default.nix | 2 +- .../data/icons/moka-icon-theme/default.nix | 8 +- .../icons/numix-icon-theme-circle/default.nix | 14 +- .../icons/numix-icon-theme-square/default.nix | 14 +- .../data/icons/numix-icon-theme/default.nix | 8 +- .../data/icons/paper-icon-theme/default.nix | 11 +- .../data/icons/papirus-icon-theme/default.nix | 19 +- .../icons/papirus-maia-icon-theme/default.nix | 13 +- .../data/icons/pop-icon-theme/default.nix | 45 + .../data/icons/qogir-icon-theme/default.nix | 4 +- .../data/icons/tango-icon-theme/default.nix | 8 +- .../pkgs/data/icons/zafiro-icons/default.nix | 11 +- .../pkgs/data/misc/hackage/default.nix | 4 +- .../nixpkgs/pkgs/data/themes/arc/default.nix | 12 +- .../pkgs/data/themes/pop-gtk/default.nix | 12 +- .../nixpkgs/pkgs/data/themes/yaru/default.nix | 10 +- .../cinnamon/mint-y-icons/default.nix | 16 +- .../deepin/deepin-icon-theme/default.nix | 3 +- .../pkgs/desktops/enlightenment/efl.nix | 14 +- .../core/adwaita-icon-theme/default.nix | 2 + .../core/gnome-shell-extensions/default.nix | 4 +- .../gnome-3/core/gnome-shell/default.nix | 4 +- .../core/gnome-themes-extra/default.nix | 9 +- .../gnome-3/core/mutter/3.34/default.nix | 11 +- .../desktops/gnome-3/core/mutter/default.nix | 4 +- .../window-is-ready-remover/default.nix | 26 + .../nixpkgs/pkgs/desktops/gnome-3/update.nix | 4 +- .../desktops/lxqt/compton-conf/default.nix | 20 +- .../nixpkgs/pkgs/desktops/lxqt/default.nix | 73 +- .../pkgs/desktops/lxqt/libfm-qt/default.nix | 28 +- .../pkgs/desktops/lxqt/liblxqt/default.nix | 22 +- .../pkgs/desktops/lxqt/libqtxdg/default.nix | 30 +- .../pkgs/desktops/lxqt/libsysstat/default.nix | 24 +- .../pkgs/desktops/lxqt/lximage-qt/default.nix | 23 +- .../pkgs/desktops/lxqt/lxqt-about/default.nix | 20 +- .../pkgs/desktops/lxqt/lxqt-admin/default.nix | 21 +- .../desktops/lxqt/lxqt-archiver/default.nix | 27 +- .../lxqt/lxqt-build-tools/default.nix | 29 +- .../desktops/lxqt/lxqt-config/default.nix | 26 +- .../desktops/lxqt/lxqt-globalkeys/default.nix | 21 +- .../lxqt/lxqt-notificationd/default.nix | 21 +- .../lxqt/lxqt-openssh-askpass/default.nix | 21 +- .../pkgs/desktops/lxqt/lxqt-panel/default.nix | 41 +- .../desktops/lxqt/lxqt-policykit/default.nix | 26 +- .../lxqt/lxqt-powermanagement/default.nix | 23 +- .../desktops/lxqt/lxqt-qtplugin/default.nix | 23 +- .../desktops/lxqt/lxqt-runner/default.nix | 27 +- .../desktops/lxqt/lxqt-session/default.nix | 24 +- .../pkgs/desktops/lxqt/lxqt-sudo/default.nix | 22 +- .../desktops/lxqt/lxqt-themes/default.nix | 14 +- .../pkgs/desktops/lxqt/obconf-qt/default.nix | 22 +- .../desktops/lxqt/pavucontrol-qt/default.nix | 20 +- .../pkgs/desktops/lxqt/pcmanfm-qt/default.nix | 22 +- .../pkgs/desktops/lxqt/qlipper/default.nix | 24 +- .../pkgs/desktops/lxqt/qps/default.nix | 37 +- .../pkgs/desktops/lxqt/qterminal/default.nix | 19 +- .../desktops/lxqt/qtermwidget/default.nix | 26 +- .../pkgs/desktops/lxqt/screengrab/default.nix | 22 +- .../nixpkgs/pkgs/desktops/lxqt/update.sh | 39 - .../mate/mate-icon-theme-faenza/default.nix | 6 +- .../pantheon-shell/default.nix | 4 +- .../pantheon/desktop/gala/default.nix | 4 +- .../desktops/xfce/art/xfce4-icon-theme.nix | 11 +- .../xfce/core/xfce4-panel/default.nix | 4 +- .../xfce4-whiskermenu-plugin/default.nix | 13 +- .../arduino/arduino-core/default.nix | 8 +- .../compilers/binaryen/default.nix | 4 +- .../pkgs/development/compilers/dmd/binary.nix | 52 + .../development/compilers/dmd/bootstrap.nix | 9 + .../development/compilers/dmd/default.nix | 39 +- .../compilers/dotnet/buildDotnet.nix | 14 +- .../development/compilers/dotnet/default.nix | 54 +- .../development/compilers/elm/default.nix | 2 +- .../compilers/elm/packages/elm-instrument.nix | 2 +- .../development/compilers/fstar/default.nix | 7 +- .../pkgs/development/compilers/go/1.12.nix | 247 - .../pkgs/development/compilers/go/1.13.nix | 244 - .../compilers/go/remove-test-pie.patch | 24 - .../compilers/go/ssl-cert-file-1.12.1.patch | 59 - .../pkgs/development/compilers/ldc/binary.nix | 41 + .../development/compilers/ldc/bootstrap.nix | 10 + .../development/compilers/ldc/default.nix | 174 +- .../development/compilers/ldc/generic.nix | 143 + .../development/compilers/llvm/10/llvm.nix | 1 + .../development/compilers/llvm/7/llvm.nix | 1 + .../development/compilers/llvm/8/llvm.nix | 1 + .../development/compilers/llvm/9/llvm.nix | 1 + .../compilers/open-watcom-bin/default.nix | 67 + .../development/compilers/unison/default.nix | 6 +- .../coq-modules/coqhammer/default.nix | 8 +- .../coq-modules/equations/default.nix | 18 +- .../coq-modules/gappalib/default.nix | 8 +- .../go-packages/generic/default.nix | 6 +- .../haskell-modules/configuration-common.nix | 49 +- .../configuration-ghc-8.10.x.nix | 45 +- .../configuration-ghc-8.8.x.nix | 4 + .../configuration-hackage2nix.yaml | 59 +- .../haskell-modules/configuration-nix.nix | 10 +- .../haskell-modules/hackage-packages.nix | 2413 ++++--- .../patches/fix-dbus-for-ghc-8.10.x.patch | 383 ++ .../patches/stack-ghc882-support.patch | 104 - .../development/interpreters/bats/default.nix | 12 +- .../interpreters/clojure/babashka.nix | 14 +- .../development/interpreters/dart/default.nix | 26 +- .../development/interpreters/hy/default.nix | 21 +- .../development/interpreters/luajit/2.0.nix | 5 +- .../development/interpreters/luajit/2.1.nix | 5 +- .../interpreters/luajit/default.nix | 12 +- .../interpreters/metamath/default.nix | 12 +- .../development/interpreters/php/default.nix | 456 +- .../development/interpreters/python/tests.nix | 19 +- .../typeddep/default.nix | 4 +- .../libraries/agda/agda-stdlib/default.nix | 2 +- .../development/libraries/aspell/default.nix | 5 +- .../libraries/audio/lv2/default.nix | 2 +- .../development/libraries/bwidget/default.nix | 2 +- .../libraries/directfb/default.nix | 13 +- .../development/libraries/dqlite/default.nix | 21 +- .../development/libraries/fmt/default.nix | 11 +- .../libraries/garmintools/default.nix | 4 +- .../libraries/goocanvasmm/default.nix | 1 + .../pkgs/development/libraries/gtk/3.x.nix | 19 +- .../development/libraries/hamlib/default.nix | 4 +- .../development/libraries/hidapi/default.nix | 4 +- .../pkgs/development/libraries/icu/67.nix | 4 + .../libraries/ilmbase/bootstrap.patch | 15 - .../development/libraries/ilmbase/default.nix | 26 +- .../kinetic-cpp-client/build-fix.patch | 224 - .../libraries/kinetic-cpp-client/default.nix | 58 - .../development/libraries/libcec/default.nix | 4 +- .../libraries/libeatmydata/default.nix | 38 +- .../libraries/libextractor/default.nix | 28 +- .../libextractor/gst-hardcode-plugins.patch | 11 + .../development/libraries/libftdi/default.nix | 6 +- .../libraries/libmicrodns/default.nix | 10 +- .../development/libraries/libmwaw/default.nix | 8 +- .../libraries/libmypaint/default.nix | 8 +- .../development/libraries/libnfc/default.nix | 4 +- .../development/libraries/libpgf/default.nix | 2 +- .../libraries/libqmatrixclient/default.nix | 38 - .../libraries/libquotient/default.nix | 24 + .../default.nix => libusb-compat/0.1.nix} | 0 .../libraries/libva-utils/default.nix | 15 +- .../development/libraries/libva/default.nix | 19 +- .../development/libraries/lirc/default.nix | 6 +- .../libraries/mtxclient/default.nix | 47 +- .../development/libraries/ndi/default.nix | 4 +- .../development/libraries/openct/default.nix | 4 +- .../libraries/openexr/bootstrap.patch | 15 - .../development/libraries/openexr/default.nix | 25 +- .../libraries/openldap/default.nix | 4 +- .../development/libraries/openmpi/default.nix | 9 +- .../development/libraries/openssl/default.nix | 4 +- .../development/libraries/p11-kit/default.nix | 8 +- .../development/libraries/packr/default.nix | 43 +- .../development/libraries/pcg-c/default.nix | 2 +- .../libraries/pipewire/default.nix | 8 + .../development/libraries/protobuf/3.11.nix | 4 +- .../libraries/raft-canonical/default.nix | 4 +- .../math/suitesparse-graphblas/default.nix | 4 +- .../development/libraries/scmccid/default.nix | 4 +- .../libraries/sentencepiece/default.nix | 4 +- .../libraries/spice-gtk/default.nix | 50 +- .../development/libraries/ti-rpc/default.nix | 4 +- .../development/libraries/tweeny/default.nix | 30 + .../development/libraries/unicap/default.nix | 4 +- .../libraries/uriparser/default.nix | 23 +- .../libraries/usbredir/default.nix | 7 +- .../development/libraries/vtk/default.nix | 4 +- .../libraries/webkitgtk/default.nix | 4 +- .../development/misc/amdadl-sdk/default.nix | 50 - .../01-remove-aparapi-samples.patch | 10 - .../development/misc/amdapp-sdk/default.nix | 108 - .../development/misc/amdapp-sdk/gcc-5.patch | 11 - .../pkgs/development/misc/msp430/mspdebug.nix | 4 +- .../development/mobile/webos/novacomd.nix | 4 +- .../pkgs/development/mobile/xpwn/default.nix | 4 +- .../development/node-packages/default-v10.nix | 3 + .../node-packages/node-packages-v10.json | 1 + .../node-packages/node-packages-v10.nix | 18 + .../ocaml-modules/angstrom/default.nix | 6 +- .../ocaml-modules/async_shell/default.nix | 22 - .../ocaml-modules/bigstring/default.nix | 24 + .../ocaml-modules/core_extended/default.nix | 33 - .../development/ocaml-modules/cow/default.nix | 31 +- .../development/ocaml-modules/dns/client.nix | 8 +- .../development/ocaml-modules/dns/default.nix | 4 +- .../janestreet/core-extended.nix | 28 - .../ocaml-modules/mirage-time/default.nix | 22 + .../ocaml-modules/mirage-time/unix.nix | 13 + .../ocaml-modules/tsdl/default.nix | 10 +- .../development/ocaml-modules/uri/default.nix | 1 + .../development/ocaml-modules/uri/legacy.nix | 51 - .../ocaml-modules/x509/default.nix | 4 +- .../python-modules/asttokens/default.nix | 20 +- .../python-modules/auth0-python/default.nix | 31 + .../python-modules/azure-identity/default.nix | 4 +- .../azure-keyvault-certificates/default.nix | 39 + .../python-modules/azure-keyvault/default.nix | 6 +- .../azure-mgmt-advisor/default.nix | 4 +- .../azure-mgmt-apimanagement/default.nix | 4 +- .../default.nix | 4 +- .../azure-mgmt-cognitiveservices/default.nix | 4 +- .../azure-mgmt-containerservice/default.nix | 4 +- .../azure-mgmt-core/default.nix | 36 + .../azure-mgmt-cosmosdb/default.nix | 4 +- .../azure-mgmt-loganalytics/default.nix | 4 +- .../azure-mgmt-netapp/default.nix | 4 +- .../azure-mgmt-network/default.nix | 4 +- .../azure-mgmt-recoveryservices/default.nix | 4 +- .../azure-mgmt-redhatopenshift/default.nix | 41 + .../python-modules/azure-mgmt-web/default.nix | 4 +- .../python-modules/azure/default.nix | 39 - .../batchgenerators/default.nix | 20 +- .../python-modules/binwalk/default.nix | 3 +- .../python-modules/black/default.nix | 2 +- .../python-modules/bluepy/default.nix | 35 + .../python-modules/certifi/default.nix | 2 +- .../python-modules/cloudflare/default.nix | 36 + .../python-modules/cryptography/default.nix | 4 +- .../python-modules/cryptography/vectors.nix | 2 +- .../python-modules/evernote/default.nix | 2 +- .../python-modules/fasttext/default.nix | 14 +- .../python-modules/geopandas/default.nix | 2 +- .../python-modules/grpcio/default.nix | 7 +- .../python-modules/kombu/default.nix | 8 +- .../python-modules/msrest/default.nix | 4 +- .../python-modules/msrestazure/default.nix | 4 +- .../mysql-connector/default.nix | 15 +- .../python-modules/pep8-naming/default.nix | 4 +- .../python-modules/pylibftdi/default.nix | 36 + .../pyprof2calltree/default.nix | 4 +- .../python-modules/pyusb/default.nix | 6 +- .../python-modules/scikitlearn/0.20.nix | 2 +- .../python-modules/scikitlearn/default.nix | 2 +- .../python-modules/snitun/default.nix | 16 +- .../sqlalchemy-utils/default.nix | 4 +- .../python-modules/subdownloader/default.nix | 2 +- .../python-modules/transforms3d/default.nix | 36 + .../python-modules/untangle/default.nix | 2 +- .../python-modules/vdf/default.nix | 4 +- .../development/r-modules/bioc-packages.nix | 8 +- .../development/r-modules/cran-packages.nix | 1419 +++-- .../pkgs/development/r-modules/default.nix | 2 - .../tools/analysis/checkstyle/default.nix | 4 +- .../tools/analysis/radare2/default.nix | 18 +- .../tools/analysis/tflint/default.nix | 6 +- .../pkgs/development/tools/asmfmt/default.nix | 16 +- .../pkgs/development/tools/azcopy/default.nix | 6 +- .../tools/bazel-watcher/default.nix | 24 +- .../tools/build-managers/meson/default.nix | 2 +- .../development/tools/cloud-nuke/default.nix | 4 +- .../development/tools/cloud-nuke/deps.nix | 93 +- .../tools/cloudfoundry-cli/default.nix | 6 +- .../tools/cmake-format/default.nix | 4 +- .../development/tools/conftest/default.nix | 6 +- .../gitlab-runner/default.nix | 8 +- .../jenkins/default.nix | 4 +- .../tools/flatpak-builder/default.nix | 2 - .../tools/flatpak-builder/fix-paths.patch | 9 - .../tools/golangci-lint/default.nix | 6 +- .../development/tools/gotestsum/default.nix | 6 +- .../pkgs/development/tools/gox/default.nix | 11 +- .../pkgs/development/tools/gox/deps.nix | 11 - .../pkgs/development/tools/jazzy/Gemfile.lock | 32 +- .../pkgs/development/tools/jazzy/gemset.nix | 70 +- .../pkgs/development/tools/jid/default.nix | 6 +- .../pkgs/development/tools/jid/deps.nix | 40 +- .../pkgs/development/tools/kind/default.nix | 7 +- .../pkgs/development/tools/kubie/default.nix | 11 +- .../development/tools/micronaut/default.nix | 4 +- .../development/tools/misc/act/default.nix | 6 +- .../tools/misc/avrdude/default.nix | 4 +- .../tools/misc/blackmagic/default.nix | 4 +- .../development/tools/misc/ccls/default.nix | 4 +- .../tools/misc/circleci-cli/default.nix | 6 +- .../tools/misc/clojure-lsp/default.nix | 4 +- .../tools/misc/dfu-programmer/default.nix | 4 +- .../tools/misc/micronucleus/default.nix | 4 +- .../development/tools/misc/scc/default.nix | 4 +- .../development/tools/misc/stlink/default.nix | 11 +- .../tools/misc/teensy-loader-cli/default.nix | 4 +- .../tools/misc/wishbone-tool/default.nix | 4 +- .../tools/misc/xc3sprog/default.nix | 4 +- .../pkgs/development/tools/packer/default.nix | 4 +- .../tools/rust/cargo-deny/default.nix | 34 + .../tools/rust/cargo-xbuild/default.nix | 6 +- .../development/tools/rust/racerd/default.nix | 2 +- .../development/tools/scalafmt/default.nix | 4 +- .../development/tools/skaffold/default.nix | 6 +- .../default.nix | 25 +- .../development/tools/unityhub/default.nix | 9 +- .../0001-Add-cargo.lock.patch | 256 +- .../tools/wasm-bindgen-cli/default.nix | 6 +- .../pkgs/development/web/cypress/default.nix | 4 +- .../pkgs/development/web/flyctl/default.nix | 6 +- .../pkgs/development/web/nodejs/v12.nix | 4 +- .../pkgs/development/web/nodejs/v13.nix | 6 +- .../pkgs/development/web/nodejs/v14.nix | 14 + .../pkgs/development/web/remarkjs/default.nix | 2 +- .../pkgs/games/chocolate-doom/default.nix | 21 +- .../pkgs/games/endless-sky/default.nix | 4 +- .../nixpkgs/pkgs/games/gnuchess/default.nix | 13 +- .../pkgs/games/steam/runtime-generated.nix | 276 +- .../nixpkgs/pkgs/misc/apulse/default.nix | 4 +- .../misc/arm-trusted-firmware/default.nix | 8 +- .../nixpkgs/pkgs/misc/cups/default.nix | 6 +- .../misc/cups/drivers/cnijfilter2/default.nix | 6 +- .../cups/drivers/cnijfilter_4_00/default.nix | 20 +- .../cups/drivers/samsung/1.00.36/default.nix | 6 +- .../misc/cups/drivers/samsung/1.00.37.nix | 6 +- .../misc/cups/drivers/samsung/4.01.17.nix | 4 +- .../pkgs/misc/drivers/epkowa/default.nix | 4 +- .../misc/drivers/epson-escpr2/default.nix | 10 +- .../pkgs/misc/drivers/gutenprint/default.nix | 4 +- .../misc/emulators/snes9x-gtk/default.nix | 17 +- .../pkgs/misc/emulators/wine/sources.nix | 4 +- .../nixpkgs/pkgs/misc/scrcpy/default.nix | 6 +- .../pkgs/misc/vim-plugins/generated.nix | 161 +- .../pkgs/misc/vim-plugins/overrides.nix | 6 + .../pkgs/misc/vim-plugins/vim-plugin-names | 1 + .../vscode-extensions/cpptools/default.nix | 69 +- .../pkgs/misc/vscode-extensions/default.nix | 4 +- .../pkgs/os-specific/darwin/skhd/default.nix | 8 +- .../pkgs/os-specific/darwin/yabai/default.nix | 32 + .../linux/broadcom-sta/default.nix | 2 + .../linux/broadcom-sta/linux-5.6.patch | 87 + .../pkgs/os-specific/linux/ell/default.nix | 4 +- .../os-specific/linux/g15daemon/default.nix | 4 +- .../os-specific/linux/guvcview/default.nix | 73 +- .../os-specific/linux/hostapd/default.nix | 8 +- .../pkgs/os-specific/linux/iwd/default.nix | 4 +- .../linux/kernel/common-config.nix | 3 + .../linux/kernel/hardened-patches.json | 24 +- .../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.6.nix | 4 +- .../linux/kernel/linux-testing.nix | 4 +- .../os-specific/linux/libfabric/default.nix | 29 + .../os-specific/linux/libpsm2/default.nix | 42 + .../os-specific/linux/rtl8812au/default.nix | 10 +- .../os-specific/linux/setools/default.nix | 4 +- .../os-specific/linux/syslinux/default.nix | 25 +- .../linux/v4l2loopback/default.nix | 4 +- .../os-specific/linux/wireguard/default.nix | 28 +- .../pkgs/servers/blockbook/default.nix | 5 +- .../nixpkgs/pkgs/servers/brickd/default.nix | 4 +- .../pkgs/servers/computing/torque/default.nix | 6 +- .../nixpkgs/pkgs/servers/consul/default.nix | 30 +- .../nixpkgs/pkgs/servers/coturn/default.nix | 11 +- .../servers/dns/knot-resolver/default.nix | 12 +- .../nixpkgs/pkgs/servers/etcd/default.nix | 41 +- .../nixpkgs/pkgs/servers/felix/default.nix | 4 +- .../nixpkgs/pkgs/servers/gotify/default.nix | 10 +- .../nixpkgs/pkgs/servers/gotify/mod-sha.nix | 1 + .../nixpkgs/pkgs/servers/gotify/package.json | 5 +- .../pkgs/servers/gotify/source-sha.nix | 1 + .../nixpkgs/pkgs/servers/gotify/ui.nix | 4 +- .../pkgs/servers/gotify/update-yarn-deps.sh | 20 - .../nixpkgs/pkgs/servers/gotify/update.sh | 40 + .../nixpkgs/pkgs/servers/gotify/version.nix | 1 + .../nixpkgs/pkgs/servers/gotify/yarndeps.nix | 200 +- .../nixpkgs/pkgs/servers/hashi-ui/default.nix | 25 + .../0001-setup.py-relax-dependencies.patch | 23 +- .../home-assistant/component-packages.nix | 20 +- .../pkgs/servers/home-assistant/default.nix | 4 +- .../pkgs/servers/home-assistant/frontend.nix | 4 +- .../home-assistant/parse-requirements.py | 2 +- .../pkgs/servers/http/jetty/default.nix | 4 +- .../servers/http/tomcat/tomcat-native.nix | 29 + .../pkgs/servers/http/unit/default.nix | 24 +- .../nixpkgs/pkgs/servers/imgproxy/default.nix | 6 +- .../nixpkgs/pkgs/servers/jackett/default.nix | 18 +- .../pkgs/servers/mautrix-whatsapp/default.nix | 8 +- .../servers/monitoring/kapacitor/default.nix | 6 +- .../servers/monitoring/lcdproc/default.nix | 4 +- .../monitoring/prometheus/alertmanager.nix | 8 +- .../monitoring/prometheus/mail-exporter.nix | 8 +- .../prometheus/varnish-exporter.nix | 8 +- .../servers/monitoring/telegraf/default.nix | 4 +- .../pkgs/servers/nosql/eventstore/default.nix | 4 +- third_party/nixpkgs/pkgs/servers/plex/raw.nix | 4 +- .../pkgs/servers/roundcube/default.nix | 4 +- .../nixpkgs/pkgs/servers/serviio/default.nix | 2 +- .../pkgs/servers/sql/cockroachdb/default.nix | 5 +- .../nixpkgs/pkgs/servers/uftp/default.nix | 4 +- .../nixpkgs/pkgs/servers/uwsgi/default.nix | 4 +- .../servers/web-apps/restya-board/default.nix | 2 +- .../pkgs/servers/xmpp/prosody/default.nix | 15 +- .../shells/bash/bash-completion/default.nix | 2 +- .../nixpkgs/pkgs/shells/fish/default.nix | 136 +- .../shells/fish/dont-codesign-on-mac.diff | 12 + .../nixpkgs/pkgs/shells/nushell/default.nix | 6 +- .../pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +- .../shells/zsh/zsh-powerlevel10k/default.nix | 4 +- .../pkgs/tools/admin/awsweeper/default.nix | 6 +- .../pkgs/tools/admin/azure-cli/default.nix | 8 +- .../tools/admin/azure-cli/python-packages.nix | 84 +- .../pkgs/tools/admin/eksctl/default.nix | 9 +- .../nixpkgs/pkgs/tools/admin/lego/default.nix | 2 +- .../nixpkgs/pkgs/tools/admin/lxd/default.nix | 6 +- .../pkgs/tools/admin/pebble/default.nix | 2 +- .../pkgs/tools/admin/procs/default.nix | 6 +- .../pkgs/tools/admin/scaleway-cli/default.nix | 4 +- .../pkgs/tools/archivers/afio/default.nix | 12 +- .../pkgs/tools/archivers/p7zip/default.nix | 15 +- .../pkgs/tools/archivers/unar/default.nix | 59 +- .../pkgs/tools/audio/pasystray/default.nix | 5 + .../tools/audio/pasystray/fix-wayland.patch | 34 + .../pkgs/tools/backup/duplicity/default.nix | 4 +- .../pkgs/tools/backup/monolith/default.nix | 6 +- .../pkgs/tools/backup/restic/default.nix | 26 +- .../bluetooth/obex-data-server/default.nix | 4 +- .../pkgs/tools/bluetooth/openobex/default.nix | 4 +- .../pkgs/tools/filesystems/catcli/default.nix | 4 +- .../pkgs/tools/filesystems/ciopfs/default.nix | 2 +- .../tools/filesystems/darling-dmg/default.nix | 2 +- .../pkgs/tools/graphics/pgf/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/aptly/default.nix | 7 +- .../pkgs/tools/misc/bat-extras/default.nix | 147 + .../nixpkgs/pkgs/tools/misc/bat/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/broot/default.nix | 8 +- .../pkgs/tools/misc/clipman/default.nix | 4 +- .../pkgs/tools/misc/diffoscope/default.nix | 6 +- .../pkgs/tools/misc/dmg2img/default.nix | 17 +- .../nixpkgs/pkgs/tools/misc/fd/default.nix | 5 +- .../pkgs/tools/misc/fluent-bit/default.nix | 4 +- .../pkgs/tools/misc/fselect/default.nix | 6 +- .../pkgs/tools/misc/gnokii/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/grub/2.0x.nix | 4 +- .../nixpkgs/pkgs/tools/misc/grub/trusted.nix | 4 +- .../pkgs/tools/misc/heatseeker/default.nix | 9 +- .../nixpkgs/pkgs/tools/misc/hpcg/default.nix | 35 + .../pkgs/tools/misc/intermodal/default.nix | 25 + .../nixpkgs/pkgs/tools/misc/lsd/default.nix | 2 +- .../pkgs/tools/misc/memtest86-efi/default.nix | 14 +- .../pkgs/tools/misc/pk2cmd/default.nix | 6 +- .../pkgs/tools/misc/shadowenv/default.nix | 9 +- .../pkgs/tools/misc/sixpair/default.nix | 4 +- .../pkgs/tools/misc/starship/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/tmux/default.nix | 4 +- .../pkgs/tools/misc/tmuxinator/default.nix | 12 +- .../pkgs/tools/misc/urjtag/default.nix | 4 +- .../pkgs/tools/misc/vdirsyncer/default.nix | 2 +- .../pkgs/tools/misc/vdirsyncer/stable.nix | 2 +- .../pkgs/tools/misc/woeusb/default.nix | 4 +- .../pkgs/tools/misc/xburst-tools/default.nix | 4 +- .../pkgs/tools/misc/youtube-dl/default.nix | 4 +- .../misc/yubikey-personalization/default.nix | 4 +- .../pkgs/tools/misc/zoxide/default.nix | 6 +- .../pkgs/tools/networking/amass/default.nix | 6 +- .../pkgs/tools/networking/dnsmasq/default.nix | 12 +- .../tools/networking/dnsproxy/default.nix | 6 +- .../pkgs/tools/networking/frp/default.nix | 4 +- .../tools/networking/httplz/cargo-lock.patch | 862 +-- .../pkgs/tools/networking/httplz/default.nix | 6 +- .../pkgs/tools/networking/inadyn/default.nix | 4 +- .../tools/networking/minio-client/default.nix | 6 +- .../pkgs/tools/networking/mu/default.nix | 4 +- .../pkgs/tools/networking/pykms/default.nix | 8 +- .../log-to-current-directory-by-default.patch | 20 + .../tools/networking/rtptools/default.nix | 2 +- .../tools/networking/tox-node/default.nix | 2 +- .../networking/wireguard-tools/default.nix | 25 +- .../tools/networking/wormhole/default.nix | 33 + .../pkgs/tools/nix/nixpkgs-fmt/default.nix | 17 +- .../package-management/cargo-deb/default.nix | 8 +- .../package-management/emplace/default.nix | 6 +- .../package-management/nix-du/default.nix | 2 +- .../nixpkgs-review/default.nix | 4 +- .../pkgs/tools/security/afl/default.nix | 7 +- .../pkgs/tools/security/afl/libdislocator.nix | 2 +- .../tools/security/brutespray/default.nix | 4 +- .../pkgs/tools/security/crowbar/default.nix | 42 + .../pkgs/tools/security/doas/default.nix | 14 +- .../nixpkgs/pkgs/tools/security/gnupg/20.nix | 4 +- .../pkgs/tools/security/gopass/default.nix | 29 +- .../tools/security/hcxdumptool/default.nix | 2 +- .../pkgs/tools/security/hcxtools/default.nix | 4 +- .../pkgs/tools/security/keybase/default.nix | 6 +- .../pkgs/tools/security/keybase/gui.nix | 8 +- .../pkgs/tools/security/keybase/kbfs.nix | 2 +- .../pkgs/tools/security/libacr38u/default.nix | 4 +- .../pkgs/tools/security/p0f/default.nix | 2 +- ...it-possible-to-run-the-tests-offline.patch | 175 - .../pass/extensions/audit/default.nix | 9 +- .../security/pcsc-scm-scl011/default.nix | 4 +- .../pkgs/tools/security/prey/default.nix | 48 - .../pkgs/tools/security/vault/default.nix | 12 +- .../nixpkgs/pkgs/tools/system/bfs/default.nix | 4 +- .../pkgs/tools/system/collectd/default.nix | 4 +- .../pkgs/tools/system/colorls/Gemfile.lock | 2 +- .../pkgs/tools/system/colorls/default.nix | 2 +- .../pkgs/tools/system/colorls/gemset.nix | 4 +- .../pkgs/tools/system/thermald/default.nix | 10 +- .../nixpkgs/pkgs/tools/text/gjo/default.nix | 4 +- .../pkgs/tools/text/ripgrep/default.nix | 6 +- .../google-compute-engine-oslogin/default.nix | 33 +- .../virtualization/vpsfree-client/Gemfile | 5 + .../vpsfree-client/Gemfile.lock | 75 + .../virtualization/vpsfree-client/default.nix | 17 + .../virtualization/vpsfree-client/gemset.nix | 316 + .../nixpkgs/pkgs/top-level/aliases.nix | 57 +- .../nixpkgs/pkgs/top-level/all-packages.nix | 310 +- .../nixpkgs/pkgs/top-level/emacs-packages.nix | 2 +- .../nixpkgs/pkgs/top-level/ocaml-packages.nix | 29 +- .../nixpkgs/pkgs/top-level/perl-packages.nix | 14 + .../nixpkgs/pkgs/top-level/php-packages.nix | 141 +- .../pkgs/top-level/python-packages.nix | 20 +- 806 files changed, 16966 insertions(+), 11172 deletions(-) delete mode 100644 third_party/nixpkgs/nixos/modules/security/prey.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/networking/prosody.xml create mode 100644 third_party/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/emacs-modes/emacspeak/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/emacs-modes/header2/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/emacs-modes/hexrgb/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/emacs-modes/icicles/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/emacs-modes/lib-requires/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/qimgv/qt5-12-compat.diff create mode 100644 third_party/nixpkgs/pkgs/applications/misc/havoc/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/rofi-file-browser/default.nix rename third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/{vaapi-fix.patch => enable-vdpau-support-for-nvidia.patch} (100%) create mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/kubernix/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/gopher/gopherclient/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/nym/default.nix create mode 100755 third_party/nixpkgs/pkgs/applications/networking/nym/update.sh create mode 100644 third_party/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch create mode 100644 third_party/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch create mode 100644 third_party/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch create mode 100644 third_party/nixpkgs/pkgs/applications/science/math/R/fix-failing-test.patch create mode 100644 third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/fix-cmake.patch create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/video/obs-studio/0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch create mode 100644 third_party/nixpkgs/pkgs/applications/video/tartube/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix create mode 100644 third_party/nixpkgs/pkgs/data/icons/pop-icon-theme/default.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix delete mode 100755 third_party/nixpkgs/pkgs/desktops/lxqt/update.sh create mode 100644 third_party/nixpkgs/pkgs/development/compilers/dmd/binary.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/dmd/bootstrap.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/go/1.12.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/go/1.13.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/go/remove-test-pie.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/ldc/binary.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/ldc/bootstrap.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/ldc/generic.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/open-watcom-bin/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch delete mode 100644 third_party/nixpkgs/pkgs/development/haskell-modules/patches/stack-ghc882-support.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/icu/67.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/ilmbase/bootstrap.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/kinetic-cpp-client/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libextractor/gst-hardcode-plugins.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libqmatrixclient/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix rename third_party/nixpkgs/pkgs/development/libraries/{libusb/default.nix => libusb-compat/0.1.nix} (100%) delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/openexr/bootstrap.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/tweeny/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/misc/amdadl-sdk/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/misc/amdapp-sdk/01-remove-aparapi-samples.patch delete mode 100644 third_party/nixpkgs/pkgs/development/misc/amdapp-sdk/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/misc/amdapp-sdk/gcc-5.patch delete mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/async_shell/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/bigstring/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/core_extended/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/core-extended.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-time/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-time/unix.nix delete mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/uri/legacy.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-certificates/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/azure/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/bluepy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pylibftdi/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/transforms3d/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/gox/deps.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix rename third_party/nixpkgs/pkgs/development/tools/{spring-boot => spring-boot-cli}/default.nix (75%) create mode 100644 third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/darwin/yabai/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/broadcom-sta/linux-5.6.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/gotify/mod-sha.nix create mode 100644 third_party/nixpkgs/pkgs/servers/gotify/source-sha.nix delete mode 100755 third_party/nixpkgs/pkgs/servers/gotify/update-yarn-deps.sh create mode 100755 third_party/nixpkgs/pkgs/servers/gotify/update.sh create mode 100644 third_party/nixpkgs/pkgs/servers/gotify/version.nix create mode 100644 third_party/nixpkgs/pkgs/servers/hashi-ui/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix create mode 100644 third_party/nixpkgs/pkgs/shells/fish/dont-codesign-on-mac.diff create mode 100644 third_party/nixpkgs/pkgs/tools/audio/pasystray/fix-wayland.patch create mode 100644 third_party/nixpkgs/pkgs/tools/misc/bat-extras/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/hpcg/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch create mode 100644 third_party/nixpkgs/pkgs/tools/networking/wormhole/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/crowbar/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/0001-Make-it-possible-to-run-the-tests-offline.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/security/prey/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/Gemfile create mode 100644 third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock create mode 100644 third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/gemset.nix diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index e37a4de9d0..7c39ce48a3 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -176,6 +176,7 @@ # PHP /doc/languages-frameworks/php.section.md @etu +/nixos/tests/php @etu +/pkgs/build-support/build-pecl.nix @etu /pkgs/development/interpreters/php @etu /pkgs/top-level/php-packages.nix @etu -/pkgs/build-support/build-pecl.nix @etu diff --git a/third_party/nixpkgs/.github/CONTRIBUTING.md b/third_party/nixpkgs/.github/CONTRIBUTING.md index ae4f68dddc..cb0264b016 100644 --- a/third_party/nixpkgs/.github/CONTRIBUTING.md +++ b/third_party/nixpkgs/.github/CONTRIBUTING.md @@ -50,12 +50,13 @@ For package version upgrades and such a one-line commit message is usually suffi ## Backporting changes -To [backport a change into a release branch](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches): +Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches). -1. Take note of the commit in which the change was introduced into `master`. +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. Use `git cherry-pick -x `. -4. Open your backport PR. Make sure to select the release branch (e.g. `release-20.03`) as the target branch of the PR, and link to the PR in which the original change was made to `master`. +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. +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/PULL_REQUEST_TEMPLATE.md b/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md index 8b12c5f1aa..f443380780 100644 --- a/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md +++ b/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md @@ -1,4 +1,13 @@ - + + ###### Motivation for this change diff --git a/third_party/nixpkgs/doc/contributing/submitting-changes.xml b/third_party/nixpkgs/doc/contributing/submitting-changes.xml index 73222c1a49..a88965f5cc 100644 --- a/third_party/nixpkgs/doc/contributing/submitting-changes.xml +++ b/third_party/nixpkgs/doc/contributing/submitting-changes.xml @@ -407,23 +407,47 @@ Additional information.
Stable release branches - + + For cherry-picking a commit to a stable release branch (backporting), use git cherry-pick -x <original commit> so that the original commit id is included in the commit. + + + + Add a reason for the backport by using git cherry-pick -xe <original commit> instead when it is not obvious from the original commit message. It is not needed when it’s a minor version update that includes security and bug fixes but don’t add new features or when the commit fixes an otherwise broken package. + + + + Here is an example of a cherry-picked commit message with good reason description: + + + +zfs: Keep trying root import until it works + +Works around #11003. + +(cherry picked from commit 98b213a11041af39b39473906b595290e2a4e2f9) + +Reason: several people cannot boot with ZFS on NVMe + + + + Other examples of reasons are: + + + - If you're cherry-picking a commit to a stable release branch (“backporting”), always use git cherry-pick -xe and ensure the message contains a clear description about why this needs to be included in the stable branch. + Previously the build would fail due to, e.g., getaddrinfo not being defined + + - An example of a cherry-picked commit would look like this: + The previous download links were all broken + + + + + Crash when starting on some X11 systems - -nixos: Refactor the world. - -The original commit message describing the reason why the world was torn apart. - -(cherry picked from commit abcdef) -Reason: I just had a gut feeling that this would also be wanted by people from -the stone age. -
diff --git a/third_party/nixpkgs/doc/languages-frameworks/index.xml b/third_party/nixpkgs/doc/languages-frameworks/index.xml index 9364c764bb..a6f56d791c 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/index.xml +++ b/third_party/nixpkgs/doc/languages-frameworks/index.xml @@ -21,6 +21,7 @@ + diff --git a/third_party/nixpkgs/doc/languages-frameworks/php.section.md b/third_party/nixpkgs/doc/languages-frameworks/php.section.md index a302a9a7f8..763beeb593 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/php.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/php.section.md @@ -1,26 +1,30 @@ -# PHP +# PHP {#sec-php} -## User Guide +## User Guide {#ssec-php-user-guide} -### Using PHP - -#### Overview +### Overview {#ssec-php-user-guide-overview} Several versions of PHP are available on Nix, each of which having a wide variety of extensions and libraries available. -The attribute `php` refers to the version of PHP considered most -stable and thoroughly tested in nixpkgs for any given release of -NixOS. Note that while this version of PHP may not be the latest major -release from upstream, any version of PHP supported in nixpkgs may be -utilized by specifying the desired attribute by version, such as -`php74`. +The different versions of PHP that nixpkgs provides are located under +attributes named based on major and minor version number; e.g., +`php74` is PHP 7.4. Only versions of PHP that are supported by upstream for the entirety of a given NixOS release will be included in that release of NixOS. See [PHP Supported Versions](https://www.php.net/supported-versions.php). +The attribute `php` refers to the version of PHP considered most +stable and thoroughly tested in nixpkgs for any given release of +NixOS - not necessarily the latest major release from upstream. + +All available PHP attributes are wrappers around their respective +binary PHP package and provide commonly used extensions this way. The +real PHP 7.4 package, i.e. the unwrapped one, is available as +`php74.unwrapped`; see the next section for more details. + Interactive tools built on PHP are put in `php.packages`; composer is for example available at `php.packages.composer`. @@ -30,39 +34,44 @@ opcache extension shipped with PHP is available at `php.extensions.opcache` and the third-party ImageMagick extension at `php.extensions.imagick`. -The different versions of PHP that nixpkgs provides is located under -attributes named based on major and minor version number; e.g., -`php74` is PHP 7.4 with commonly used extensions installed, -`php74base` is the same PHP runtime without extensions. - -#### Installing PHP with packages +### Installing PHP with extensions {#ssec-php-user-guide-installing-with-extensions} A PHP package with specific extensions enabled can be built using `php.withExtensions`. This is a function which accepts an anonymous -function as its only argument; the function should take one argument, -the set of all extensions, and return a list of wanted extensions. For -example, a PHP package with the opcache and ImageMagick extensions -enabled: +function as its only argument; the function should accept two named +parameters: `enabled` - a list of currently enabled extensions and +`all` - the set of all extensions, and return a list of wanted +extensions. For example, a PHP package with all default extensions and +ImageMagick enabled: ```nix -php.withExtensions (e: with e; [ imagick opcache ]) +php.withExtensions ({ enabled, all }: + enabled ++ [ all.imagick ]) ``` -Note that this will give you a package with _only_ opcache and -ImageMagick, none of the other extensions which are enabled by default -in the `php` package will be available. - -To enable building on a previous PHP package, the currently enabled -extensions are made available in its `enabledExtensions` -attribute. For example, to generate a package with all default -extensions enabled, except opcache, but with ImageMagick: +To exclude some, but not all, of the default extensions, you can +filter the `enabled` list like this: ```nix -php.withExtensions (e: - (lib.filter (e: e != php.extensions.opcache) php.enabledExtensions) - ++ [ e.imagick ]) +php.withExtensions ({ enabled, all }: + (lib.filter (e: e != php.extensions.opcache) enabled) + ++ [ all.imagick ]) ``` +To build your list of extensions from the ground up, you can simply +ignore `enabled`: + +```nix +php.withExtensions ({ all, ... }: with all; [ imagick opcache ]) +``` + +`php.withExtensions` provides extensions by wrapping a minimal php +base package, providing a `php.ini` file listing all extensions to be +loaded. You can access this package through the `php.unwrapped` +attribute; useful if you, for example, need access to the `dev` +output. The generated `php.ini` file can be accessed through the +`php.phpIni` attribute. + If you want a PHP build with extra configuration in the `php.ini` file, you can use `php.buildEnv`. This function takes two named and optional parameters: `extensions` and `extraConfig`. `extensions` @@ -73,19 +82,19 @@ and ImageMagick extensions enabled, and `memory_limit` set to `256M`: ```nix php.buildEnv { - extensions = e: with e; [ imagick opcache ]; + extensions = { all, ... }: with all; [ imagick opcache ]; extraConfig = "memory_limit=256M"; } ``` -##### Example setup for `phpfpm` +#### Example setup for `phpfpm` {#ssec-php-user-guide-installing-with-extensions-phpfpm} You can use the previous examples in a `phpfpm` pool called `foo` as follows: ```nix let - myPhp = php.withExtensions (e: with e; [ imagick opcache ]); + myPhp = php.withExtensions ({ all, ... }: with all; [ imagick opcache ]); in { services.phpfpm.pools."foo".phpPackage = myPhp; }; @@ -94,7 +103,7 @@ in { ```nix let myPhp = php.buildEnv { - extensions = e: with e; [ imagick opcache ]; + extensions = { all, ... }: with all; [ imagick opcache ]; extraConfig = "memory_limit=256M"; }; in { @@ -102,11 +111,27 @@ in { }; ``` -##### Example usage with `nix-shell` +#### Example usage with `nix-shell` {#ssec-php-user-guide-installing-with-extensions-nix-shell} This brings up a temporary environment that contains a PHP interpreter -with the extensions `imagick` and `opcache` enabled. +with the extensions `imagick` and `opcache` enabled: ```sh -nix-shell -p 'php.buildEnv { extensions = e: with e; [ imagick opcache ]; }' +nix-shell -p 'php.withExtensions ({ all, ... }: with all; [ imagick opcache ])' +``` + +### Installing PHP packages with extensions {#ssec-php-user-guide-installing-packages-with-extensions} + +All interactive tools use the PHP package you get them from, so all +packages at `php.packages.*` use the `php` package with its default +extensions. Sometimes this default set of extensions isn't enough and +you may want to extend it. A common case of this is the `composer` +package: a project may depend on certain extensions and `composer` +won't work with that project unless those extensions are loaded. + +Example of building `composer` with additional extensions: +```nix +(php.withExtensions ({ all, enabled }: + enabled ++ (with all; [ imagick redis ])) +).packages.composer ``` diff --git a/third_party/nixpkgs/lib/tests/maintainers.nix b/third_party/nixpkgs/lib/tests/maintainers.nix index 60d296eeca..d3ed398c80 100644 --- a/third_party/nixpkgs/lib/tests/maintainers.nix +++ b/third_party/nixpkgs/lib/tests/maintainers.nix @@ -1,10 +1,11 @@ -# to run these tests: -# nix-build nixpkgs/lib/tests/maintainers.nix -# If nothing is output, all tests passed -{ pkgs ? import ../.. {} }: +# to run these tests (and the others) +# nix-build nixpkgs/lib/tests/release.nix +{ # The pkgs used for dependencies for the testing itself + pkgs +, lib +}: let - inherit (pkgs) lib; inherit (lib) types; maintainerModule = { config, ... }: { diff --git a/third_party/nixpkgs/lib/tests/release.nix b/third_party/nixpkgs/lib/tests/release.nix index ec0f9c32d3..eebee1b49b 100644 --- a/third_party/nixpkgs/lib/tests/release.nix +++ b/third_party/nixpkgs/lib/tests/release.nix @@ -1,8 +1,17 @@ -{ pkgs ? import ../.. {} }: +{ # The pkgs used for dependencies for the testing itself + # Don't test properties of pkgs.lib, but rather the lib in the parent directory + pkgs ? import ../.. {} // { lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!"; } +}: pkgs.runCommandNoCC "nixpkgs-lib-tests" { - buildInputs = [ pkgs.nix (import ./check-eval.nix) (import ./maintainers.nix { inherit pkgs; }) ]; - NIX_PATH = "nixpkgs=${toString pkgs.path}"; + buildInputs = [ + pkgs.nix + (import ./check-eval.nix) + (import ./maintainers.nix { + inherit pkgs; + lib = import ../.; + }) + ]; } '' datadir="${pkgs.nix}/share" export TEST_ROOT=$(pwd)/test-tmp diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index b2187c8fb8..9c98d743ee 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -758,7 +758,7 @@ name = "Jonathan Glines"; }; avaq = { - email = "avaq+nixos@xs4all.nl"; + email = "nixpkgs@account.avaq.it"; github = "avaq"; githubId = 1217745; name = "Aldwin Vlasblom"; @@ -1406,6 +1406,16 @@ githubId = 1103294; name = "Christopher Rosset"; }; + christianharke = { + email = "christian@harke.ch"; + github = "christianharke"; + githubId = 13007345; + name = "Christian Harke"; + keys = [{ + longkeyid = "rsa4096/0x830A9728630966F4"; + fingerprint = "4EBB 30F1 E89A 541A A7F2 52BE 830A 9728 6309 66F4"; + }]; + }; christopherpoole = { email = "mail@christopherpoole.net"; github = "christopherpoole"; @@ -1470,6 +1480,12 @@ githubId = 848609; name = "Michael Bishop"; }; + cmacrae = { + email = "hi@cmacr.ae"; + github = "cmacrae"; + githubId = 3392199; + name = "Calum MacRae"; + }; cmcdragonkai = { email = "roger.qiu@matrix.ai"; github = "cmcdragonkai"; @@ -4068,6 +4084,12 @@ githubId = 6346418; name = "Kolby Crouch"; }; + kolloch = { + email = "info@eigenvalue.net"; + github = "kolloch"; + githubId = 339354; + name = "Peter Kolloch"; + }; konimex = { email = "herdiansyah@netc.eu"; github = "konimex"; @@ -5608,6 +5630,12 @@ githubId = 369111; name = "Morgan Jones"; }; + numkem = { + name = "Sebastien Bariteau"; + email = "numkem@numkem.org"; + github = "numkem"; + githubId = 332423; + }; nyanloutre = { email = "paul@nyanlout.re"; github = "nyanloutre"; @@ -8247,6 +8275,12 @@ githubId = 483465; name = "Mateusz Wykurz"; }; + wulfsta = { + email = "wulfstawulfsta@gmail.com"; + github = "Wulfsta"; + githubId = 13378502; + name = "Wulfsta"; + }; wyvie = { email = "elijahrum@gmail.com"; github = "wyvie"; diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix index 55482b00a3..1fed6a4d9b 100644 --- a/third_party/nixpkgs/maintainers/team-list.nix +++ b/third_party/nixpkgs/maintainers/team-list.nix @@ -17,6 +17,18 @@ { lib }: with lib.maintainers; { + acme = { + members = [ + aanderse + andrew-d + arianvp + emily + flokli + m1cr0man + ]; + scope = "Maintain ACME-related packages and modules."; + }; + freedesktop = { members = [ jtojnar worldofpeace ]; scope = "Maintain Freedesktop.org packages for graphical desktop."; @@ -31,6 +43,17 @@ with lib.maintainers; { scope = "Maintain GNOME desktop environment and platform."; }; + php = { + members = [ + aanderse + etu + globin + ma27 + talyz + ]; + scope = "Maintain PHP related packages and extensions."; + }; + podman = { members = [ adisbladis 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 06dd7c8bfb..110712baf5 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.xml @@ -31,6 +31,7 @@ = true; = true; = true; + = true; diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/installing.xml b/third_party/nixpkgs/nixos/doc/manual/installation/installing.xml index 0dbfb39c32..673df8f2e4 100644 --- a/third_party/nixpkgs/nixos/doc/manual/installation/installing.xml +++ b/third_party/nixpkgs/nixos/doc/manual/installation/installing.xml @@ -41,6 +41,11 @@ neo!) + + If the text is too small to be legible, try setfont ter-132n + to increase the font size. + +
Networking in the installer 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 955c19bd98..78b8eee47e 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,11 @@ GNOME desktop environment was upgraded to 3.36, see its release notes. + + + We now distribute a GNOME ISO. + + PHP now defaults to PHP 7.4, updated from 7.3. @@ -140,69 +145,69 @@ - Since this release there's an easy way to customize your PHP install to get a much smaller - base PHP with only wanted extensions enabled. See the following snippet installing a smaller PHP - with the extensions imagick, opcache and + Since this release there's an easy way to customize your PHP + install to get a much smaller base PHP with only wanted + extensions enabled. See the following snippet installing a + smaller PHP with the extensions imagick, + opcache, pdo and pdo_mysql loaded: environment.systemPackages = [ -(pkgs.php.buildEnv { extensions = pp: with pp; [ - imagick - opcache - pdo_mysql - ]; }) + (pkgs.php.withExtensions + ({ all, ... }: with all; [ + imagick + opcache + pdo + pdo_mysql + ]) + ) ]; - The default php attribute hasn't lost any extensions - - the opcache extension was added there. + The default php attribute hasn't lost any + extensions. The opcache extension has been + added. All upstream PHP extensions are available under ]]>. - The updated php attribute is now easily customizable to your liking - by using extensions instead of writing config files or changing configure flags. - - Therefore we have removed the following configure flags: + All PHP config flags have been removed for + the following reasons: - PHP <literal>config</literal> flags that we don't read anymore: - config.php.argon2 - config.php.bcmath - config.php.bz2 - config.php.calendar - config.php.curl - config.php.exif - config.php.ftp - config.php.gd - config.php.gettext - config.php.gmp - config.php.imap - config.php.intl - config.php.ldap - config.php.libxml2 - config.php.libzip - config.php.mbstring - config.php.mysqli - config.php.mysqlnd - config.php.openssl - config.php.pcntl - config.php.pdo_mysql - config.php.pdo_odbc - config.php.pdo_pgsql - config.php.phpdbg - config.php.postgresql - config.php.readline - config.php.soap - config.php.sockets - config.php.sodium - config.php.sqlite - config.php.tidy - config.php.xmlrpc - config.php.xsl - config.php.zip - config.php.zlib + + + The updated php attribute is now easily + customizable to your liking by using + php.withExtensions or + php.buildEnv instead of writing config files + or changing configure flags. + + + + + The remaining configuration flags can now be set directly on + the php attribute. For example, instead of + + +php.override { + config.php.embed = true; + config.php.apxs2 = false; +} + + + you should now write + + +php.override { + embedSupport = true; + apxs2Support = false; +} + + + + @@ -266,6 +271,46 @@ environment.systemPackages = [ + + + The httpd web server previously started its main process as root + privileged, then ran worker processes as a less privileged identity user. + This was changed to start all of httpd as a less privileged user (defined by + and + ). As a consequence, all files that + are needed for httpd to run (included configuration fragments, SSL + certificates and keys, etc.) must now be readable by this less privileged + user/group. + + + The default value for + has been changed from prefork to event. Along with + this change the default value for + services.httpd.virtualHosts.<name>.http2 + has been set to true. + + + + + The systemd-networkd option + systemd.network.networks.<name>.dhcp.CriticalConnection + has been removed following upstream systemd's deprecation of the same. It is recommended to use + systemd.network.networks.<name>.networkConfig.KeepConfiguration instead. + See systemd.network + 5 for details. + + + + + The systemd-networkd option + systemd.network.networks._name_.dhcpConfig + has been renamed to + + following upstream systemd's documentation change. + See systemd.network + 5 for details. + +
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 07f2751599..d96600b3c9 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py @@ -85,8 +85,6 @@ CHAR_TO_KEY = { } # Forward references -nr_tests: int -failed_tests: list log: "Logger" machines: "List[Machine]" @@ -882,33 +880,16 @@ def run_tests() -> None: if machine.is_up(): machine.execute("sync") - if nr_tests != 0: - nr_succeeded = nr_tests - len(failed_tests) - eprint("{} out of {} tests succeeded".format(nr_succeeded, nr_tests)) - if len(failed_tests) > 0: - eprint( - "The following tests have failed:\n - {}".format( - "\n - ".join(failed_tests) - ) - ) - sys.exit(1) - @contextmanager def subtest(name: str) -> Iterator[None]: - global nr_tests - global failed_tests - with log.nested(name): - nr_tests += 1 try: yield return True except Exception as e: - failed_tests.append( - 'Test "{}" failed with error: "{}"'.format(name, str(e)) - ) - log.log("error: {}".format(str(e))) + log.log(f'Test "{name}" failed with error: "{e}"') + raise e return False @@ -928,9 +909,6 @@ if __name__ == "__main__": ] exec("\n".join(machine_eval)) - nr_tests = 0 - failed_tests = [] - @atexit.register def clean_up() -> None: with log.nested("cleaning up"): diff --git a/third_party/nixpkgs/nixos/maintainers/scripts/azure-new/examples/basic/image.nix b/third_party/nixpkgs/nixos/maintainers/scripts/azure-new/examples/basic/image.nix index 74b1281515..ad62dcd14a 100644 --- a/third_party/nixpkgs/nixos/maintainers/scripts/azure-new/examples/basic/image.nix +++ b/third_party/nixpkgs/nixos/maintainers/scripts/azure-new/examples/basic/image.nix @@ -1,5 +1,5 @@ let - pkgs = (import {}); + pkgs = (import ../../../../../../default.nix {}); machine = import "${pkgs.path}/nixos/lib/eval-config.nix" { system = "x86_64-linux"; modules = [ diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix b/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix index cc70fbf874..a6aa84ae82 100644 --- a/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix +++ b/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix @@ -25,6 +25,7 @@ in fonts = { enableFontDir = mkOption { + type = types.bool; default = false; description = '' Whether to create a directory with links to all fonts in diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/ghostscript.nix b/third_party/nixpkgs/nixos/modules/config/fonts/ghostscript.nix index 1c62a525de..b1dd81bf2d 100644 --- a/third_party/nixpkgs/nixos/modules/config/fonts/ghostscript.nix +++ b/third_party/nixpkgs/nixos/modules/config/fonts/ghostscript.nix @@ -9,6 +9,7 @@ with lib; fonts = { enableGhostscriptFonts = mkOption { + type = types.bool; default = false; description = '' Whether to add the fonts provided by Ghostscript (such as diff --git a/third_party/nixpkgs/nixos/modules/config/ldap.nix b/third_party/nixpkgs/nixos/modules/config/ldap.nix index b554f197dc..4c8b527676 100644 --- a/third_party/nixpkgs/nixos/modules/config/ldap.nix +++ b/third_party/nixpkgs/nixos/modules/config/ldap.nix @@ -88,6 +88,7 @@ in }; useTLS = mkOption { + type = types.bool; default = false; description = '' If enabled, use TLS (encryption) over an LDAP (port 389) @@ -109,6 +110,7 @@ in daemon = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to let the nslcd daemon (nss-pam-ldapd) handle the diff --git a/third_party/nixpkgs/nixos/modules/config/nsswitch.nix b/third_party/nixpkgs/nixos/modules/config/nsswitch.nix index 13277fe56e..77e47a350e 100644 --- a/third_party/nixpkgs/nixos/modules/config/nsswitch.nix +++ b/third_party/nixpkgs/nixos/modules/config/nsswitch.nix @@ -10,35 +10,34 @@ let canLoadExternalModules = config.services.nscd.enable; myhostname = canLoadExternalModules; mymachines = canLoadExternalModules; + # XXX Move these to their respective modules nssmdns = canLoadExternalModules && config.services.avahi.nssmdns; nsswins = canLoadExternalModules && config.services.samba.nsswins; ldap = canLoadExternalModules && (config.users.ldap.enable && config.users.ldap.nsswitch); - sssd = canLoadExternalModules && config.services.sssd.enable; resolved = canLoadExternalModules && config.services.resolved.enable; - googleOsLogin = canLoadExternalModules && config.security.googleOsLogin.enable; - hostArray = [ "files" ] - ++ optional mymachines "mymachines" - ++ optional nssmdns "mdns_minimal [NOTFOUND=return]" - ++ optional nsswins "wins" - ++ optional resolved "resolve [!UNAVAIL=return]" - ++ [ "dns" ] - ++ optional nssmdns "mdns" - ++ optional myhostname "myhostname"; + hostArray = mkMerge [ + (mkBefore [ "files" ]) + (mkIf mymachines [ "mymachines" ]) + (mkIf nssmdns [ "mdns_minimal [NOTFOUND=return]" ]) + (mkIf nsswins [ "wins" ]) + (mkIf resolved [ "resolve [!UNAVAIL=return]" ]) + (mkAfter [ "dns" ]) + (mkIf nssmdns (mkOrder 1501 [ "mdns" ])) # 1501 to ensure it's after dns + (mkIf myhostname (mkOrder 1600 [ "myhostname" ])) # 1600 to ensure it's always the last + ]; - passwdArray = [ "files" ] - ++ optional sssd "sss" - ++ optional ldap "ldap" - ++ optional mymachines "mymachines" - ++ optional googleOsLogin "cache_oslogin oslogin" - ++ [ "systemd" ]; + passwdArray = mkMerge [ + (mkBefore [ "files" ]) + (mkIf ldap [ "ldap" ]) + (mkIf mymachines [ "mymachines" ]) + (mkIf canLoadExternalModules (mkAfter [ "systemd" ])) + ]; - shadowArray = [ "files" ] - ++ optional sssd "sss" - ++ optional ldap "ldap"; - - servicesArray = [ "files" ] - ++ optional sssd "sss"; + shadowArray = mkMerge [ + (mkBefore [ "files" ]) + (mkIf ldap [ "ldap" ]) + ]; in { options = { @@ -61,17 +60,73 @@ in { }; }; - system.nssHosts = mkOption { - type = types.listOf types.str; - default = []; - example = [ "mdns" ]; - description = '' - List of host entries to configure in /etc/nsswitch.conf. - ''; - }; + system.nssDatabases = { + passwd = mkOption { + type = types.listOf types.str; + description = '' + List of passwd entries to configure in /etc/nsswitch.conf. + Note that "files" is always prepended while "systemd" is appended if nscd is enabled. + + This option only takes effect if nscd is enabled. + ''; + default = []; + }; + + group = mkOption { + type = types.listOf types.str; + description = '' + List of group entries to configure in /etc/nsswitch.conf. + + Note that "files" is always prepended while "systemd" is appended if nscd is enabled. + + This option only takes effect if nscd is enabled. + ''; + default = []; + }; + + shadow = mkOption { + type = types.listOf types.str; + description = '' + List of shadow entries to configure in /etc/nsswitch.conf. + + Note that "files" is always prepended. + + This option only takes effect if nscd is enabled. + ''; + default = []; + }; + + hosts = mkOption { + type = types.listOf types.str; + description = '' + List of hosts entries to configure in /etc/nsswitch.conf. + + Note that "files" is always prepended, and "dns" and "myhostname" are always appended. + + This option only takes effect if nscd is enabled. + ''; + default = []; + }; + + services = mkOption { + type = types.listOf types.str; + description = '' + List of services entries to configure in /etc/nsswitch.conf. + + Note that "files" is always prepended. + + This option only takes effect if nscd is enabled. + ''; + default = []; + }; + }; }; + imports = [ + (mkRenamedOptionModule [ "system" "nssHosts" ] [ "system" "nssDatabases" "hosts" ]) + ]; + config = { assertions = [ { @@ -87,30 +142,34 @@ in { ]; # Name Service Switch configuration file. Required by the C - # library. !!! Factor out the mdns stuff. The avahi module - # should define an option used by this module. + # library. environment.etc."nsswitch.conf".text = '' - passwd: ${concatStringsSep " " passwdArray} - group: ${concatStringsSep " " passwdArray} - shadow: ${concatStringsSep " " shadowArray} + passwd: ${concatStringsSep " " config.system.nssDatabases.passwd} + group: ${concatStringsSep " " config.system.nssDatabases.group} + shadow: ${concatStringsSep " " config.system.nssDatabases.shadow} - hosts: ${concatStringsSep " " config.system.nssHosts} + hosts: ${concatStringsSep " " config.system.nssDatabases.hosts} networks: files ethers: files - services: ${concatStringsSep " " servicesArray} + services: ${concatStringsSep " " config.system.nssDatabases.services} protocols: files rpc: files ''; - system.nssHosts = hostArray; + system.nssDatabases = { + passwd = passwdArray; + group = passwdArray; + shadow = shadowArray; + hosts = hostArray; + services = mkBefore [ "files" ]; + }; # Systemd provides nss-myhostname to ensure that our hostname # always resolves to a valid IP address. It returns all locally # configured IP addresses, or ::1 and 127.0.0.2 as # fallbacks. Systemd also provides nss-mymachines to return IP # addresses of local containers. - system.nssModules = (optionals canLoadExternalModules [ config.systemd.package.out ]) - ++ optional googleOsLogin pkgs.google-compute-engine-oslogin.out; + system.nssModules = (optionals canLoadExternalModules [ config.systemd.package.out ]); }; } diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 9303e8fde1..6c7ea293e8 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -1,7 +1,7 @@ # This module contains the basic configuration for building a NixOS # installation CD. -{ config, lib, pkgs, ... }: +{ config, lib, options, pkgs, ... }: with lib; @@ -15,6 +15,9 @@ with lib; ../../profiles/installation-device.nix ]; + # Adds terminus_font for people with HiDPI displays + console.packages = options.console.packages.default ++ [ pkgs.terminus_font ]; + # ISO naming. isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.iso"; diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 7244a7e0a8..0cd17775e5 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -196,7 +196,6 @@ ./security/pam_usb.nix ./security/pam_mount.nix ./security/polkit.nix - ./security/prey.nix ./security/rngd.nix ./security/rtkit.nix ./security/wrappers/default.nix diff --git a/third_party/nixpkgs/nixos/modules/profiles/docker-container.nix b/third_party/nixpkgs/nixos/modules/profiles/docker-container.nix index 5d6b11498b..183645de36 100644 --- a/third_party/nixpkgs/nixos/modules/profiles/docker-container.nix +++ b/third_party/nixpkgs/nixos/modules/profiles/docker-container.nix @@ -2,6 +2,8 @@ with lib; +let inherit (pkgs) writeScript; in + let pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l; @@ -30,7 +32,12 @@ in { ]; # Some container managers like lxc need these - extraCommands = "mkdir -p proc sys dev"; + extraCommands = + let script = writeScript "extra-commands.sh" '' + rm etc + mkdir -p proc sys dev etc + ''; + in script; }; boot.isContainer = true; diff --git a/third_party/nixpkgs/nixos/modules/programs/chromium.nix b/third_party/nixpkgs/nixos/modules/programs/chromium.nix index 41c49db8c7..16c063ebc8 100644 --- a/third_party/nixpkgs/nixos/modules/programs/chromium.nix +++ b/third_party/nixpkgs/nixos/modules/programs/chromium.nix @@ -9,9 +9,7 @@ let HomepageLocation = cfg.homepageLocation; DefaultSearchProviderSearchURL = cfg.defaultSearchProviderSearchURL; DefaultSearchProviderSuggestURL = cfg.defaultSearchProviderSuggestURL; - ExtensionInstallForcelist = map (extension: - "${extension};https://clients2.google.com/service/update2/crx" - ) cfg.extensions; + ExtensionInstallForcelist = cfg.extensions; }; in @@ -28,7 +26,11 @@ in List of chromium extensions to install. For list of plugins ids see id in url of extensions on chrome web store - page. + page. To install a chromium extension not included in the chrome web + store, append to the extension id a semicolon ";" followed by a URL + pointing to an Update Manifest XML file. See + ExtensionInstallForcelist + for additional details. ''; default = []; example = literalExample '' diff --git a/third_party/nixpkgs/nixos/modules/programs/fish.nix b/third_party/nixpkgs/nixos/modules/programs/fish.nix index 87f6816e4a..48b324a0fe 100644 --- a/third_party/nixpkgs/nixos/modules/programs/fish.nix +++ b/third_party/nixpkgs/nixos/modules/programs/fish.nix @@ -178,6 +178,10 @@ in set -l post (string join0 $fish_complete_path | string match --regex "[^\x00]*generated_completions.*" | string split0 | string match -er ".") set fish_complete_path $prev "/etc/fish/generated_completions" $post end + # prevent fish from generating completions on first run + if not test -d $__fish_user_data_dir/generated_completions + ${pkgs.coreutils}/bin/mkdir $__fish_user_data_dir/generated_completions + end ''; environment.etc."fish/generated_completions".source = diff --git a/third_party/nixpkgs/nixos/modules/programs/xonsh.nix b/third_party/nixpkgs/nixos/modules/programs/xonsh.nix index 1590020f7b..c06fd1655c 100644 --- a/third_party/nixpkgs/nixos/modules/programs/xonsh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/xonsh.nix @@ -45,7 +45,32 @@ in config = mkIf cfg.enable { - environment.etc.xonshrc.text = cfg.config; + environment.etc.xonshrc.text = '' + # /etc/xonshrc: DO NOT EDIT -- this file has been generated automatically. + + + if not ''${...}.get('__NIXOS_SET_ENVIRONMENT_DONE'): + # The NixOS environment and thereby also $PATH + # haven't been fully set up at this point. But + # `source-bash` below requires `bash` to be on $PATH, + # so add an entry with bash's location: + $PATH.add('${pkgs.bash}/bin') + + # Stash xonsh's ls alias, so that we don't get a collision + # with Bash's ls alias from environment.shellAliases: + _ls_alias = aliases.pop('ls', None) + + # Source the NixOS environment config. + source-bash "${config.system.build.setEnvironment}" + + # Restore xonsh's ls alias, overriding that from Bash (if any). + if _ls_alias is not None: + aliases['ls'] = _ls_alias + del _ls_alias + + + ${cfg.config} + ''; environment.systemPackages = [ cfg.package ]; diff --git a/third_party/nixpkgs/nixos/modules/rename.nix b/third_party/nixpkgs/nixos/modules/rename.nix index 410db8fd84..a946268494 100644 --- a/third_party/nixpkgs/nixos/modules/rename.nix +++ b/third_party/nixpkgs/nixos/modules/rename.nix @@ -49,6 +49,10 @@ with lib; simply add the brightnessctl package to environment.systemPackages. '') + (mkRemovedOptionModule ["services" "prey" ] '' + prey-bash-client is deprecated upstream + '') + # 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 39976380e3..82cd6431ad 100644 --- a/third_party/nixpkgs/nixos/modules/security/acme.nix +++ b/third_party/nixpkgs/nixos/modules/security/acme.nix @@ -99,7 +99,7 @@ let keyType = mkOption { type = types.str; - default = "ec384"; + default = "ec256"; description = '' Key type to use for private keys. For an up to date list of supported values check the --key-type option @@ -458,7 +458,7 @@ in ]; meta = { - maintainers = with lib.maintainers; [ abbradar fpletz globin m1cr0man ]; + maintainers = lib.teams.acme.members; doc = ./acme.xml; }; } diff --git a/third_party/nixpkgs/nixos/modules/security/apparmor-suid.nix b/third_party/nixpkgs/nixos/modules/security/apparmor-suid.nix index 3c93f5440a..6c479e070e 100644 --- a/third_party/nixpkgs/nixos/modules/security/apparmor-suid.nix +++ b/third_party/nixpkgs/nixos/modules/security/apparmor-suid.nix @@ -9,6 +9,7 @@ with lib; ]; options.security.apparmor.confineSUIDApplications = mkOption { + type = types.bool; default = true; description = '' Install AppArmor profiles for commonly-used SUID application diff --git a/third_party/nixpkgs/nixos/modules/security/google_oslogin.nix b/third_party/nixpkgs/nixos/modules/security/google_oslogin.nix index 6f9962e1d6..78c2089bae 100644 --- a/third_party/nixpkgs/nixos/modules/security/google_oslogin.nix +++ b/third_party/nixpkgs/nixos/modules/security/google_oslogin.nix @@ -49,6 +49,7 @@ in # enable the nss module, so user lookups etc. work system.nssModules = [ package ]; + system.nssDatabases.passwd = [ "cache_oslogin" "oslogin" ]; # Ugly: sshd refuses to start if a store path is given because /nix/store is group-writable. # So indirect by a symlink. diff --git a/third_party/nixpkgs/nixos/modules/security/pam.nix b/third_party/nixpkgs/nixos/modules/security/pam.nix index bfc2a88138..b99316803f 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam.nix @@ -219,6 +219,14 @@ let ''; }; + nodelay = mkOption { + default = false; + type = types.bool; + description = '' + Wheather the delay after typing a wrong password should be disabled. + ''; + }; + requireWheel = mkOption { default = false; type = types.bool; @@ -366,7 +374,7 @@ let || cfg.enableGnomeKeyring || cfg.googleAuthenticator.enable || cfg.duoSecurity.enable)) '' - auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth + auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth ${optionalString config.security.pam.enableEcryptfs "auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} ${optionalString cfg.pamMount @@ -382,7 +390,7 @@ let "auth required ${pkgs.duo-unix}/lib/security/pam_duo.so"} '') + '' ${optionalString cfg.unixAuth - "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"} + "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth try_first_pass"} ${optionalString cfg.otpwAuth "auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"} ${optionalString use_ldap @@ -545,6 +553,7 @@ in }; security.pam.enableSSHAgentAuth = mkOption { + type = types.bool; default = false; description = '' @@ -555,12 +564,7 @@ in ''; }; - security.pam.enableOTPW = mkOption { - default = false; - description = '' - Enable the OTPW (one-time password) PAM module. - ''; - }; + security.pam.enableOTPW = mkEnableOption "the OTPW (one-time password) PAM module"; security.pam.u2f = { enable = mkOption { @@ -719,12 +723,7 @@ in }; }; - security.pam.enableEcryptfs = mkOption { - default = false; - description = '' - Enable eCryptfs PAM module (mounting ecryptfs home directory on login). - ''; - }; + security.pam.enableEcryptfs = mkEnableOption "eCryptfs PAM module (mounting ecryptfs home directory on login)"; users.motd = mkOption { default = null; diff --git a/third_party/nixpkgs/nixos/modules/security/prey.nix b/third_party/nixpkgs/nixos/modules/security/prey.nix deleted file mode 100644 index b899ccb6c3..0000000000 --- a/third_party/nixpkgs/nixos/modules/security/prey.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.prey; - myPrey = pkgs.prey-bash-client.override { - apiKey = cfg.apiKey; - deviceKey = cfg.deviceKey; - }; -in { - options = { - - services.prey = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Enables the - shell client. Be sure to specify both API and device keys. - Once enabled, a cron job will run every 15 - minutes to report status information. - ''; - }; - - deviceKey = mkOption { - type = types.str; - description = '' - Device key obtained by visiting - - and clicking on your device. - ''; - }; - - apiKey = mkOption { - type = types.str; - description = '' - API key obtained from - . - ''; - }; - }; - - }; - - config = mkIf cfg.enable { - environment.systemPackages = [ myPrey ]; - services.cron.systemCronJobs = [ "*/15 * * * * root ${myPrey}/prey.sh" ]; - }; - -} diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix index ccdf54d128..2e8bf20a68 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix @@ -81,8 +81,8 @@ in after = mkIf cfg.docker [ "docker.service" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - # Taken from https://github.com/rancher/k3s/blob/v1.17.4+k3s1/contrib/ansible/roles/k3s/node/templates/k3s.service.j2 - Type = "notify"; + # See: https://github.com/rancher/k3s/blob/dddbd16305284ae4bd14c0aade892412310d7edc/install.sh#L197 + Type = if cfg.role == "agent" then "exec" else "notify"; KillMode = "process"; Delegate = "yes"; Restart = "always"; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix index bd4cf6a37b..84f04a2764 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -1,160 +1,494 @@ { config, lib, pkgs, ... }: - with lib; - let cfg = config.services.gitlab-runner; - configFile = - if (cfg.configFile == null) then - (pkgs.runCommand "config.toml" { - buildInputs = [ pkgs.remarshal ]; - preferLocalBuild = true; - } '' - remarshal -if json -of toml \ - < ${pkgs.writeText "config.json" (builtins.toJSON cfg.configOptions)} \ - > $out - '') - else - cfg.configFile; hasDocker = config.virtualisation.docker.enable; + hashedServices = with builtins; (mapAttrs' (name: service: nameValuePair + "${name}_${config.networking.hostName}_${ + substring 0 12 + (hashString "md5" (unsafeDiscardStringContext (toJSON service)))}" + service) + cfg.services); + configPath = "$HOME/.gitlab-runner/config.toml"; + configureScript = pkgs.writeShellScriptBin "gitlab-runner-configure" ( + if (cfg.configFile != null) then '' + mkdir -p $(dirname ${configPath}) + cp ${cfg.configFile} ${configPath} + # make config file readable by service + chown -R --reference=$HOME $(dirname ${configPath}) + '' else '' + export CONFIG_FILE=${configPath} + + mkdir -p $(dirname ${configPath}) + + # remove no longer existing services + gitlab-runner verify --delete + + # current and desired state + NEEDED_SERVICES=$(echo ${concatStringsSep " " (attrNames hashedServices)} | tr " " "\n") + REGISTERED_SERVICES=$(gitlab-runner list 2>&1 | grep 'Executor' | awk '{ print $1 }') + + # difference between current and desired state + NEW_SERVICES=$(grep -vxF -f <(echo "$REGISTERED_SERVICES") <(echo "$NEEDED_SERVICES") || true) + OLD_SERVICES=$(grep -vxF -f <(echo "$NEEDED_SERVICES") <(echo "$REGISTERED_SERVICES") || true) + + # register new services + ${concatStringsSep "\n" (mapAttrsToList (name: service: '' + if echo "$NEW_SERVICES" | grep -xq ${name}; then + bash -c ${escapeShellArg (concatStringsSep " \\\n " ([ + "set -a && source ${service.registrationConfigFile} &&" + "gitlab-runner register" + "--non-interactive" + "--name ${name}" + "--executor ${service.executor}" + "--limit ${toString service.limit}" + "--request-concurrency ${toString service.requestConcurrency}" + "--maximum-timeout ${toString service.maximumTimeout}" + ] ++ service.registrationFlags + ++ optional (service.buildsDir != null) + "--builds-dir ${service.buildsDir}" + ++ optional (service.preCloneScript != null) + "--pre-clone-script ${service.preCloneScript}" + ++ optional (service.preBuildScript != null) + "--pre-build-script ${service.preBuildScript}" + ++ optional (service.postBuildScript != null) + "--post-build-script ${service.postBuildScript}" + ++ optional (service.tagList != [ ]) + "--tag-list ${concatStringsSep "," service.tagList}" + ++ optional service.runUntagged + "--run-untagged" + ++ optional service.protected + "--access-level ref_protected" + ++ optional service.debugTraceDisabled + "--debug-trace-disabled" + ++ map (e: "--env ${escapeShellArg e}") (mapAttrsToList (name: value: "${name}=${value}") service.environmentVariables) + ++ optionals (service.executor == "docker") ( + assert ( + assertMsg (service.dockerImage != null) + "dockerImage option is required for docker executor (${name})"); + [ "--docker-image ${service.dockerImage}" ] + ++ optional service.dockerDisableCache + "--docker-disable-cache" + ++ optional service.dockerPrivileged + "--docker-privileged" + ++ map (v: "--docker-volumes ${escapeShellArg v}") service.dockerVolumes + ++ map (v: "--docker-extra-hosts ${escapeShellArg v}") service.dockerExtraHosts + ++ map (v: "--docker-allowed-images ${escapeShellArg v}") service.dockerAllowedImages + ++ map (v: "--docker-allowed-services ${escapeShellArg v}") service.dockerAllowedServices + ) + ))} && sleep 1 + fi + '') hashedServices)} + + # unregister old services + for NAME in $(echo "$OLD_SERVICES") + do + [ ! -z "$NAME" ] && gitlab-runner unregister \ + --name "$NAME" && sleep 1 + done + + # update global options + remarshal --if toml --of json ${configPath} \ + | jq -cM '.check_interval = ${toString cfg.checkInterval} | + .concurrent = ${toString cfg.concurrent}' \ + | remarshal --if json --of toml \ + | sponge ${configPath} + + # make config file readable by service + chown -R --reference=$HOME $(dirname ${configPath}) + ''); + startScript = pkgs.writeShellScriptBin "gitlab-runner-start" '' + export CONFIG_FILE=${configPath} + exec gitlab-runner run --working-directory $HOME + ''; in { options.services.gitlab-runner = { enable = mkEnableOption "Gitlab Runner"; - configFile = mkOption { + type = types.nullOr types.path; default = null; description = '' Configuration file for gitlab-runner. - Use this option in favor of configOptions to avoid placing CI tokens in the nix store. - takes precedence over . + takes precedence over . + and will be ignored too. - Warning: Not using will potentially result in secrets - leaking into the WORLD-READABLE nix store. + This option is deprecated, please use instead. + You can use and + + for settings not covered by this module. ''; - type = types.nullOr types.path; }; - - configOptions = mkOption { + checkInterval = mkOption { + type = types.int; + default = 0; + example = literalExample "with lib; (length (attrNames config.services.gitlab-runner.services)) * 3"; description = '' - Configuration for gitlab-runner - will take precedence over this option. - - Warning: all Configuration, especially CI token, will be stored in a - WORLD-READABLE file in the Nix Store. - - If you want to protect your CI token use instead. + Defines the interval length, in seconds, between new jobs check. + The default value is 3; + if set to 0 or lower, the default value will be used. + See runner documentation for more information. + ''; + }; + concurrent = mkOption { + type = types.int; + default = 1; + example = literalExample "config.nix.maxJobs"; + description = '' + Limits how many jobs globally can be run concurrently. + The most upper limit of jobs using all defined runners. + 0 does not mean unlimited. ''; - type = types.attrs; - example = { - concurrent = 2; - runners = [{ - name = "docker-nix-1.11"; - url = "https://CI/"; - token = "TOKEN"; - executor = "docker"; - builds_dir = ""; - docker = { - host = ""; - image = "nixos/nix:1.11"; - privileged = true; - disable_cache = true; - cache_dir = ""; - }; - }]; - }; }; - gracefulTermination = mkOption { - default = false; type = types.bool; + default = false; description = '' - Finish all remaining jobs before stopping, restarting or reconfiguring. - If not set gitlab-runner will stop immediatly without waiting for jobs to finish, - which will lead to failed builds. + Finish all remaining jobs before stopping. + If not set gitlab-runner will stop immediatly without waiting + for jobs to finish, which will lead to failed builds. ''; }; - gracefulTimeout = mkOption { - default = "infinity"; type = types.str; + default = "infinity"; example = "5min 20s"; - description = ''Time to wait until a graceful shutdown is turned into a forceful one.''; + description = '' + Time to wait until a graceful shutdown is turned into a forceful one. + ''; }; - - workDir = mkOption { - default = "/var/lib/gitlab-runner"; - type = types.path; - description = "The working directory used"; - }; - package = mkOption { - description = "Gitlab Runner package to use"; + type = types.package; default = pkgs.gitlab-runner; defaultText = "pkgs.gitlab-runner"; - type = types.package; example = literalExample "pkgs.gitlab-runner_1_11"; + description = "Gitlab Runner package to use."; }; - - packages = mkOption { - default = [ pkgs.bash pkgs.docker-machine ]; - defaultText = "[ pkgs.bash pkgs.docker-machine ]"; + extraPackages = mkOption { type = types.listOf types.package; + default = [ ]; description = '' - Packages to add to PATH for the gitlab-runner process. + Extra packages to add to PATH for the gitlab-runner process. ''; }; + services = mkOption { + description = "GitLab Runner services."; + default = { }; + example = literalExample '' + { + # runner for building in docker via host's nix-daemon + # nix store will be readable in runner, might be insecure + nix = { + # File should contain at least these two variables: + # `CI_SERVER_URL` + # `REGISTRATION_TOKEN` + registrationConfigFile = "/run/secrets/gitlab-runner-registration"; + dockerImage = "alpine"; + dockerVolumes = [ + "/nix/store:/nix/store:ro" + "/nix/var/nix/db:/nix/var/nix/db:ro" + "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro" + ]; + dockerDisableCache = true; + preBuildScript = pkgs.writeScript "setup-container" ''' + mkdir -p -m 0755 /nix/var/log/nix/drvs + mkdir -p -m 0755 /nix/var/nix/gcroots + mkdir -p -m 0755 /nix/var/nix/profiles + mkdir -p -m 0755 /nix/var/nix/temproots + mkdir -p -m 0755 /nix/var/nix/userpool + mkdir -p -m 1777 /nix/var/nix/gcroots/per-user + mkdir -p -m 1777 /nix/var/nix/profiles/per-user + mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root + mkdir -p -m 0700 "$HOME/.nix-defexpr" + . ''${pkgs.nix}/etc/profile.d/nix.sh + + ''${pkgs.nix}/bin/nix-env -i ''${concatStringsSep " " (with pkgs; [ nix cacert git openssh ])} + + ''${pkgs.nix}/bin/nix-channel --add https://nixos.org/channels/nixpkgs-unstable + ''${pkgs.nix}/bin/nix-channel --update nixpkgs + '''; + environmentVariables = { + ENV = "/etc/profile"; + USER = "root"; + NIX_REMOTE = "daemon"; + PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin"; + NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"; + }; + tagList = [ "nix" ]; + }; + # runner for building docker images + docker-images = { + # File should contain at least these two variables: + # `CI_SERVER_URL` + # `REGISTRATION_TOKEN` + registrationConfigFile = "/run/secrets/gitlab-runner-registration"; + dockerImage = "docker:stable"; + dockerVolumes = [ + "/var/run/docker.sock:/var/run/docker.sock" + ]; + tagList = [ "docker-images" ]; + }; + # runner for executing stuff on host system (very insecure!) + # make sure to add required packages (including git!) + # to `environment.systemPackages` + shell = { + # File should contain at least these two variables: + # `CI_SERVER_URL` + # `REGISTRATION_TOKEN` + registrationConfigFile = "/run/secrets/gitlab-runner-registration"; + executor = "shell"; + tagList = [ "shell" ]; + }; + # runner for everything else + default = { + # File should contain at least these two variables: + # `CI_SERVER_URL` + # `REGISTRATION_TOKEN` + registrationConfigFile = "/run/secrets/gitlab-runner-registration"; + dockerImage = "debian:stable"; + }; + } + ''; + type = types.attrsOf (types.submodule { + options = { + registrationConfigFile = mkOption { + type = types.path; + description = '' + Absolute path to a file with environment variables + used for gitlab-runner registration. + A list of all supported environment variables can be found in + gitlab-runner register --help. + + Ones that you probably want to set is + + CI_SERVER_URL=<CI server URL> + + REGISTRATION_TOKEN=<registration secret> + ''; + }; + registrationFlags = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "--docker-helper-image my/gitlab-runner-helper" ]; + description = '' + Extra command-line flags passed to + gitlab-runner register. + Execute gitlab-runner register --help + for a list of supported flags. + ''; + }; + environmentVariables = mkOption { + type = types.attrsOf types.str; + default = { }; + example = { NAME = "value"; }; + description = '' + Custom environment variables injected to build environment. + For secrets you can use + with RUNNER_ENV variable set. + ''; + }; + executor = mkOption { + type = types.str; + default = "docker"; + description = '' + Select executor, eg. shell, docker, etc. + See runner documentation for more information. + ''; + }; + buildsDir = mkOption { + type = types.nullOr types.path; + default = null; + example = "/var/lib/gitlab-runner/builds"; + description = '' + Absolute path to a directory where builds will be stored + in context of selected executor (Locally, Docker, SSH). + ''; + }; + dockerImage = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Docker image to be used. + ''; + }; + dockerVolumes = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "/var/run/docker.sock:/var/run/docker.sock" ]; + description = '' + Bind-mount a volume and create it + if it doesn't exist prior to mounting. + ''; + }; + dockerDisableCache = mkOption { + type = types.bool; + default = false; + description = '' + Disable all container caching. + ''; + }; + dockerPrivileged = mkOption { + type = types.bool; + default = false; + description = '' + Give extended privileges to container. + ''; + }; + dockerExtraHosts = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "other-host:127.0.0.1" ]; + description = '' + Add a custom host-to-IP mapping. + ''; + }; + dockerAllowedImages = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "ruby:*" "python:*" "php:*" "my.registry.tld:5000/*:*" ]; + description = '' + Whitelist allowed images. + ''; + }; + dockerAllowedServices = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "postgres:9" "redis:*" "mysql:*" ]; + description = '' + Whitelist allowed services. + ''; + }; + preCloneScript = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Runner-specific command script executed before code is pulled. + ''; + }; + preBuildScript = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Runner-specific command script executed after code is pulled, + just before build executes. + ''; + }; + postBuildScript = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Runner-specific command script executed after code is pulled + and just after build executes. + ''; + }; + tagList = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + Tag list. + ''; + }; + runUntagged = mkOption { + type = types.bool; + default = false; + description = '' + Register to run untagged builds; defaults to + true when is empty. + ''; + }; + limit = mkOption { + type = types.int; + default = 0; + description = '' + Limit how many jobs can be handled concurrently by this service. + 0 (default) simply means don't limit. + ''; + }; + requestConcurrency = mkOption { + type = types.int; + default = 0; + description = '' + Limit number of concurrent requests for new jobs from GitLab. + ''; + }; + maximumTimeout = mkOption { + type = types.int; + default = 0; + description = '' + What is the maximum timeout (in seconds) that will be set for + job when using this Runner. 0 (default) simply means don't limit. + ''; + }; + protected = mkOption { + type = types.bool; + default = false; + description = '' + When set to true Runner will only run on pipelines + triggered on protected branches. + ''; + }; + debugTraceDisabled = mkOption { + type = types.bool; + default = false; + description = '' + When set to true Runner will disable the possibility of + using the CI_DEBUG_TRACE feature. + ''; + }; + }; + }); + }; }; - config = mkIf cfg.enable { + warnings = optional (cfg.configFile != null) "services.gitlab-runner.`configFile` is deprecated, please use services.gitlab-runner.`services`."; + environment.systemPackages = [ cfg.package ]; systemd.services.gitlab-runner = { - path = cfg.packages; - environment = config.networking.proxy.envVars // { - # Gitlab runner will not start if the HOME variable is not set - HOME = cfg.workDir; - }; description = "Gitlab Runner"; + documentation = [ "https://docs.gitlab.com/runner/" ]; after = [ "network.target" ] ++ optional hasDocker "docker.service"; requires = optional hasDocker "docker.service"; wantedBy = [ "multi-user.target" ]; + environment = config.networking.proxy.envVars // { + HOME = "/var/lib/gitlab-runner"; + }; + path = with pkgs; [ + bash + gawk + jq + moreutils + remarshal + utillinux + cfg.package.bin + ] ++ cfg.extraPackages; reloadIfChanged = true; - restartTriggers = [ - config.environment.etc."gitlab-runner/config.toml".source - ]; serviceConfig = { + # Set `DynamicUser` under `systemd.services.gitlab-runner.serviceConfig` + # to `lib.mkForce false` in your configuration to run this service as root. + # You can also set `User` and `Group` options to run this service as desired user. + # Make sure to restart service or changes won't apply. + DynamicUser = true; StateDirectory = "gitlab-runner"; - ExecReload= "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - ExecStart = ''${cfg.package.bin}/bin/gitlab-runner run \ - --working-directory ${cfg.workDir} \ - --config /etc/gitlab-runner/config.toml \ - --service gitlab-runner \ - --user gitlab-runner \ - ''; - - } // optionalAttrs (cfg.gracefulTermination) { + SupplementaryGroups = optional hasDocker "docker"; + ExecStartPre = "!${configureScript}/bin/gitlab-runner-configure"; + ExecStart = "${startScript}/bin/gitlab-runner-start"; + ExecReload = "!${configureScript}/bin/gitlab-runner-configure"; + } // optionalAttrs (cfg.gracefulTermination) { TimeoutStopSec = "${cfg.gracefulTimeout}"; KillSignal = "SIGQUIT"; KillMode = "process"; }; }; - - # Make the gitlab-runner command availabe so users can query the runner - environment.systemPackages = [ cfg.package ]; - - # Make sure the config can be reloaded on change - environment.etc."gitlab-runner/config.toml".source = configFile; - - users.users.gitlab-runner = { - group = "gitlab-runner"; - extraGroups = optional hasDocker "docker"; - uid = config.ids.uids.gitlab-runner; - home = cfg.workDir; - createHome = true; - }; - - users.groups.gitlab-runner.gid = config.ids.gids.gitlab-runner; + # Enable docker if `docker` executor is used in any service + virtualisation.docker.enable = mkIf ( + any (s: s.executor == "docker") (attrValues cfg.services) + ) (mkDefault true); }; + imports = [ + (mkRenamedOptionModule [ "services" "gitlab-runner" "packages" ] [ "services" "gitlab-runner" "extraPackages" ] ) + (mkRemovedOptionModule [ "services" "gitlab-runner" "configOptions" ] "Use services.gitlab-runner.services option instead" ) + (mkRemovedOptionModule [ "services" "gitlab-runner" "workDir" ] "You should move contents of workDir (if any) to /var/lib/gitlab-runner" ) + ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix b/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix index 19e11b31d9..608f64a68f 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix @@ -269,6 +269,7 @@ in }; enableSmtp = mkOption { + type = types.bool; default = true; description = "Whether to enable smtp in master.cf."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix b/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix index 21e92cfee0..ed1439745a 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix @@ -7,7 +7,7 @@ let fpm = config.services.phpfpm.pools.roundcube; localDB = cfg.database.host == "localhost"; user = cfg.database.username; - phpWithPspell = pkgs.php.withExtensions (e: [ e.pspell ] ++ pkgs.php.enabledExtensions); + phpWithPspell = pkgs.php.withExtensions ({ enabled, all }: [ all.pspell ] ++ enabled); in { options.services.roundcube = { diff --git a/third_party/nixpkgs/nixos/modules/services/mail/spamassassin.nix b/third_party/nixpkgs/nixos/modules/services/mail/spamassassin.nix index f6c0b9c794..4e642542ec 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/spamassassin.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/spamassassin.nix @@ -15,6 +15,7 @@ in enable = mkEnableOption "the SpamAssassin daemon"; debug = mkOption { + type = types.bool; default = false; description = "Whether to run the SpamAssassin daemon in debug mode"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/autofs.nix b/third_party/nixpkgs/nixos/modules/services/misc/autofs.nix index 84f49f964b..5e7c1e6682 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/autofs.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/autofs.nix @@ -57,6 +57,7 @@ in }; debug = mkOption { + type = types.bool; default = false; description = '' Pass -d and -7 to automount and write log to the system journal. diff --git a/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix b/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix index 0776ac6790..69386cdbb3 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix @@ -25,10 +25,7 @@ in description = "Whether to support multi-user mode by enabling the Disnix D-Bus service"; }; - useWebServiceInterface = mkOption { - default = false; - description = "Whether to enable the DisnixWebService interface running on Apache Tomcat"; - }; + useWebServiceInterface = mkEnableOption "the DisnixWebService interface running on Apache Tomcat"; package = mkOption { type = types.path; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix index aa95898537..730166b04d 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix @@ -180,7 +180,7 @@ let ${optionalString (cfg.smtp.passwordFile != null) ''password: "@smtpPassword@",''} domain: "${cfg.smtp.domain}", ${optionalString (cfg.smtp.authentication != null) "authentication: :${cfg.smtp.authentication},"} - enable_starttls_auto: ${toString cfg.smtp.enableStartTLSAuto}, + enable_starttls_auto: ${boolToString cfg.smtp.enableStartTLSAuto}, ca_file: "/etc/ssl/certs/ca-certificates.crt", openssl_verify_mode: '${cfg.smtp.opensslVerifyMode}' } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix b/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix index 651ed37438..7a71d2c8c6 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix @@ -17,9 +17,9 @@ let cfgUpdate = pkgs.writeText "octoprint-config.yaml" (builtins.toJSON fullConfig); - pluginsEnv = pkgs.python.buildEnv.override { - extraLibs = cfg.plugins pkgs.octoprint-plugins; - }; + pluginsEnv = package.python.withPackages (ps: [ps.octoprint] ++ (cfg.plugins ps)); + + package = pkgs.octoprint; in { @@ -106,7 +106,6 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; path = [ pluginsEnv ]; - environment.PYTHONPATH = makeSearchPathOutput "lib" pkgs.python.sitePackages [ pluginsEnv ]; preStart = '' if [ -e "${cfg.stateDir}/config.yaml" ]; then @@ -119,7 +118,7 @@ in ''; serviceConfig = { - ExecStart = "${pkgs.octoprint}/bin/octoprint serve -b ${cfg.stateDir}"; + ExecStart = "${pluginsEnv}/bin/octoprint serve -b ${cfg.stateDir}"; User = cfg.user; Group = cfg.group; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/pykms.nix b/third_party/nixpkgs/nixos/modules/services/misc/pykms.nix index 25aa27ae76..d6aeae48cc 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/pykms.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/pykms.nix @@ -82,6 +82,7 @@ in { ]); ProtectHome = "tmpfs"; WorkingDirectory = libDir; + SyslogIdentifier = "pykms"; Restart = "on-failure"; MemoryLimit = cfg.memoryLimit; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/sssd.nix b/third_party/nixpkgs/nixos/modules/services/misc/sssd.nix index 36008d2574..77f6ccfe64 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/sssd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/sssd.nix @@ -75,6 +75,11 @@ in { }; system.nssModules = optional cfg.enable pkgs.sssd; + system.nssDatabases = { + passwd = [ "sss" ]; + shadow = [ "sss" ]; + services = [ "sss" ]; + }; services.dbus.packages = [ pkgs.sssd ]; }) diff --git a/third_party/nixpkgs/nixos/modules/services/networking/gogoclient.nix b/third_party/nixpkgs/nixos/modules/services/networking/gogoclient.nix index c9b03bca71..99455b1831 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/gogoclient.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/gogoclient.nix @@ -19,6 +19,7 @@ in ''; }; autorun = mkOption { + type = types.bool; default = true; description = '' Whether to automatically start the tunnel. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix b/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix index 12c0626a94..6418ae6994 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix @@ -72,6 +72,7 @@ in }; noScan = mkOption { + type = types.bool; default = false; description = '' Do not scan for overlapping BSSs in HT40+/- mode. @@ -127,6 +128,7 @@ in }; wpa = mkOption { + type = types.bool; default = true; description = '' Enable WPA (IEEE 802.11i/D3.0) to authenticate with the access point. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/openfire.nix b/third_party/nixpkgs/nixos/modules/services/networking/openfire.nix index c74f3611f7..fe0499d523 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/openfire.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/openfire.nix @@ -12,6 +12,7 @@ with lib; enable = mkEnableOption "OpenFire XMPP server"; usePostgreSQL = mkOption { + type = types.bool; default = true; description = " Whether you use PostgreSQL service for your storage back-end. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix b/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix index 7a503e7116..9825613d80 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix @@ -1,9 +1,7 @@ { config, lib, pkgs, ... }: with lib; - let - cfg = config.services.prosody; sslOpts = { ... }: { @@ -30,8 +28,21 @@ let }; }; + discoOpts = { + options = { + url = mkOption { + type = types.str; + description = "URL of the endpoint you want to make discoverable"; + }; + description = mkOption { + type = types.str; + description = "A short description of the endpoint you want to advertise"; + }; + }; + }; + moduleOpts = { - # Generally required + # Required for compliance with https://compliance.conversations.im/about/ roster = mkOption { type = types.bool; default = true; @@ -69,6 +80,18 @@ let description = "Keep multiple clients in sync"; }; + csi = mkOption { + type = types.bool; + default = true; + description = "Implements the CSI protocol that allows clients to report their active/inactive state to the server"; + }; + + cloud_notify = mkOption { + type = types.bool; + default = true; + description = "Push notifications to inform users of new messages or other pertinent information even when they have no XMPP clients online"; + }; + pep = mkOption { type = types.bool; default = true; @@ -89,10 +112,22 @@ let vcard = mkOption { type = types.bool; - default = true; + default = false; description = "Allow users to set vCards"; }; + vcard_legacy = mkOption { + type = types.bool; + default = true; + description = "Converts users profiles and Avatars between old and new formats"; + }; + + bookmarks = mkOption { + type = types.bool; + default = true; + description = "Allows interop between older clients that use XEP-0048: Bookmarks in its 1.0 version and recent clients which use it in PEP"; + }; + # Nice to have version = mkOption { type = types.bool; @@ -126,10 +161,16 @@ let mam = mkOption { type = types.bool; - default = false; + default = true; description = "Store messages in an archive and allow users to access it"; }; + smacks = mkOption { + type = types.bool; + default = true; + description = "Allow a client to resume a disconnected session, and prevent message loss"; + }; + # Admin interfaces admin_adhoc = mkOption { type = types.bool; @@ -137,6 +178,18 @@ let description = "Allows administration via an XMPP client that supports ad-hoc commands"; }; + http_files = mkOption { + type = types.bool; + default = true; + description = "Serve static files from a directory over HTTP"; + }; + + proxy65 = mkOption { + type = types.bool; + default = true; + description = "Enables a file transfer proxy service which clients behind NAT can use"; + }; + admin_telnet = mkOption { type = types.bool; default = false; @@ -156,12 +209,6 @@ let description = "Enable WebSocket support"; }; - http_files = mkOption { - type = types.bool; - default = false; - description = "Serve static files from a directory over HTTP"; - }; - # Other specific functionality limits = mkOption { type = types.bool; @@ -210,13 +257,6 @@ let default = false; description = "Legacy authentication. Only used by some old clients and bots"; }; - - proxy65 = mkOption { - type = types.bool; - default = false; - description = "Enables a file transfer proxy service which clients behind NAT can use"; - }; - }; toLua = x: @@ -235,6 +275,153 @@ let }; ''; + mucOpts = { ... }: { + options = { + domain = mkOption { + type = types.str; + description = "Domain name of the MUC"; + }; + name = mkOption { + type = types.str; + description = "The name to return in service discovery responses for the MUC service itself"; + default = "Prosody Chatrooms"; + }; + restrictRoomCreation = mkOption { + type = types.enum [ true false "admin" "local" ]; + default = false; + description = "Restrict room creation to server admins"; + }; + maxHistoryMessages = mkOption { + type = types.int; + default = 20; + description = "Specifies a limit on what each room can be configured to keep"; + }; + roomLocking = mkOption { + type = types.bool; + default = true; + description = '' + Enables room locking, which means that a room must be + configured before it can be used. Locked rooms are invisible + and cannot be entered by anyone but the creator + ''; + }; + roomLockTimeout = mkOption { + type = types.int; + default = 300; + description = '' + Timout after which the room is destroyed or unlocked if not + configured, in seconds + ''; + }; + tombstones = mkOption { + type = types.bool; + default = true; + description = '' + When a room is destroyed, it leaves behind a tombstone which + prevents the room being entered or recreated. It also allows + anyone who was not in the room at the time it was destroyed + to learn about it, and to update their bookmarks. Tombstones + prevents the case where someone could recreate a previously + semi-anonymous room in order to learn the real JIDs of those + who often join there. + ''; + }; + tombstoneExpiry = mkOption { + type = types.int; + default = 2678400; + description = '' + This settings controls how long a tombstone is considered + valid. It defaults to 31 days. After this time, the room in + question can be created again. + ''; + }; + + vcard_muc = mkOption { + type = types.bool; + default = true; + description = "Adds the ability to set vCard for Multi User Chat rooms"; + }; + + # Extra parameters. Defaulting to prosody default values. + # Adding them explicitly to make them visible from the options + # documentation. + # + # See https://prosody.im/doc/modules/mod_muc for more details. + roomDefaultPublic = mkOption { + type = types.bool; + default = true; + description = "If set, the MUC rooms will be public by default."; + }; + roomDefaultMembersOnly = mkOption { + type = types.bool; + default = false; + description = "If set, the MUC rooms will only be accessible to the members by default."; + }; + roomDefaultModerated = mkOption { + type = types.bool; + default = false; + description = "If set, the MUC rooms will be moderated by default."; + }; + roomDefaultPublicJids = mkOption { + type = types.bool; + default = false; + description = "If set, the MUC rooms will display the public JIDs by default."; + }; + roomDefaultChangeSubject = mkOption { + type = types.bool; + default = false; + description = "If set, the rooms will display the public JIDs by default."; + }; + roomDefaultHistoryLength = mkOption { + type = types.int; + default = 20; + description = "Number of history message sent to participants by default."; + }; + roomDefaultLanguage = mkOption { + type = types.str; + default = "en"; + description = "Default room language."; + }; + }; + }; + + uploadHttpOpts = { ... }: { + options = { + domain = mkOption { + type = types.nullOr types.str; + description = "Domain name for the http-upload service"; + }; + uploadFileSizeLimit = mkOption { + type = types.str; + default = "50 * 1024 * 1024"; + description = "Maximum file size, in bytes. Defaults to 50MB."; + }; + uploadExpireAfter = mkOption { + type = types.str; + default = "60 * 60 * 24 * 7"; + description = "Max age of a file before it gets deleted, in seconds."; + }; + userQuota = mkOption { + type = types.nullOr types.int; + default = null; + example = 1234; + description = '' + Maximum size of all uploaded files per user, in bytes. There + will be no quota if this option is set to null. + ''; + }; + httpUploadPath = mkOption { + type = types.str; + description = '' + Directory where the uploaded files will be stored. By + default, uploaded files are put in a sub-directory of the + default Prosody storage path (usually /var/lib/prosody). + ''; + default = "/var/lib/prosody"; + }; + }; + }; + vHostOpts = { ... }: { options = { @@ -283,6 +470,27 @@ in description = "Whether to enable the prosody server"; }; + xmppComplianceSuite = mkOption { + type = types.bool; + default = true; + description = '' + The XEP-0423 defines a set of recommended XEPs to implement + for a server. It's generally a good idea to implement this + set of extensions if you want to provide your users with a + good XMPP experience. + + This NixOS module aims to provide a "advanced server" + experience as per defined in the XEP-0423[1] specification. + + Setting this option to true will prevent you from building a + NixOS configuration which won't comply with this standard. + You can explicitely decide to ignore this standard if you + know what you are doing by setting this option to false. + + [1] https://xmpp.org/extensions/xep-0423.html + ''; + }; + package = mkOption { type = types.package; description = "Prosody package to use"; @@ -302,6 +510,12 @@ in default = "/var/lib/prosody"; }; + disco_items = mkOption { + type = types.listOf (types.submodule discoOpts); + default = []; + description = "List of discoverable items you want to advertise."; + }; + user = mkOption { type = types.str; default = "prosody"; @@ -320,6 +534,31 @@ in description = "Allow account creation"; }; + # HTTP server-related options + httpPorts = mkOption { + type = types.listOf types.int; + description = "Listening HTTP ports list for this service."; + default = [ 5280 ]; + }; + + httpInterfaces = mkOption { + type = types.listOf types.str; + default = [ "*" "::" ]; + description = "Interfaces on which the HTTP server will listen on."; + }; + + httpsPorts = mkOption { + type = types.listOf types.int; + description = "Listening HTTPS ports list for this service."; + default = [ 5281 ]; + }; + + httpsInterfaces = mkOption { + type = types.listOf types.str; + default = [ "*" "::" ]; + description = "Interfaces on which the HTTPS server will listen on."; + }; + c2sRequireEncryption = mkOption { type = types.bool; default = true; @@ -387,6 +626,26 @@ in description = "Addtional path in which to look find plugins/modules"; }; + uploadHttp = mkOption { + description = '' + Configures the Prosody builtin HTTP server to handle user uploads. + ''; + type = types.nullOr (types.submodule uploadHttpOpts); + default = null; + example = { + domain = "uploads.my-xmpp-example-host.org"; + }; + }; + + muc = mkOption { + type = types.listOf (types.submodule mucOpts); + default = [ ]; + example = [ { + domain = "conference.my-xmpp-example-host.org"; + } ]; + description = "Multi User Chat (MUC) configuration"; + }; + virtualHosts = mkOption { description = "Define the virtual hosts"; @@ -443,9 +702,44 @@ in config = mkIf cfg.enable { + assertions = let + genericErrMsg = '' + + Having a server not XEP-0423-compliant might make your XMPP + experience terrible. See the NixOS manual for further + informations. + + If you know what you're doing, you can disable this warning by + setting config.services.prosody.xmppComplianceSuite to false. + ''; + errors = [ + { assertion = (builtins.length cfg.muc > 0) || !cfg.xmppComplianceSuite; + message = '' + You need to setup at least a MUC domain to comply with + XEP-0423. + '' + genericErrMsg;} + { assertion = cfg.uploadHttp != null || !cfg.xmppComplianceSuite; + message = '' + You need to setup the uploadHttp module through + config.services.prosody.uploadHttp to comply with + XEP-0423. + '' + genericErrMsg;} + ]; + in errors; + environment.systemPackages = [ cfg.package ]; - environment.etc."prosody/prosody.cfg.lua".text = '' + environment.etc."prosody/prosody.cfg.lua".text = + let + httpDiscoItems = if (cfg.uploadHttp != null) + then [{ url = cfg.uploadHttp.domain; description = "HTTP upload endpoint";}] + else []; + mucDiscoItems = builtins.foldl' + (acc: muc: [{ url = muc.domain; description = "${muc.domain} MUC endpoint";}] ++ acc) + [] + cfg.muc; + discoItems = cfg.disco_items ++ httpDiscoItems ++ mucDiscoItems; + in '' pidfile = "/run/prosody/prosody.pid" @@ -472,6 +766,10 @@ in ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.extraModules)} }; + disco_items = { + ${ lib.concatStringsSep "\n" (builtins.map (x: ''{ "${x.url}", "${x.description}"};'') discoItems)} + }; + allow_registration = ${toLua cfg.allowRegistration} c2s_require_encryption = ${toLua cfg.c2sRequireEncryption} @@ -486,6 +784,42 @@ in authentication = ${toLua cfg.authentication} + http_interfaces = ${toLua cfg.httpInterfaces} + + https_interfaces = ${toLua cfg.httpsInterfaces} + + http_ports = ${toLua cfg.httpPorts} + + https_ports = ${toLua cfg.httpsPorts} + + ${lib.concatMapStrings (muc: '' + Component ${toLua muc.domain} "muc" + modules_enabled = { "muc_mam"; ${optionalString muc.vcard_muc ''"vcard_muc";'' } } + name = ${toLua muc.name} + restrict_room_creation = ${toLua muc.restrictRoomCreation} + max_history_messages = ${toLua muc.maxHistoryMessages} + muc_room_locking = ${toLua muc.roomLocking} + muc_room_lock_timeout = ${toLua muc.roomLockTimeout} + muc_tombstones = ${toLua muc.tombstones} + muc_tombstone_expiry = ${toLua muc.tombstoneExpiry} + muc_room_default_public = ${toLua muc.roomDefaultPublic} + muc_room_default_members_only = ${toLua muc.roomDefaultMembersOnly} + muc_room_default_moderated = ${toLua muc.roomDefaultModerated} + muc_room_default_public_jids = ${toLua muc.roomDefaultPublicJids} + muc_room_default_change_subject = ${toLua muc.roomDefaultChangeSubject} + muc_room_default_history_length = ${toLua muc.roomDefaultHistoryLength} + muc_room_default_language = ${toLua muc.roomDefaultLanguage} + + '') cfg.muc} + + ${ lib.optionalString (cfg.uploadHttp != null) '' + Component ${toLua cfg.uploadHttp.domain} "http_upload" + http_upload_file_size_limit = ${cfg.uploadHttp.uploadFileSizeLimit} + http_upload_expire_after = ${cfg.uploadHttp.uploadExpireAfter} + ${lib.optionalString (cfg.uploadHttp.userQuota != null) "http_upload_quota = ${toLua cfg.uploadHttp.userQuota}"} + http_upload_path = ${toLua cfg.uploadHttp.httpUploadPath} + ''} + ${ cfg.extraConfig } ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: '' @@ -522,9 +856,22 @@ in PIDFile = "/run/prosody/prosody.pid"; ExecStart = "${cfg.package}/bin/prosodyctl start"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + + MemoryDenyWriteExecute = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateTmp = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; }; }; }; - + meta.doc = ./prosody.xml; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/prosody.xml b/third_party/nixpkgs/nixos/modules/services/networking/prosody.xml new file mode 100644 index 0000000000..7859cb1578 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/prosody.xml @@ -0,0 +1,88 @@ + + Prosody + + Prosody is an open-source, modern XMPP server. + +
+ Basic usage + + + A common struggle for most XMPP newcomers is to find the right set + of XMPP Extensions (XEPs) to setup. Forget to activate a few of + those and your XMPP experience might turn into a nightmare! + + + + The XMPP community tackles this problem by creating a meta-XEP + listing a decent set of XEPs you should implement. This meta-XEP + is issued every year, the 2020 edition being + XEP-0423. + + + The NixOS Prosody module will implement most of these recommendend XEPs out of + the box. That being said, two components still require some + manual configuration: the + Multi User Chat (MUC) + and the HTTP File Upload ones. + You'll need to create a DNS subdomain for each of those. The current convention is to name your + MUC endpoint conference.example.org and your HTTP upload domain upload.example.org. + + + A good configuration to start with, including a + Multi User Chat (MUC) + endpoint as well as a HTTP File Upload + endpoint will look like this: + +services.prosody = { + enable = true; + admins = [ "root@example.org" ]; + 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"; + }; + muc = [ { + domain = "conference.example.org"; + } ]; + uploadHttp = { + domain = "upload.example.org"; + }; +}; + +
+
+ Let's Encrypt Configuration + + As you can see in the code snippet from the + previous section, + 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. + + + Provided the setup detailed in the previous section, you'll need the following acme configuration to generate + a TLS certificate for the three endponits: + +security.acme = { + email = "root@example.org"; + acceptTerms = true; + certs = { + "example.org" = { + webroot = "/var/www/example.org"; + email = "root@example.org"; + extraDomains."conference.example.org" = null; + extraDomains."upload.example.org" = null; + }; + }; +}; + +
+ diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix index 892e59778c..41d0584080 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix @@ -54,21 +54,25 @@ in }; syslog = mkOption { + type = types.bool; default = true; description = ''Whether to enable syslog output.''; }; passwordAuthentication = mkOption { + type = types.bool; default = true; description = ''Whether to enable password authentication.''; }; publicKeyAuthentication = mkOption { + type = types.bool; default = true; description = ''Whether to enable public key authentication.''; }; rootLogin = mkOption { + type = types.bool; default = false; description = ''Whether to enable remote root login.''; }; @@ -90,11 +94,13 @@ in }; tcpForwarding = mkOption { + type = types.bool; default = true; description = ''Whether to enable TCP/IP forwarding.''; }; x11Forwarding = mkOption { + type = types.bool; default = true; description = ''Whether to enable X11 forwarding.''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tcpcrypt.nix b/third_party/nixpkgs/nixos/modules/services/networking/tcpcrypt.nix index 18f2e13512..5a91054e16 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tcpcrypt.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tcpcrypt.nix @@ -15,6 +15,7 @@ in options = { networking.tcpcrypt.enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable opportunistic TCP encryption. If the other end diff --git a/third_party/nixpkgs/nixos/modules/services/networking/thelounge.nix b/third_party/nixpkgs/nixos/modules/services/networking/thelounge.nix index 875d8f6616..a1b0670348 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/thelounge.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/thelounge.nix @@ -62,7 +62,6 @@ in { systemd.services.thelounge = { description = "The Lounge web IRC client"; wantedBy = [ "multi-user.target" ]; - environment = { THELOUNGE_HOME = dataDir; }; preStart = "ln -sf ${pkgs.writeText "config.js" configJsData} ${dataDir}/config.js"; serviceConfig = { User = "thelounge"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wicd.nix b/third_party/nixpkgs/nixos/modules/services/networking/wicd.nix index 03c6bd28aa..aa10a50f87 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wicd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wicd.nix @@ -9,6 +9,7 @@ with lib; options = { networking.wicd.enable = mkOption { + type = types.bool; default = false; description = '' Whether to start wicd. Wired and diff --git a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix b/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix index 9e675ecd6f..ecd1406b48 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix @@ -83,6 +83,14 @@ in { ''; }; + group = mkOption { + type = types.str; + default = "root"; + example = "wheel"; + description = + "Group to grant acces to the Yggdrasil control socket."; + }; + openMulticastPort = mkOption { type = bool; default = false; @@ -144,8 +152,9 @@ in { ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "always"; + Group = cfg.group; RuntimeDirectory = "yggdrasil"; - RuntimeDirectoryMode = "0700"; + RuntimeDirectoryMode = "0750"; BindReadOnlyPaths = mkIf configFileProvided [ "${cfg.configFile}" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix b/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix index 59306d625e..e67badfcd2 100644 --- a/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix @@ -153,6 +153,16 @@ in ''; }; + allowFrom = mkOption { + type = types.listOf types.str; + default = [ "localhost" ]; + example = [ "all" ]; + apply = concatMapStringsSep "\n" (x: "Allow ${x}"); + description = '' + From which hosts to allow unconditional access. + ''; + }; + bindirCmds = mkOption { type = types.lines; internal = true; @@ -403,19 +413,19 @@ in Order allow,deny - Allow localhost + ${cfg.allowFrom} Order allow,deny - Allow localhost + ${cfg.allowFrom} AuthType Basic Require user @SYSTEM Order allow,deny - Allow localhost + ${cfg.allowFrom} diff --git a/third_party/nixpkgs/nixos/modules/services/system/nscd.nix b/third_party/nixpkgs/nixos/modules/services/system/nscd.nix index af26dd8470..d720f254b8 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/nscd.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/nscd.nix @@ -24,7 +24,11 @@ in enable = mkOption { type = types.bool; default = true; - description = "Whether to enable the Name Service Cache Daemon."; + description = '' + Whether to enable the Name Service Cache Daemon. + Disabling this is strongly discouraged, as this effectively disables NSS Lookups + from all non-glibc NSS modules, including the ones provided by systemd. + ''; }; config = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/deluge.nix b/third_party/nixpkgs/nixos/modules/services/torrent/deluge.nix index 2f1e7300ca..45398cb261 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/deluge.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/deluge.nix @@ -142,7 +142,7 @@ in { description = '' Extra packages available at runtime to enable Deluge's plugins. For example, extraction utilities are required for the built-in "Extractor" plugin. - This always contains unzip, gnutar, xz, p7zip and bzip2. + This always contains unzip, gnutar, xz and bzip2. ''; }; @@ -187,7 +187,7 @@ in { ); # Provide a default set of `extraPackages`. - services.deluge.extraPackages = with pkgs; [ unzip gnutar xz p7zip bzip2 ]; + services.deluge.extraPackages = with pkgs; [ unzip gnutar xz bzip2 ]; systemd.tmpfiles.rules = [ "d '${cfg.dataDir}' 0770 ${cfg.user} ${cfg.group}" diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix index e9ed53857d..0a5b6047bb 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix @@ -29,7 +29,7 @@ let '') cfg.skins)} ${concatStringsSep "\n" (mapAttrsToList (k: v: '' - ln -s ${v} $out/share/mediawiki/extensions/${k} + ln -s ${if v != null then v else "$src/share/mediawiki/extensions/${k}"} $out/share/mediawiki/extensions/${k} '') cfg.extensions)} ''; }; @@ -204,17 +204,28 @@ in default = {}; type = types.attrsOf types.path; description = '' - List of paths whose content is copied to the 'skins' - subdirectory of the MediaWiki installation. + Attribute set of paths whose content is copied to the skins + subdirectory of the MediaWiki installation in addition to the default skins. ''; }; extensions = mkOption { default = {}; - type = types.attrsOf types.path; + type = types.attrsOf (types.nullOr types.path); description = '' - List of paths whose content is copied to the 'extensions' - subdirectory of the MediaWiki installation. + Attribute set of paths whose content is copied to the extensions + subdirectory of the MediaWiki installation and enabled in configuration. + + Use null instead of path to enable extensions that are part of MediaWiki. + ''; + example = literalExample '' + { + Matomo = pkgs.fetchzip { + url = "https://github.com/DaSchTour/matomo-mediawiki-extension/archive/v4.0.1.tar.gz"; + sha256 = "0g5rd3zp0avwlmqagc59cg9bbkn3r7wx7p6yr80s644mj6dlvs1b"; + }; + ParserFunctions = null; + } ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix index 5f6f2bc7a1..f826096bf6 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix @@ -11,8 +11,8 @@ let base = pkgs.php74; in base.buildEnv { - extensions = e: with e; - base.enabledExtensions ++ [ + extensions = { enabled, all }: with all; + enabled ++ [ apcu redis memcached imagick ]; extraConfig = phpOptionsStr; 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 5e55baa203..8abee7130d 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 @@ -41,9 +41,9 @@ let "mime" "autoindex" "negotiation" "dir" "alias" "rewrite" "unixd" "slotmem_shm" "socache_shmcb" - "mpm_${cfg.multiProcessingModule}" + "mpm_${cfg.mpm}" ] - ++ (if cfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ]) + ++ (if cfg.mpm == "prefork" then [ "cgi" ] else [ "cgid" ]) ++ optional enableHttp2 "http2" ++ optional enableSSL "ssl" ++ optional enableUserDir "userdir" @@ -264,7 +264,7 @@ let PidFile ${runtimeDir}/httpd.pid - ${optionalString (cfg.multiProcessingModule != "prefork") '' + ${optionalString (cfg.mpm != "prefork") '' # mod_cgid requires this. ScriptSock ${runtimeDir}/cgisock ''} @@ -338,7 +338,7 @@ let } '' cat ${php}/etc/php.ini > $out - cat ${php}/lib/custom-php.ini > $out + cat ${php.phpIni} > $out echo "$options" >> $out ''; @@ -350,6 +350,7 @@ in imports = [ (mkRemovedOptionModule [ "services" "httpd" "extraSubservices" ] "Most existing subservices have been ported to the NixOS module system. Please update your configuration accordingly.") (mkRemovedOptionModule [ "services" "httpd" "stateDir" ] "The httpd module now uses /run/httpd as a runtime directory.") + (mkRenamedOptionModule [ "services" "httpd" "multiProcessingModule" ] [ "services" "httpd" "mpm" ]) # virtualHosts options (mkRemovedOptionModule [ "services" "httpd" "documentRoot" ] "Please define a virtual host using `services.httpd.virtualHosts`.") @@ -454,7 +455,13 @@ in type = types.str; default = "wwwrun"; description = '' - User account under which httpd runs. + User account under which httpd children processes run. + + If you require the main httpd process to run as + root add the following configuration: + + systemd.services.httpd.serviceConfig.User = lib.mkForce "root"; + ''; }; @@ -462,7 +469,7 @@ in type = types.str; default = "wwwrun"; description = '' - Group under which httpd runs. + Group under which httpd children processes run. ''; }; @@ -539,20 +546,19 @@ in ''; }; - multiProcessingModule = mkOption { + mpm = mkOption { type = types.enum [ "event" "prefork" "worker" ]; - default = "prefork"; + default = "event"; example = "worker"; description = '' Multi-processing module to be used by Apache. Available - modules are prefork (the default; - handles each request in a separate child process), - worker (hybrid approach that starts a - number of child processes each running a number of - threads) and event (a recent variant of - worker that handles persistent - connections more efficiently). + modules are prefork (handles each + request in a separate child process), worker + (hybrid approach that starts a number of child processes + each running a number of threads) and event + (the default; a recent variant of worker + that handles persistent connections more efficiently). ''; }; @@ -652,7 +658,7 @@ in services.httpd.phpOptions = '' ; Needed for PHP's mail() function. - sendmail_path = sendmail -t -i + sendmail_path = ${pkgs.system-sendmail}/bin/sendmail -t -i ; Don't advertise PHP expose_php = off @@ -703,9 +709,7 @@ in 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; - path = - [ pkg pkgs.coreutils pkgs.gnugrep ] - ++ optional cfg.enablePHP pkgs.system-sendmail; # Needed for PHP's mail() function. + path = [ pkg pkgs.coreutils pkgs.gnugrep ]; environment = optionalAttrs cfg.enablePHP { PHPRC = phpIni; } @@ -725,7 +729,7 @@ in ExecStart = "@${pkg}/bin/httpd httpd -f ${httpdConf}"; ExecStop = "${pkg}/bin/httpd -f ${httpdConf} -k graceful-stop"; ExecReload = "${pkg}/bin/httpd -f ${httpdConf} -k graceful"; - User = "root"; + User = cfg.user; Group = cfg.group; Type = "forking"; PIDFile = "${runtimeDir}/httpd.pid"; @@ -733,6 +737,7 @@ in RestartSec = "5s"; RuntimeDirectory = "httpd httpd/runtime"; RuntimeDirectoryMode = "0750"; + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix index 2e806afb42..173c0f8561 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix @@ -137,7 +137,7 @@ in http2 = mkOption { type = types.bool; - default = false; + default = true; description = '' Whether to enable HTTP 2. HTTP/2 is supported in all multi-processing modules that come with httpd. However, if you use the prefork mpm, there will be severe restrictions. Refer to for details. diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/jboss/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/jboss/default.nix index 3a12598283..ca5b8635fc 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/jboss/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/jboss/default.nix @@ -60,6 +60,7 @@ in }; useJK = mkOption { + type = types.bool; default = false; description = "Whether to use to connector to the Apache HTTP server"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.xml b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.xml index 9541f2cfd4..7905ceebd9 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.xml +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.xml @@ -1,7 +1,7 @@ - Pantheon Destkop + Pantheon Desktop Pantheon is the desktop environment created for the elementary OS distribution. It is written from scratch in Vala, utilizing GNOME technologies with GTK 3 and Granite. 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 d7bef68e5b..622ea62f3a 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 @@ -93,16 +93,17 @@ in }; wayland = mkOption { + type = types.bool; default = true; description = '' Allow GDM to run on Wayland instead of Xserver. Note to enable Wayland with Nvidia you need to enable the . ''; - type = types.bool; }; nvidiaWayland = mkOption { + type = types.bool; default = false; description = '' Whether to allow wayland to be used with the proprietary diff --git a/third_party/nixpkgs/nixos/modules/services/x11/hardware/digimend.nix b/third_party/nixpkgs/nixos/modules/services/x11/hardware/digimend.nix index a9f5640905..b1b1682f00 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/hardware/digimend.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/hardware/digimend.nix @@ -16,12 +16,7 @@ in services.xserver.digimend = { - enable = mkOption { - default = false; - description = '' - Whether to enable the digimend drivers for Huion/XP-Pen/etc. tablets. - ''; - }; + enable = mkEnableOption "the digimend drivers for Huion/XP-Pen/etc. tablets"; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix index a7580fb199..9b34b12e73 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix @@ -205,7 +205,7 @@ let "IPv6HopLimit" "IPv4ProxyARP" "IPv6ProxyNDP" "IPv6ProxyNDPAddress" "IPv6PrefixDelegation" "IPv6MTUBytes" "Bridge" "Bond" "VRF" "VLAN" "IPVLAN" "MACVLAN" "VXLAN" "Tunnel" "ActiveSlave" "PrimarySlave" - "ConfigureWithoutCarrier" "Xfrm" + "ConfigureWithoutCarrier" "Xfrm" "KeepConfiguration" ]) # Note: For DHCP the values both, none, v4, v6 are deprecated (assertValueOneOf "DHCP" ["yes" "no" "ipv4" "ipv6" "both" "none" "v4" "v6"]) @@ -228,6 +228,7 @@ let (assertValueOneOf "ActiveSlave" boolValues) (assertValueOneOf "PrimarySlave" boolValues) (assertValueOneOf "ConfigureWithoutCarrier" boolValues) + (assertValueOneOf "KeepConfiguration" (boolValues ++ ["static" "dhcp-on-stop" "dhcp"])) ]; checkAddress = checkUnitConfig "Address" [ @@ -274,15 +275,16 @@ let ]) ]; - checkDhcp = checkUnitConfig "DHCP" [ + checkDhcpV4 = checkUnitConfig "DHCPv4" [ (assertOnlyFields [ - "UseDNS" "UseNTP" "UseMTU" "Anonymize" "SendHostname" "UseHostname" - "Hostname" "UseDomains" "UseRoutes" "UseTimezone" "CriticalConnection" - "ClientIdentifier" "VendorClassIdentifier" "UserClass" "DUIDType" - "DUIDRawData" "IAID" "RequestBroadcast" "RouteMetric" "RouteTable" - "ListenPort" "RapidCommit" + "UseDNS" "RoutesToDNS" "UseNTP" "UseMTU" "Anonymize" "SendHostname" "UseHostname" + "Hostname" "UseDomains" "UseRoutes" "UseTimezone" + "ClientIdentifier" "VendorClassIdentifier" "UserClass" "MaxAttempts" + "DUIDType" "DUIDRawData" "IAID" "RequestBroadcast" "RouteMetric" "RouteTable" + "ListenPort" "SendRelease" ]) (assertValueOneOf "UseDNS" boolValues) + (assertValueOneOf "RoutesToDNS" boolValues) (assertValueOneOf "UseNTP" boolValues) (assertValueOneOf "UseMTU" boolValues) (assertValueOneOf "Anonymize" boolValues) @@ -291,13 +293,50 @@ let (assertValueOneOf "UseDomains" ["yes" "no" "route"]) (assertValueOneOf "UseRoutes" boolValues) (assertValueOneOf "UseTimezone" boolValues) - (assertValueOneOf "CriticalConnection" boolValues) + (assertMinimum "MaxAttempts" 0) (assertValueOneOf "RequestBroadcast" boolValues) (assertInt "RouteTable") (assertMinimum "RouteTable" 0) - (assertValueOneOf "RapidCommit" boolValues) + (assertValueOneOf "SendRelease" boolValues) ]; + checkDhcpV6 = checkUnitConfig "DHCPv6" [ + (assertOnlyFields [ + "UseDns" "UseNTP" "RapidCommit" "ForceDHCPv6PDOtherInformation" + "PrefixDelegationHint" + ]) + (assertValueOneOf "UseDNS" boolValues) + (assertValueOneOf "UseNTP" boolValues) + (assertValueOneOf "RapidCommit" boolValues) + (assertValueOneOf "ForceDHCPv6PDOtherInformation" boolValues) + ]; + + checkIpv6PrefixDelegation = checkUnitConfig "IPv6PrefixDelegation" [ + (assertOnlyFields [ + "Managed" "OtherInformation" "RouterLifetimeSec" + "RouterPreference" "EmitDNS" "DNS" "EmitDomains" "Domains" + "DNSLifetimeSec" + ]) + (assertValueOneOf "Managed" boolValues) + (assertValueOneOf "OtherInformation" boolValues) + (assertValueOneOf "RouterPreference" ["high" "medium" "low" "normal" "default"]) + (assertValueOneOf "EmitDNS" boolValues) + (assertValueOneOf "EmitDomains" boolValues) + (assertMinimum "DNSLifetimeSec" 0) + ]; + + checkIpv6Prefix = checkUnitConfig "IPv6Prefix" [ + (assertOnlyFields [ + "AddressAutoconfiguration" "OnLink" "Prefix" + "PreferredLifetimeSec" "ValidLifetimeSec" + ]) + (assertValueOneOf "AddressAutoconfiguration" boolValues) + (assertValueOneOf "OnLink" boolValues) + (assertMinimum "PreferredLifetimeSec" 0) + (assertMinimum "ValidLifetimeSec" 0) + ]; + + checkDhcpServer = checkUnitConfig "DHCPServer" [ (assertOnlyFields [ "PoolOffset" "PoolSize" "DefaultLeaseTimeSec" "MaxLeaseTimeSec" @@ -621,6 +660,22 @@ let }; }; + ipv6PrefixOptions = { + options = { + ipv6PrefixConfig = mkOption { + default = {}; + example = { Prefix = "fd00::/64"; }; + type = types.addCheck (types.attrsOf unitOption) checkIpv6Prefix; + description = '' + Each attribute in this set specifies an option in the + [IPv6Prefix] section of the unit. See + systemd.network + 5 for details. + ''; + }; + }; + }; + networkOptions = commonNetworkOptions // { @@ -636,13 +691,55 @@ let ''; }; + # systemd.network.networks.*.dhcpConfig has been deprecated in favor of ….dhcpV4Config + # Produce a nice warning message so users know it is gone. dhcpConfig = mkOption { + visible = false; + apply = _: throw "The option `systemd.network.networks.*.dhcpConfig` can no longer be used since it's been removed. Please use `systemd.network.networks.*.dhcpV4Config` instead."; + }; + + dhcpV4Config = mkOption { default = {}; example = { UseDNS = true; UseRoutes = true; }; - type = types.addCheck (types.attrsOf unitOption) checkDhcp; + type = types.addCheck (types.attrsOf unitOption) checkDhcpV4; description = '' Each attribute in this set specifies an option in the - [DHCP] section of the unit. See + [DHCPv4] section of the unit. See + systemd.network + 5 for details. + ''; + }; + + dhcpV6Config = mkOption { + default = {}; + example = { UseDNS = true; UseRoutes = true; }; + type = types.addCheck (types.attrsOf unitOption) checkDhcpV6; + description = '' + Each attribute in this set specifies an option in the + [DHCPv6] section of the unit. See + systemd.network + 5 for details. + ''; + }; + + ipv6PrefixDelegationConfig = mkOption { + default = {}; + example = { EmitDNS = true; Managed = true; OtherInformation = true; }; + type = types.addCheck (types.attrsOf unitOption) checkIpv6PrefixDelegation; + description = '' + Each attribute in this set specifies an option in the + [IPv6PrefixDelegation] section of the unit. See + systemd.network + 5 for details. + ''; + }; + + ipv6Prefixes = mkOption { + default = []; + example = { AddressAutoconfiguration = true; OnLink = true; }; + type = with types; listOf (submodule ipv6PrefixOptions); + description = '' + A list of ipv6Prefix sections to be added to the unit. See systemd.network 5 for details. ''; @@ -973,11 +1070,26 @@ let ${concatStringsSep "\n" (map (s: "Tunnel=${s}") def.tunnel)} ${concatStringsSep "\n" (map (s: "Xfrm=${s}") def.xfrm)} - ${optionalString (def.dhcpConfig != { }) '' - [DHCP] - ${attrsToSection def.dhcpConfig} + ${optionalString (def.dhcpV4Config != { }) '' + [DHCPv4] + ${attrsToSection def.dhcpV4Config} ''} + ${optionalString (def.dhcpV6Config != {}) '' + [DHCPv6] + ${attrsToSection def.dhcpV6Config} + + ''} + ${optionalString (def.ipv6PrefixDelegationConfig != {}) '' + [IPv6PrefixDelegation] + ${attrsToSection def.ipv6PrefixDelegationConfig} + + ''} + ${flip concatMapStrings def.ipv6Prefixes (x: '' + [IPv6Prefix] + ${attrsToSection x.ipv6PrefixConfig} + + '')} ${optionalString (def.dhcpServerConfig != { }) '' [DHCPServer] ${attrsToSection def.dhcpServerConfig} @@ -1054,6 +1166,7 @@ in }; config = mkMerge [ + # .link units are honored by udev, no matter if systemd-networkd is enabled or not. { systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/ec2-amis.nix b/third_party/nixpkgs/nixos/modules/virtualisation/ec2-amis.nix index 3b4e55d39d..24de8cf1af 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/ec2-amis.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/ec2-amis.nix @@ -291,21 +291,43 @@ let self = { "19.03".sa-east-1.hvm-ebs = "ami-0c6a43c6e0ad1f4e2"; "19.03".ap-south-1.hvm-ebs = "ami-0303deb1b5890f878"; - # 19.09.981.205691b7cbe - "19.09".eu-west-1.hvm-ebs = "ami-0ebd3156e21e9642f"; - "19.09".eu-west-2.hvm-ebs = "ami-02a2b5480a79084b7"; - "19.09".eu-west-3.hvm-ebs = "ami-09aa175c7588734f7"; - "19.09".eu-central-1.hvm-ebs = "ami-00a7fafd7e237a330"; - "19.09".us-east-1.hvm-ebs = "ami-00a8eeaf232a74f84"; - "19.09".us-east-2.hvm-ebs = "ami-093efd3a57a1e03a8"; - "19.09".us-west-1.hvm-ebs = "ami-0913e9a2b677fac30"; - "19.09".us-west-2.hvm-ebs = "ami-02d9a19f77b47882a"; - "19.09".ca-central-1.hvm-ebs = "ami-0627dd3f7b3627a29"; - "19.09".ap-southeast-1.hvm-ebs = "ami-083614e4d08f2164d"; - "19.09".ap-southeast-2.hvm-ebs = "ami-0048c704185ded6dc"; - "19.09".ap-northeast-1.hvm-ebs = "ami-0329e7fc2d7f60bd0"; - "19.09".ap-northeast-2.hvm-ebs = "ami-03d4ae7d0b5fc364f"; - "19.09".ap-south-1.hvm-ebs = "ami-0b599690b35aeef23"; + # 19.09.2243.84af403f54f + "19.09".eu-west-1.hvm-ebs = "ami-071082f0fa035374f"; + "19.09".eu-west-2.hvm-ebs = "ami-0d9dc33c54d1dc4c3"; + "19.09".eu-west-3.hvm-ebs = "ami-09566799591d1bfed"; + "19.09".eu-central-1.hvm-ebs = "ami-015f8efc2be419b79"; + "19.09".eu-north-1.hvm-ebs = "ami-07fc0a32d885e01ed"; + "19.09".us-east-1.hvm-ebs = "ami-03330d8b51287412f"; + "19.09".us-east-2.hvm-ebs = "ami-0518b4c84972e967f"; + "19.09".us-west-1.hvm-ebs = "ami-06ad07e61a353b4a6"; + "19.09".us-west-2.hvm-ebs = "ami-0e31e30925cf3ce4e"; + "19.09".ca-central-1.hvm-ebs = "ami-07df50fc76702a36d"; + "19.09".ap-southeast-1.hvm-ebs = "ami-0f71ae5d4b0b78d95"; + "19.09".ap-southeast-2.hvm-ebs = "ami-057bbf2b4bd62d210"; + "19.09".ap-northeast-1.hvm-ebs = "ami-02a62555ca182fb5b"; + "19.09".ap-northeast-2.hvm-ebs = "ami-0219dde0e6b7b7b93"; + "19.09".ap-south-1.hvm-ebs = "ami-066f7f2a895c821a1"; + "19.09".ap-east-1.hvm-ebs = "ami-055b2348db2827ff1"; + "19.09".sa-east-1.hvm-ebs = "ami-018aab68377227e06"; - latest = self."19.09"; + # 20.03.1554.94e39623a49 + "20.03".eu-west-1.hvm-ebs = "ami-02c34db5766cc7013"; + "20.03".eu-west-2.hvm-ebs = "ami-0e32bd8c7853883f1"; + "20.03".eu-west-3.hvm-ebs = "ami-061edb1356c1d69fd"; + "20.03".eu-central-1.hvm-ebs = "ami-0a1a94722dcbff94c"; + "20.03".eu-north-1.hvm-ebs = "ami-02699abfacbb6464b"; + "20.03".us-east-1.hvm-ebs = "ami-0c5e7760748b74e85"; + "20.03".us-east-2.hvm-ebs = "ami-030296bb256764655"; + "20.03".us-west-1.hvm-ebs = "ami-050be818e0266b741"; + "20.03".us-west-2.hvm-ebs = "ami-06562f78dca68eda2"; + "20.03".ca-central-1.hvm-ebs = "ami-02365684a173255c7"; + "20.03".ap-southeast-1.hvm-ebs = "ami-0dbf353e168d155f7"; + "20.03".ap-southeast-2.hvm-ebs = "ami-04c0f3a75f63daddd"; + "20.03".ap-northeast-1.hvm-ebs = "ami-093d9cc49c191eb6c"; + "20.03".ap-northeast-2.hvm-ebs = "ami-0087df91a7b6ebd45"; + "20.03".ap-south-1.hvm-ebs = "ami-0a1a6b569af04af9d"; + "20.03".ap-east-1.hvm-ebs = "ami-0d18fdd309cdefa86"; + "20.03".sa-east-1.hvm-ebs = "ami-09859378158ae971d"; + + latest = self."20.03"; }; in self diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix b/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix index 016d68ea30..b0fa03917c 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix @@ -546,7 +546,7 @@ in Note that this option might require to do some adjustments to the container configuration, e.g. you might want to set - systemd.network.networks.$interface.dhcpConfig.ClientIdentifier to "mac" + systemd.network.networks.$interface.dhcpV4Config.ClientIdentifier to "mac" if you use macvlans option. This way dhcp client identifier will be stable between the container restarts. diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/podman.nix b/third_party/nixpkgs/nixos/modules/virtualisation/podman.nix index 41d50dc730..1dc79272cc 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/podman.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/podman.nix @@ -4,18 +4,20 @@ let inherit (lib) mkOption types; + podmanPackage = (pkgs.podman.override { inherit (cfg) extraPackages; }); + # Provides a fake "docker" binary mapping to podman - dockerCompat = pkgs.runCommandNoCC "${pkgs.podman.pname}-docker-compat-${pkgs.podman.version}" { + dockerCompat = pkgs.runCommandNoCC "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" { outputs = [ "out" "bin" "man" ]; - inherit (pkgs.podman) meta; + inherit (podmanPackage) meta; } '' mkdir $out mkdir -p $bin/bin - ln -s ${pkgs.podman.bin}/bin/podman $bin/bin/docker + ln -s ${podmanPackage.bin}/bin/podman $bin/bin/docker mkdir -p $man/share/man/man1 - for f in ${pkgs.podman.man}/share/man/man1/*; do + for f in ${podmanPackage.man}/share/man/man1/*; do basename=$(basename $f | sed s/podman/docker/g) ln -s $f $man/share/man/man1/$basename done @@ -54,6 +56,19 @@ in ''; }; + extraPackages = mkOption { + type = with types; listOf package; + default = [ ]; + example = lib.literalExample '' + [ + pkgs.gvisor + ] + ''; + description = '' + Extra packages to be installed in the Podman wrapper. + ''; + }; + libpod = mkOption { default = {}; description = "Libpod configuration"; @@ -77,29 +92,24 @@ in config = lib.mkIf cfg.enable { - environment.systemPackages = [ - pkgs.podman # Docker compat - pkgs.runc # Default container runtime - pkgs.crun # Default container runtime (cgroups v2) - pkgs.conmon # Container runtime monitor - pkgs.slirp4netns # User-mode networking for unprivileged namespaces - pkgs.fuse-overlayfs # CoW for images, much faster than default vfs - pkgs.utillinux # nsenter - pkgs.iptables - ] - ++ lib.optional cfg.dockerCompat dockerCompat; + environment.systemPackages = [ podmanPackage ] + ++ lib.optional cfg.dockerCompat dockerCompat; environment.etc."containers/libpod.conf".text = '' cni_plugin_dir = ["${pkgs.cni-plugins}/bin/"] - cni_config_dir = "/etc/cni/net.d/" '' + cfg.libpod.extraConfig; - environment.etc."cni/net.d/87-podman-bridge.conflist".source = copyFile "${pkgs.podman.src}/cni/87-podman-bridge.conflist"; + environment.etc."cni/net.d/87-podman-bridge.conflist".source = copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist"; # Enable common /etc/containers configuration virtualisation.containers.enable = true; + assertions = [{ + assertion = cfg.dockerCompat -> !config.virtualisation.docker.enable; + message = "Option dockerCompat conflicts with docker"; + }]; + }; } diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix index 31d332e9f0..85b75ba680 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix @@ -499,7 +499,7 @@ in # FIXME: Consolidate this one day. virtualisation.qemu.options = mkMerge [ (mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ - "-vga std" "-usb" "-device usb-tablet,bus=usb-bus.0" + "-usb" "-device usb-tablet,bus=usb-bus.0" ]) (mkIf (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix b/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix index 7f0af9901b..7b2a66c434 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix @@ -103,6 +103,7 @@ in }; forwardDns = mkOption { + type = types.bool; default = false; description = '' If set to true, the DNS queries from the @@ -135,14 +136,8 @@ in }; }; - virtualisation.xen.trace = - mkOption { - default = false; - description = - '' - Enable Xen tracing. - ''; - }; + virtualisation.xen.trace = mkEnableOption "Xen tracing"; + }; diff --git a/third_party/nixpkgs/nixos/release-combined.nix b/third_party/nixpkgs/nixos/release-combined.nix index 2f5dd28e8b..ece2d091f5 100644 --- a/third_party/nixpkgs/nixos/release-combined.nix +++ b/third_party/nixpkgs/nixos/release-combined.nix @@ -50,6 +50,7 @@ in rec { (onFullSupported "nixos.dummy") (onAllSupported "nixos.iso_minimal") (onSystems ["x86_64-linux"] "nixos.iso_plasma5") + (onSystems ["x86_64-linux"] "nixos.iso_gnome") (onFullSupported "nixos.manual") (onSystems ["x86_64-linux"] "nixos.ova") (onSystems ["aarch64-linux"] "nixos.sd_image") @@ -110,6 +111,7 @@ in rec { (onFullSupported "nixos.tests.networking.scripted.sit") (onFullSupported "nixos.tests.networking.scripted.static") (onFullSupported "nixos.tests.networking.scripted.vlan") + (onFullSupported "nixos.tests.systemd-networkd-ipv6-prefix-delegation") (onFullSupported "nixos.tests.nfs3.simple") (onFullSupported "nixos.tests.nfs4.simple") (onFullSupported "nixos.tests.openssh") diff --git a/third_party/nixpkgs/nixos/release.nix b/third_party/nixpkgs/nixos/release.nix index 6107f35297..cf16986b21 100644 --- a/third_party/nixpkgs/nixos/release.nix +++ b/third_party/nixpkgs/nixos/release.nix @@ -155,6 +155,12 @@ in rec { inherit system; }); + iso_gnome = forMatchingSystems [ "x86_64-linux" ] (system: makeIso { + module = ./modules/installer/cd-dvd/installation-cd-graphical-gnome.nix; + type = "gnome"; + inherit system; + }); + # A variant with a more recent (but possibly less stable) kernel # that might support more hardware. iso_minimal_new_kernel = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeIso { @@ -308,9 +314,9 @@ in rec { lapp = makeClosure ({ pkgs, ... }: { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; + services.httpd.enablePHP = true; services.postgresql.enable = true; services.postgresql.package = pkgs.postgresql; - environment.systemPackages = [ pkgs.php ]; }); }; } diff --git a/third_party/nixpkgs/nixos/tests/acme.nix b/third_party/nixpkgs/nixos/tests/acme.nix index 693f02962f..fc41dc1eb5 100644 --- a/third_party/nixpkgs/nixos/tests/acme.nix +++ b/third_party/nixpkgs/nixos/tests/acme.nix @@ -12,8 +12,9 @@ let fi ''; -in import ./make-test-python.nix { +in import ./make-test-python.nix ({ lib, ... }: { name = "acme"; + meta.maintainers = lib.teams.acme.members; nodes = rec { acme = { nodes, lib, ... }: { @@ -207,4 +208,4 @@ in import ./make-test-python.nix { "curl --cacert /tmp/ca.crt https://c.example.test/ | grep -qF 'hello world'" ) ''; -} +}) diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index cbfdf3ad9c..eff1752bbb 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -287,6 +287,7 @@ in snapper = handleTest ./snapper.nix {}; solr = handleTest ./solr.nix {}; spacecookie = handleTest ./spacecookie.nix {}; + spike = handleTest ./spike.nix {}; sonarr = handleTest ./sonarr.nix {}; strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; sudo = handleTest ./sudo.nix {}; @@ -301,6 +302,7 @@ in systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {}; systemd-networkd = handleTest ./systemd-networkd.nix {}; systemd-networkd-dhcpserver = handleTest ./systemd-networkd-dhcpserver.nix {}; + systemd-networkd-ipv6-prefix-delegation = handleTest ./systemd-networkd-ipv6-prefix-delegation.nix {}; systemd-nspawn = handleTest ./systemd-nspawn.nix {}; pdns-recursor = handleTest ./pdns-recursor.nix {}; taskserver = handleTest ./taskserver.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/elk.nix b/third_party/nixpkgs/nixos/tests/elk.nix index d3dc6dde13..7e87197ed9 100644 --- a/third_party/nixpkgs/nixos/tests/elk.nix +++ b/third_party/nixpkgs/nixos/tests/elk.nix @@ -101,6 +101,7 @@ let prefixed indices. Ignore the error if the filter does not result in an actionable list of indices (ignore_empty_list) and exit cleanly. options: + allow_ilm_indices: true ignore_empty_list: True disable_action: False filters: diff --git a/third_party/nixpkgs/nixos/tests/google-oslogin/default.nix b/third_party/nixpkgs/nixos/tests/google-oslogin/default.nix index 1977e92e98..97783c81f3 100644 --- a/third_party/nixpkgs/nixos/tests/google-oslogin/default.nix +++ b/third_party/nixpkgs/nixos/tests/google-oslogin/default.nix @@ -22,6 +22,8 @@ in { client = { ... }: {}; }; testScript = '' + MOCKUSER = "mockuser_nixos_org" + MOCKADMIN = "mockadmin_nixos_org" start_all() server.wait_for_unit("mock-google-metadata.service") @@ -29,10 +31,10 @@ in { # mockserver should return a non-expired ssh key for both mockuser and mockadmin server.succeed( - '${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys mockuser | grep -q "${snakeOilPublicKey}"' + f'${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys {MOCKUSER} | grep -q "${snakeOilPublicKey}"' ) server.succeed( - '${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys mockadmin | grep -q "${snakeOilPublicKey}"' + f'${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys {MOCKADMIN} | grep -q "${snakeOilPublicKey}"' ) # install snakeoil ssh key on the client, and provision .ssh/config file @@ -50,20 +52,22 @@ in { client.fail("ssh ghost@server 'true'") # we should be able to connect as mockuser - client.succeed("ssh mockuser@server 'true'") + client.succeed(f"ssh {MOCKUSER}@server 'true'") # but we shouldn't be able to sudo client.fail( - "ssh mockuser@server '/run/wrappers/bin/sudo /run/current-system/sw/bin/id' | grep -q 'root'" + f"ssh {MOCKUSER}@server '/run/wrappers/bin/sudo /run/current-system/sw/bin/id' | grep -q 'root'" ) # we should also be able to log in as mockadmin - client.succeed("ssh mockadmin@server 'true'") + client.succeed(f"ssh {MOCKADMIN}@server 'true'") # pam_oslogin_admin.so should now have generated a sudoers file - server.succeed("find /run/google-sudoers.d | grep -q '/run/google-sudoers.d/mockadmin'") + server.succeed( + f"find /run/google-sudoers.d | grep -q '/run/google-sudoers.d/{MOCKADMIN}'" + ) # and we should be able to sudo client.succeed( - "ssh mockadmin@server '/run/wrappers/bin/sudo /run/current-system/sw/bin/id' | grep -q 'root'" + f"ssh {MOCKADMIN}@server '/run/wrappers/bin/sudo /run/current-system/sw/bin/id' | grep -q 'root'" ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/google-oslogin/server.py b/third_party/nixpkgs/nixos/tests/google-oslogin/server.py index bfc527cb97..5ea9bbd2c9 100644 --- a/third_party/nixpkgs/nixos/tests/google-oslogin/server.py +++ b/third_party/nixpkgs/nixos/tests/google-oslogin/server.py @@ -7,24 +7,29 @@ import hashlib import base64 from http.server import BaseHTTPRequestHandler, HTTPServer +from urllib.parse import urlparse, parse_qs from typing import Dict SNAKEOIL_PUBLIC_KEY = os.environ['SNAKEOIL_PUBLIC_KEY'] +MOCKUSER="mockuser_nixos_org" +MOCKADMIN="mockadmin_nixos_org" -def w(msg): +def w(msg: bytes): sys.stderr.write(f"{msg}\n") sys.stderr.flush() -def gen_fingerprint(pubkey): +def gen_fingerprint(pubkey: str): decoded_key = base64.b64decode(pubkey.encode("ascii").split()[1]) return hashlib.sha256(decoded_key).hexdigest() -def gen_email(username): + +def gen_email(username: str): """username seems to be a 21 characters long number string, so mimic that in a reproducible way""" return str(int(hashlib.sha256(username.encode()).hexdigest(), 16))[0:21] + def gen_mockuser(username: str, uid: str, gid: str, home_directory: str, snakeoil_pubkey: str) -> Dict: snakeoil_pubkey_fingerprint = gen_fingerprint(snakeoil_pubkey) # seems to be a 21 characters long numberstring, so mimic that in a reproducible way @@ -56,7 +61,8 @@ def gen_mockuser(username: str, uid: str, gid: str, home_directory: str, snakeoi class ReqHandler(BaseHTTPRequestHandler): - def _send_json_ok(self, data): + + def _send_json_ok(self, data: dict): self.send_response(200) self.send_header('Content-type', 'application/json') self.end_headers() @@ -64,29 +70,62 @@ class ReqHandler(BaseHTTPRequestHandler): w(out) self.wfile.write(out) + def _send_json_success(self, success=True): + self.send_response(200) + self.send_header('Content-type', 'application/json') + self.end_headers() + out = json.dumps({"success": success}).encode() + w(out) + self.wfile.write(out) + + def _send_404(self): + self.send_response(404) + self.end_headers() + def do_GET(self): p = str(self.path) - # mockuser and mockadmin are allowed to login, both use the same snakeoil public key - if p == '/computeMetadata/v1/oslogin/users?username=mockuser' \ - or p == '/computeMetadata/v1/oslogin/users?uid=1009719690': - self._send_json_ok(gen_mockuser(username='mockuser', uid='1009719690', gid='1009719690', - home_directory='/home/mockuser', snakeoil_pubkey=SNAKEOIL_PUBLIC_KEY)) - elif p == '/computeMetadata/v1/oslogin/users?username=mockadmin' \ - or p == '/computeMetadata/v1/oslogin/users?uid=1009719691': - self._send_json_ok(gen_mockuser(username='mockadmin', uid='1009719691', gid='1009719691', - home_directory='/home/mockadmin', snakeoil_pubkey=SNAKEOIL_PUBLIC_KEY)) + pu = urlparse(p) + params = parse_qs(pu.query) - # mockuser is allowed to login - elif p == f"/computeMetadata/v1/oslogin/authorize?email={gen_email('mockuser')}&policy=login": - self._send_json_ok({'success': True}) + # users endpoint + if pu.path == "/computeMetadata/v1/oslogin/users": + # mockuser and mockadmin are allowed to login, both use the same snakeoil public key + if params.get('username') == [MOCKUSER] or params.get('uid') == ["1009719690"]: + username = MOCKUSER + uid = "1009719690" + elif params.get('username') == [MOCKADMIN] or params.get('uid') == ["1009719691"]: + username = MOCKADMIN + uid = "1009719691" + else: + self._send_404() + return - # mockadmin may also become root - elif p == f"/computeMetadata/v1/oslogin/authorize?email={gen_email('mockadmin')}&policy=login" or p == f"/computeMetadata/v1/oslogin/authorize?email={gen_email('mockadmin')}&policy=adminLogin": - self._send_json_ok({'success': True}) + self._send_json_ok(gen_mockuser(username=username, uid=uid, gid=uid, home_directory=f"/home/{username}", snakeoil_pubkey=SNAKEOIL_PUBLIC_KEY)) + return + + # authorize endpoint + elif pu.path == "/computeMetadata/v1/oslogin/authorize": + # is user allowed to login? + if params.get("policy") == ["login"]: + # mockuser and mockadmin are allowed to login + if params.get('email') == [gen_email(MOCKUSER)] or params.get('email') == [gen_email(MOCKADMIN)]: + self._send_json_success() + return + self._send_json_success(False) + return + # is user allowed to become root? + elif params.get("policy") == ["adminLogin"]: + # only mockadmin is allowed to become admin + self._send_json_success((params['email'] == [gen_email(MOCKADMIN)])) + return + # send 404 for other policies + else: + self._send_404() + return else: sys.stderr.write(f"Unhandled path: {p}\n") sys.stderr.flush() - self.send_response(501) + self.send_response(404) self.end_headers() self.wfile.write(b'') diff --git a/third_party/nixpkgs/nixos/tests/mediawiki.nix b/third_party/nixpkgs/nixos/tests/mediawiki.nix index 9468c1de8c..008682310c 100644 --- a/third_party/nixpkgs/nixos/tests/mediawiki.nix +++ b/third_party/nixpkgs/nixos/tests/mediawiki.nix @@ -8,6 +8,13 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { services.mediawiki.virtualHost.hostName = "localhost"; services.mediawiki.virtualHost.adminAddr = "root@example.com"; services.mediawiki.passwordFile = pkgs.writeText "password" "correcthorsebatterystaple"; + services.mediawiki.extensions = { + Matomo = pkgs.fetchzip { + url = "https://github.com/DaSchTour/matomo-mediawiki-extension/archive/v4.0.1.tar.gz"; + sha256 = "0g5rd3zp0avwlmqagc59cg9bbkn3r7wx7p6yr80s644mj6dlvs1b"; + }; + ParserFunctions = null; + }; }; testScript = '' diff --git a/third_party/nixpkgs/nixos/tests/php/fpm.nix b/third_party/nixpkgs/nixos/tests/php/fpm.nix index 1e4ced24b6..513abd9437 100644 --- a/third_party/nixpkgs/nixos/tests/php/fpm.nix +++ b/third_party/nixpkgs/nixos/tests/php/fpm.nix @@ -1,6 +1,6 @@ -import ../make-test-python.nix ({pkgs, ...}: { +import ../make-test-python.nix ({pkgs, lib, ...}: { name = "php-fpm-nginx-test"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ etu ]; + meta.maintainers = lib.teams.php.members; machine = { config, lib, pkgs, ... }: { services.nginx = { diff --git a/third_party/nixpkgs/nixos/tests/php/httpd.nix b/third_party/nixpkgs/nixos/tests/php/httpd.nix index fc3ff98673..1092e0ecad 100644 --- a/third_party/nixpkgs/nixos/tests/php/httpd.nix +++ b/third_party/nixpkgs/nixos/tests/php/httpd.nix @@ -1,6 +1,6 @@ -import ../make-test-python.nix ({pkgs, ...}: { +import ../make-test-python.nix ({pkgs, lib, ...}: { name = "php-httpd-test"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ etu ]; + meta.maintainers = lib.teams.php.members; machine = { config, lib, pkgs, ... }: { services.httpd = { diff --git a/third_party/nixpkgs/nixos/tests/php/pcre.nix b/third_party/nixpkgs/nixos/tests/php/pcre.nix index 016dca81d5..3dd0964e60 100644 --- a/third_party/nixpkgs/nixos/tests/php/pcre.nix +++ b/third_party/nixpkgs/nixos/tests/php/pcre.nix @@ -1,7 +1,9 @@ let testString = "can-use-subgroups"; -in import ../make-test-python.nix ({ ...}: { +in import ../make-test-python.nix ({lib, ...}: { name = "php-httpd-pcre-jit-test"; + meta.maintainers = lib.teams.php.members; + machine = { lib, pkgs, ... }: { time.timeZone = "UTC"; services.httpd = { 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 new file mode 100644 index 0000000000..99cd341eec --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix @@ -0,0 +1,295 @@ +# This test verifies that we can request and assign IPv6 prefixes from upstream +# (e.g. ISP) routers. +# The setup consits of three VMs. One for the ISP, as your residential router +# and the third as a client machine in the residential network. +# +# There are two VLANs in this test: +# - VLAN 1 is the connection between the ISP and the router +# - VLAN 2 is the connection between the router and the client + +import ./make-test-python.nix ({pkgs, ...}: { + name = "systemd-networkd-ipv6-prefix-delegation"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ andir ]; + }; + nodes = { + + # The ISP's routers job is to delegate IPv6 prefixes via DHCPv6. Like with + # regular IPv6 auto-configuration it will also emit IPv6 router + # advertisements (RAs). Those RA's will not carry a prefix but in contrast + # just set the "Other" flag to indicate to the receiving nodes that they + # should attempt DHCPv6. + # + # Note: On the ISPs device we don't really care if we are using networkd in + # this example. That being said we can't use it (yet) as networkd doesn't + # implement the serving side of DHCPv6. We will use ISC's well aged dhcpd6 + # for that task. + isp = { lib, pkgs, ... }: { + virtualisation.vlans = [ 1 ]; + networking = { + useDHCP = false; + 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; } + ]; + }; + + # Since we want to program the routes that we delegate to the "customer" + # into our routing table we must have a way to gain the required privs. + # This security wrapper will do in our test setup. + # + # DO NOT COPY THIS TO PRODUCTION AS IS. Think about it at least twice. + # Everyone on the "isp" machine will be able to add routes to the kernel. + security.wrappers.add-dhcpd-lease = { + source = pkgs.writeShellScript "add-dhcpd-lease" '' + exec ${pkgs.iproute}/bin/ip -6 route replace "$1" via "$2" + ''; + capabilities = "cap_net_admin+ep"; + }; + services = { + # Configure the DHCPv6 server + # + # We will hand out /48 prefixes from the subnet 2001:DB8:F000::/36. + # That gives us ~8k prefixes. That should be enough for this test. + # + # Since (usually) you will not receive a prefix with the router + # advertisements we also hand out /128 leases from the range + # 2001:DB8:0000:0000:FFFF::/112. + dhcpd6 = { + enable = true; + interfaces = [ "eth1" ]; + extraConfig = '' + subnet6 2001:DB8::/36 { + range6 2001:DB8:0000:0000:FFFF:: 2001:DB8:0000:0000:FFFF::FFFF; + prefix6 2001:DB8:F000:: 2001:DB8:FFFF:: /48; + } + + # This is the secret sauce. We have to extract the prefix and the + # next hop when commiting the lease to the database. dhcpd6 + # (rightfully) has not concept of adding routes to the systems + # routing table. It really depends on the setup. + # + # In a production environment your DHCPv6 server is likely not the + # router. You might want to consider BGP, custom NetConf calls, … + # in those cases. + on commit { + set IP = pick-first-value(binary-to-ascii(16, 16, ":", substring(option dhcp6.ia-na, 16, 16)), "n/a"); + set Prefix = pick-first-value(binary-to-ascii(16, 16, ":", suffix(option dhcp6.ia-pd, 16)), "n/a"); + set PrefixLength = pick-first-value(binary-to-ascii(10, 8, ":", substring(suffix(option dhcp6.ia-pd, 17), 0, 1)), "n/a"); + log(concat(IP, " ", Prefix, " ", PrefixLength)); + execute("/run/wrappers/bin/add-dhcpd-lease", concat(Prefix,"/",PrefixLength), IP); + } + ''; + }; + + # Finally we have to set up the router advertisements. While we could be + # using networkd or bird for this task `radvd` is probably the most + # venerable of them all. It was made explicitly for this purpose and + # the configuration is much more straightforward than what networkd + # requires. + # As outlined above we will have to set the `Managed` flag as otherwise + # the clients will not know if they should do DHCPv6. (Some do + # anyway/always) + radvd = { + enable = true; + config = '' + interface eth1 { + AdvSendAdvert on; + AdvManagedFlag on; + AdvOtherConfigFlag off; # we don't really have DNS or NTP or anything like that to distribute + prefix ::/64 { + AdvOnLink on; + AdvAutonomous on; + }; + }; + ''; + }; + + }; + }; + + # This will be our (residential) router that receives the IPv6 prefix (IA_PD) + # and /128 (IA_NA) allocation. + # + # Here we will actually start using networkd. + router = { + virtualisation.vlans = [ 1 2 ]; + systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug"; + + boot.kernel.sysctl = { + # we want to forward packets from the ISP to the client and back. + "net.ipv6.conf.all.forwarding" = 1; + }; + + networking = { + useNetworkd = true; + useDHCP = false; + # Consider enabling this in production and generating firewall rules + # for fowarding/input from the configured interfaces so you do not have + # to manage multiple places + firewall.enable = false; + }; + + systemd.network = { + networks = { + # systemd-networkd will load the first network unit file + # that matches, ordered lexiographically by filename. + # /etc/systemd/network/{40-eth1,99-main}.network already + # exists. This network unit must be loaded for the test, + # however, hence why this network is named such. + + # Configuration of the interface to the ISP. + # We must request accept RAs and request the PD prefix. + "01-eth1" = { + name = "eth1"; + networkConfig = { + Description = "ISP interface"; + IPv6AcceptRA = true; + #DHCP = false; # no need for legacy IP + }; + linkConfig = { + # We care about this interface when talking about being "online". + # If this interface is in the `routable` state we can reach + # others and they should be able to reach us. + RequiredForOnline = "routable"; + }; + # This configures the DHCPv6 client part towards the ISPs DHCPv6 server. + dhcpV6Config = { + # We have to include a request for a prefix in our DHCPv6 client + # request packets. + # Otherwise the upstream DHCPv6 server wouldn't know if we want a + # prefix or not. Note: On some installation it makes sense to + # always force that option on the DHPCv6 server since there are + # certain CPEs that are just not setting this field but happily + # accept the delegated prefix. + PrefixDelegationHint = "::/48"; + }; + ipv6PrefixDelegationConfig = { + # Let networkd know that we would very much like to use DHCPv6 + # to obtain the "managed" information. Not sure why they can't + # just take that from the upstream RAs. + Managed = true; + }; + }; + + # Interface to the client. Here we should redistribute a /64 from + # the prefix we received from the ISP. + "01-eth2" = { + name = "eth2"; + networkConfig = { + Description = "Client interface"; + # the client shouldn't be allowed to send us RAs, that would be weird. + IPv6AcceptRA = false; + + # Just delegate prefixes from the DHCPv6 PD pool. + # If you also want to distribute a local ULA prefix you want to + # set this to `yes` as that includes both static prefixes as well + # as PD prefixes. + IPv6PrefixDelegation = "dhcpv6"; + }; + # finally "act as router" (according to systemd.network(5)) + ipv6PrefixDelegationConfig = { + RouterLifetimeSec = 300; # required as otherwise no RA's are being emitted + + # In a production environment you should consider setting these as well: + #EmitDNS = true; + #EmitDomains = true; + #DNS= = "fe80::1"; # or whatever "well known" IP your router will have on the inside. + }; + + # This adds a "random" ULA prefix to the interface that is being + # advertised to the clients. + # Not used in this test. + # ipv6Prefixes = [ + # { + # ipv6PrefixConfig = { + # AddressAutoconfiguration = true; + # PreferredLifetimeSec = 1800; + # ValidLifetimeSec = 1800; + # }; + # } + # ]; + }; + + # finally we are going to add a static IPv6 unique local address to + # the "lo" interface. This will serve as ICMPv6 echo target to + # verify connectivity from the client to the router. + "01-lo" = { + name = "lo"; + addresses = [ + { addressConfig.Address = "FD42::1/128"; } + ]; + }; + }; + }; + + # make the network-online target a requirement, we wait for it in our test script + systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; + }; + + # This is the client behind the router. We should be receving router + # advertisements for both the ULA and the delegated prefix. + # All we have to do is boot with the default (networkd) configuration. + client = { + virtualisation.vlans = [ 2 ]; + systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug"; + networking = { + useNetworkd = true; + useDHCP = false; + }; + + # make the network-online target a requirement, we wait for it in our test script + systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; + }; + }; + + testScript = '' + # First start the router and wait for it it reach a state where we are + # certain networkd is up and it is able to send out RAs + router.start() + router.wait_for_unit("systemd-networkd.service") + + # After that we can boot the client and wait for the network online target. + # Since we only care about IPv6 that should not involve waiting for legacy + # IP leases. + client.start() + client.wait_for_unit("network-online.target") + + # the static address on the router should not be reachable + 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::") + + # Once we have internal connectivity boot up the ISP + isp.start() + + # Since for the ISP "being online" should have no real meaning we just + # wait for the target where all the units have been started. + # It probably still takes a few more seconds for all the RA timers to be + # fired etc.. + isp.wait_for_unit("multi-user.target") + + # 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::") + + # 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::") + + # verify that we got a globally scoped address in eth1 from the + # documentation prefix + ip_output = client.succeed("ip --json -6 address show dev eth1") + + import json + + ip_json = json.loads(ip_output)[0] + assert any( + addr["local"].upper().startswith("2001:DB8:") + for addr in ip_json["addr_info"] + if addr["scope"] == "global" + ) + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/xmpp/prosody.nix b/third_party/nixpkgs/nixos/tests/xmpp/prosody.nix index 9d1374bff6..e7755e24ba 100644 --- a/third_party/nixpkgs/nixos/tests/xmpp/prosody.nix +++ b/third_party/nixpkgs/nixos/tests/xmpp/prosody.nix @@ -1,27 +1,80 @@ -import ../make-test-python.nix { - name = "prosody"; +let + cert = pkgs: pkgs.runCommandNoCC "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' + openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=uploads.example.com/CN=conference.example.com' + mkdir -p $out + cp key.pem cert.pem $out + ''; + createUsers = pkgs: pkgs.writeScriptBin "create-prosody-users" '' + #!${pkgs.bash}/bin/bash + set -e + # Creates and set password for the 2 xmpp test users. + # + # Doing that in a bash script instead of doing that in the test + # script allow us to easily provision the users when running that + # test interactively. + + prosodyctl register cthon98 example.com nothunter2 + prosodyctl register azurediamond example.com hunter2 + ''; + delUsers = pkgs: pkgs.writeScriptBin "delete-prosody-users" '' + #!${pkgs.bash}/bin/bash + set -e + + # Deletes the test users. + # + # Doing that in a bash script instead of doing that in the test + # script allow us to easily provision the users when running that + # test interactively. + + prosodyctl deluser cthon98@example.com + prosodyctl deluser azurediamond@example.com + ''; +in import ../make-test-python.nix { + name = "prosody"; nodes = { - client = { nodes, pkgs, ... }: { + client = { nodes, pkgs, config, ... }: { + security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; + console.keyMap = "fr-bepo"; + networking.extraHosts = '' + ${nodes.server.config.networking.primaryIPAddress} example.com + ${nodes.server.config.networking.primaryIPAddress} conference.example.com + ${nodes.server.config.networking.primaryIPAddress} uploads.example.com + ''; environment.systemPackages = [ (pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = nodes.server.config.networking.primaryIPAddress; }) ]; }; server = { config, pkgs, ... }: { + security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; + console.keyMap = "fr-bepo"; networking.extraHosts = '' ${config.networking.primaryIPAddress} example.com + ${config.networking.primaryIPAddress} conference.example.com + ${config.networking.primaryIPAddress} uploads.example.com ''; networking.firewall.enable = false; + environment.systemPackages = [ + (createUsers pkgs) + (delUsers pkgs) + ]; services.prosody = { enable = true; - # TODO: use a self-signed certificate - c2sRequireEncryption = false; - extraConfig = '' - storage = "sql" - ''; - virtualHosts.test = { + ssl.cert = "${cert pkgs}/cert.pem"; + ssl.key = "${cert pkgs}/key.pem"; + virtualHosts.example = { domain = "example.com"; enabled = true; + ssl.cert = "${cert pkgs}/cert.pem"; + ssl.key = "${cert pkgs}/key.pem"; + }; + muc = [ + { + domain = "conference.example.com"; + } + ]; + uploadHttp = { + domain = "uploads.example.com"; }; }; }; @@ -31,16 +84,8 @@ import ../make-test-python.nix { server.wait_for_unit("prosody.service") server.succeed('prosodyctl status | grep "Prosody is running"') - # set password to 'nothunter2' (it's asked twice) - server.succeed("yes nothunter2 | prosodyctl adduser cthon98@example.com") - # set password to 'y' - server.succeed("yes | prosodyctl adduser azurediamond@example.com") - # correct password to "hunter2" - server.succeed("yes hunter2 | prosodyctl passwd azurediamond@example.com") - - client.succeed("send-message") - - server.succeed("prosodyctl deluser cthon98@example.com") - server.succeed("prosodyctl deluser azurediamond@example.com") + server.succeed("create-prosody-users") + client.succeed('send-message 2>&1 | grep "XMPP SCRIPT TEST SUCCESS"') + server.succeed("delete-prosody-users") ''; } diff --git a/third_party/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix b/third_party/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix index 2a075a0181..349b9c6f38 100644 --- a/third_party/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix +++ b/third_party/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix @@ -1,46 +1,61 @@ -{ writeScriptBin, python3, connectTo ? "localhost" }: -writeScriptBin "send-message" '' - #!${(python3.withPackages (ps: [ ps.sleekxmpp ])).interpreter} - # Based on the sleekxmpp send_client example, look there for more details: - # https://github.com/fritzy/SleekXMPP/blob/develop/examples/send_client.py - import sleekxmpp +{ writeScriptBin, writeText, python3, connectTo ? "localhost" }: +let + dummyFile = writeText "dummy-file" '' + Dear dog, - class SendMsgBot(sleekxmpp.ClientXMPP): - """ - A basic SleekXMPP bot that will log in, send a message, - and then log out. - """ - def __init__(self, jid, password, recipient, message): - sleekxmpp.ClientXMPP.__init__(self, jid, password) + Please find this *really* important attachment. - self.recipient = recipient - self.msg = message + Yours truly, + John + ''; +in writeScriptBin "send-message" '' +#!${(python3.withPackages (ps: [ ps.slixmpp ])).interpreter} +import logging +import sys +from types import MethodType - self.add_event_handler("session_start", self.start, threaded=True) - - def start(self, event): - self.send_presence() - self.get_roster() - - self.send_message(mto=self.recipient, - mbody=self.msg, - mtype='chat') - - self.disconnect(wait=True) +from slixmpp import ClientXMPP +from slixmpp.exceptions import IqError, IqTimeout - if __name__ == '__main__': - xmpp = SendMsgBot("cthon98@example.com", "nothunter2", "azurediamond@example.com", "hey, if you type in your pw, it will show as stars") - xmpp.register_plugin('xep_0030') # Service Discovery - xmpp.register_plugin('xep_0199') # XMPP Ping +class CthonTest(ClientXMPP): - # TODO: verify certificate - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" + def __init__(self, jid, password): + ClientXMPP.__init__(self, jid, password) + self.add_event_handler("session_start", self.session_start) - if xmpp.connect(('${connectTo}', 5222)): - xmpp.process(block=True) - else: - print("Unable to connect.") - sys.exit(1) + async def session_start(self, event): + log = logging.getLogger(__name__) + self.send_presence() + self.get_roster() + # Sending a test message + self.send_message(mto="azurediamond@example.com", mbody="Hello, this is dog.", mtype="chat") + log.info('Message sent') + + # Test http upload (XEP_0363) + 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) + log.info('Upload success!') + # Test MUC + self.plugin['xep_0045'].join_muc('testMucRoom', 'cthon98', wait=True) + log.info('MUC join success!') + log.info('XMPP SCRIPT TEST SUCCESS') + self.disconnect(wait=True) + + +if __name__ == '__main__': + logging.basicConfig(level=logging.DEBUG, + format='%(levelname)-8s %(message)s') + + ct = CthonTest('cthon98@example.com', 'nothunter2') + ct.register_plugin('xep_0071') + ct.register_plugin('xep_0128') + # HTTP Upload + ct.register_plugin('xep_0363') + # MUC + ct.register_plugin('xep_0045') + ct.connect(("server", 5222)) + ct.process(forever=False) '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/clementine/default.nix b/third_party/nixpkgs/pkgs/applications/audio/clementine/default.nix index 4a32b099d1..15d0f92b76 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/clementine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/clementine/default.nix @@ -91,7 +91,7 @@ let ''; meta = with stdenv.lib; { - homepage = "http://www.clementine-player.org"; + homepage = "https://www.clementine-player.org"; description = "A multiplatform music player"; license = licenses.gpl3Plus; platforms = platforms.linux; @@ -130,7 +130,7 @@ let ''; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "http://www.clementine-player.org"; + homepage = "https://www.clementine-player.org"; description = "Spotify integration for Clementine"; # The blob itself is Apache-licensed, although libspotify is unfree. license = licenses.asl20; 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 e80239553f..3acf8ea1c0 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.15"; + version = "1.23"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "19xgdaij71gpvq216zjlp60zmfdl2a8kf8sc3bpk8a4d4xh4n151"; + sha256 = "03prdifc2nz7smmzdy19flp33m927vb7j5bhdc46gak753pikw7d"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix index 2972849a2d..eaedcb426b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix @@ -99,6 +99,11 @@ in stdenv.mkDerivation rec { ) ''; + # Meson is no longer able to pick up Boost automatically. + # https://github.com/NixOS/nixpkgs/issues/86131 + BOOST_INCLUDEDIR = "${stdenv.lib.getDev boost}/include"; + BOOST_LIBRARYDIR = "${stdenv.lib.getLib boost}/lib"; + meta = with stdenv.lib; { description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications"; homepage = "https://github.com/wwmm/pulseeffects"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/puredata/default.nix b/third_party/nixpkgs/pkgs/applications/audio/puredata/default.nix index 9880a65d0c..4b221cd1a7 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/puredata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/puredata/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "puredata"; - version = "0.49-0"; + version = "0.50-2"; src = fetchurl { url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz"; - sha256 = "18rzqbpgnnvyslap7k0ly87aw1bbxkb0rk5agpr423ibs9slxq6j"; + sha256 = "0dz6r6jy0zfs1xy1xspnrxxks8kddi9c7pxz4vpg2ygwv83ghpg5"; }; nativeBuildInputs = [ autoreconfHook gettext makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/qmidinet/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qmidinet/default.nix index 10cbcb5d5b..479a8a2bb0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/qmidinet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/qmidinet/default.nix @@ -1,12 +1,12 @@ { mkDerivation, lib, fetchurl, pkgconfig, qtbase, qttools, alsaLib, libjack2 }: mkDerivation rec { - version = "0.6.1"; + version = "0.6.2"; pname = "qmidinet"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz"; - sha256 = "1nvbvx3wg2s6s7r4x6m2pm9nx7pdz00ghw9h10wfqi2s474mwip0"; + sha256 = "0siqzyhwg3l9av7jbca3bqdww7xspjlpi9ya4mkj211xc3a3a1d6"; }; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix index b50dd78ff1..36125489e3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix @@ -1,30 +1,29 @@ -{ stdenv, fetchurl, alsaLib, python, SDL }: +{ stdenv, fetchFromGitHub +, autoreconfHook +, alsaLib, python, SDL }: stdenv.mkDerivation rec { - version = "20120105"; pname = "schismtracker"; + version = "20190805"; - src = fetchurl { - url = "http://schismtracker.org/dl/${pname}-${version}.tar.bz2"; - sha256 = "1ny7wv2wxm1av299wvpskall6438wjjpadphmqc7c0h6d0zg5kii"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "0qqps20vvn3rgpg8174bjrrm38gqcci2z5z4c1r1vhbccclahgsd"; }; - preConfigure = '' - # Build fails on Linux with windres. - export ac_cv_prog_ac_ct_WINDRES= - ''; - configureFlags = [ "--enable-dependency-tracking" ]; - buildInputs = [ alsaLib python SDL ]; + nativeBuildInputs = [ autoreconfHook python ]; - enableParallelBuilding = true; + buildInputs = [ alsaLib SDL ]; - meta = { + meta = with stdenv.lib; { description = "Music tracker application, free reimplementation of Impulse Tracker"; homepage = "http://schismtracker.org/"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ]; + maintainers = with maintainers; [ ftrvxmtrx ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc.nix index afc5b40f9d..aee73cecdf 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.3"; + version = "0.21.5"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1pzdgghbsss2qjfgl42lvkbs5yc5q6jnzqnp24lljmrh341g2zn4"; + sha256 = "1jx33n8dhn16iaxvmc56cxw0i5qk0ga5nf7qf9frwwq6zkglknga"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/clightning.nix b/third_party/nixpkgs/pkgs/applications/blockchains/clightning.nix index 6176591346..371bf11064 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.8.1"; + version = "0.8.2"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "079d3yx7yr7qrilqgaayvn18lxl8h6a1gwwbsgm5xsyxj4vdlz7r"; + sha256 = "1w5l3r3pnhnwz3x7mjgd69cw9a18fpyjwj7kmfka7cf9hdgcwp9x"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lnd.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lnd.nix index dd45746c8d..0aa087e20a 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lnd.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lnd.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "lnd"; - version = "0.9.0-beta"; + version = "0.9.2-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "1hq105s9ykp6nsn4iicjnl3mwspqkbfsswkx7sgzv3jggg08fkq9"; + sha256 = "0gm33z89fiqv231ks2mkpsblskcsijipq8fcmip6m6jy8g06b1gb"; }; - modSha256 = "1pvcvpiz6ck8xkgpypchrq9kgkik0jxd7f3jhihbgldsh4zaqiaq"; + modSha256 = "1khxplvyaqgaddrx1nna1fw0nb1xz9bmqpxpfifif4f5nmx90gbr"; + + subPackages = ["cmd/lncli" "cmd/lnd"]; meta = with lib; { description = "Lightning Network Daemon"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix index 48a6d81b6b..cfd3998ee3 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix @@ -5,7 +5,7 @@ , qtquickcontrols, qtquickcontrols2 , monero, unbound, readline, boost, libunwind , libsodium, pcsclite, zeromq, cppzmq -, hidapi, libusb, protobuf, randomx +, hidapi, libusb-compat-0_1, protobuf, randomx }: with stdenv.lib; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { qtxmlpatterns monero unbound readline boost libunwind libsodium pcsclite zeromq - cppzmq hidapi libusb protobuf randomx + cppzmq hidapi libusb-compat-0_1 protobuf randomx ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix index 2a04beb937..d1abd39565 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix @@ -2,7 +2,7 @@ , cmake, pkgconfig , boost, miniupnpc, openssl, unbound, cppzmq , zeromq, pcsclite, readline, libsodium, hidapi -, pythonProtobuf, randomx, rapidjson, libusb +, pythonProtobuf, randomx, rapidjson, libusb-compat-0_1 , CoreData, IOKit, PCSC }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline libsodium hidapi randomx rapidjson - pythonProtobuf libusb + pythonProtobuf libusb-compat-0_1 ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/vertcoin.nix b/third_party/nixpkgs/pkgs/applications/blockchains/vertcoin.nix index 1b8b037633..21104012f4 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/vertcoin.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/vertcoin.nix @@ -19,7 +19,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "vertcoin"; - version = "0.14.0"; + version = "0.15.0.1"; name = pname + toString (optional (!withGui) "d") + "-" + version; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = pname + "-project"; repo = pname + "-core"; rev = version; - sha256 = "00vnmrhn5mad58dyiz8rxgsrn0663ii6fdbcqm20mv1l313k4882"; + sha256 = "09q7qicw52gv225hq6wlpsf4zr4hjc8miyim5cygi5nxxrlw7kd3"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/zcash/librustzcash/default.nix index 6cd2ae018f..526adc715d 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/zcash/librustzcash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/zcash/librustzcash/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { installPhase = '' mkdir -p $out/lib - cp target/release/librustzcash.a $out/lib/ + cp $releaseDir/librustzcash.a $out/lib/ mkdir -p $out/include cp librustzcash/include/librustzcash.h $out/include/ ''; 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 a6b99e5835..8869f8a0f6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -13,14 +13,14 @@ let sha256Hash = "0apxmp341m7mbpm2df3qvsbaifwy6yqq746kbhbwlw8bn9hrzv1k"; }; betaVersion = { - version = "4.0.0.13"; # "Android Studio 4.0 Beta 4" - build = "193.6348893"; - sha256Hash = "0lchi3l50826n1af1z24yclpf27v2q5p1zjbvcmn37wz46d4s4g2"; + version = "4.0.0.14"; # "Android Studio 4.0 Beta 5" + build = "193.6401094"; + sha256Hash = "11fmpf58z44i78ldkapzivz6md65744vqczzbwv8mkjkv9nz95rs"; }; latestVersion = { # canary & dev - version = "4.1.0.6"; # "Android Studio 4.1 Canary 6" - build = "193.6381907"; - sha256Hash = "0sa5plr96m90wv5hi9bqwa11j6k8k9wa0ji8qmlimdhnpyzhsdrx"; + version = "4.1.0.7"; # "Android Studio 4.1 Canary 7" + build = "193.6401718"; + sha256Hash = "1xa61rhi7dgxm0y6yl5dxd09x530mzyxvx9bp1jprzfwvc7s0byh"; }; in { # Attributes are named by their corresponding release channels 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 9ae07c1c90..e0e28f53b8 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 @@ -925,10 +925,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.6.13"; + version = "0.6.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.6.13.tar"; - sha256 = "1nxbp7w4xxij07q8manc15b896sl10yh2h1cg88prdqbw1wk62qr"; + url = "https://elpa.gnu.org/packages/ebdb-0.6.16.tar"; + sha256 = "0yn0nqjp68kwlrd4qs9fg3xizm9jnddkkyw25l0llq04b53zgjdl"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -1005,10 +1005,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.5"; + version = "1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eglot-1.5.tar"; - sha256 = "00ifgz9r9xvy19zsz1yfls6n1acvms14p86nbw0x6ldjgvpf279i"; + url = "https://elpa.gnu.org/packages/eglot-1.6.tar"; + sha256 = "15hd6sx7qrpvlvhwwkcgdiki8pswwf4mm7hkm0xvznskfcp44spx"; }; packageRequires = [ emacs flymake jsonrpc ]; meta = { @@ -1367,10 +1367,10 @@ elpaBuild { pname = "gnorb"; ename = "gnorb"; - version = "1.6.5"; + version = "1.6.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.6.5.tar"; - sha256 = "1har3j8gb65mawrwn93939jg157wbap138qa1z1myznrrish6vzc"; + url = "https://elpa.gnu.org/packages/gnorb-1.6.6.tar"; + sha256 = "1vlb9q7a622qylrgip5ld2yrzp4l58gl543i2jdxr7jxvamy22bp"; }; packageRequires = [ cl-lib ]; meta = { @@ -2011,10 +2011,10 @@ elpaBuild { pname = "modus-operandi-theme"; ename = "modus-operandi-theme"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.6.0.el"; - sha256 = "10smvzaxp90lsg0g61s2nzmfxwnlrxq9dv4rn771vlhra249y08v"; + url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.7.0.el"; + sha256 = "17zvcqplbl3rk39k61v43ganzv06j49rlyickanwll5m1a3iibw2"; }; packageRequires = [ emacs ]; meta = { @@ -2026,10 +2026,10 @@ elpaBuild { pname = "modus-vivendi-theme"; ename = "modus-vivendi-theme"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.6.0.el"; - sha256 = "1b7wkz779f020gpil4spbdzmg2fx6l48wk1138564cv9kx3nkkz2"; + url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.7.0.el"; + sha256 = "1w4vrg39dghghkvll3h4kmzykc3zpp6pbychb39gcc13z2b06v8g"; }; packageRequires = [ emacs ]; meta = { @@ -2215,10 +2215,10 @@ elpaBuild { pname = "oauth2"; ename = "oauth2"; - version = "0.12"; + version = "0.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/oauth2-0.12.el"; - sha256 = "1rfyfy0h7shr3fmd8lh6s2i3ahfh28wb5fqiqlsjwspn5h77ll29"; + url = "https://elpa.gnu.org/packages/oauth2-0.13.el"; + sha256 = "0y5nbdwxz2hfr09xgsqgyv60vgx0rsaisibcpkz00klvgg26w33r"; }; packageRequires = []; meta = { @@ -2320,10 +2320,10 @@ elpaBuild { pname = "orgalist"; ename = "orgalist"; - version = "1.11"; + version = "1.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/orgalist-1.11.el"; - sha256 = "0zbqkk540rax32s8szp5zgz3a02zw88fc1dmjmyw6h3ls04m91kl"; + url = "https://elpa.gnu.org/packages/orgalist-1.12.el"; + sha256 = "1hwm7j0hbv2pg9w885ky1c9qga3grcfq8v216jv2ivkw8xzavysd"; }; packageRequires = [ emacs ]; meta = { @@ -2455,10 +2455,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.3.38"; + version = "0.3.43"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.3.38.tar"; - sha256 = "1m8f1z259c66k0hf0cfjqidfd0cra2c2mb7k5lj71v1kfckwj6bh"; + url = "https://elpa.gnu.org/packages/phps-mode-0.3.43.tar"; + sha256 = "099s7c0ll8bbfgynijjaciv2qnyg4r2akajkhlmchh7y10kp5ii4"; }; packageRequires = [ emacs ]; meta = { @@ -2500,10 +2500,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-0.6.0.el"; - sha256 = "14x2jgjn8di03rrad4x4mn8fhcqibk1j5c0ya0vmv8648fki6i9d"; + url = "https://elpa.gnu.org/packages/posframe-0.7.0.el"; + sha256 = "1kwl83jb5k1hnx0s2qw972v0gjqbbvk4sdcdb1qbdxsyw36sylc9"; }; packageRequires = [ emacs ]; meta = { @@ -2575,10 +2575,10 @@ elpaBuild { pname = "rainbow-mode"; ename = "rainbow-mode"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.3.el"; - sha256 = "0cpwqllhv3cb0gii22cj9i731rk3sbf2drm5m52w5yclm8sfr339"; + url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.4.el"; + sha256 = "0rp76gix1ph1wrmdax6y2m3i9y1dmgv7ikjz8xsl5lizkygsy9cg"; }; packageRequires = []; meta = { @@ -2857,6 +2857,21 @@ license = lib.licenses.free; }; }) {}; + scanner = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "scanner"; + ename = "scanner"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/scanner-0.1.tar"; + sha256 = "0hv4w7yzfdnz8vrfhw6i6agj9hs09vzsqr63nrp6dd93q0gk71mw"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/scanner.html"; + license = lib.licenses.free; + }; + }) {}; scroll-restore = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "scroll-restore"; @@ -2947,6 +2962,21 @@ license = lib.licenses.free; }; }) {}; + sm-c-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "sm-c-mode"; + ename = "sm-c-mode"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/sm-c-mode-1.0.el"; + sha256 = "1lq65dhcvrh6ybla37lvni7wmbjb5nhm75ja9cl79148da1zrg91"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/sm-c-mode.html"; + license = lib.licenses.free; + }; + }) {}; smalltalk-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "smalltalk-mode"; @@ -3539,10 +3569,10 @@ elpaBuild { pname = "web-server"; ename = "web-server"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/web-server-0.1.1.tar"; - sha256 = "1q51fhqw5al4iycdlighwv7jqgdpjb1a66glwd5jnc9b651yk42n"; + url = "https://elpa.gnu.org/packages/web-server-0.1.2.tar"; + sha256 = "10lcsl4dg2yr9zjd99gq9jz150wvvh6r5y9pd88l8y9vz16f2lim"; }; packageRequires = [ emacs ]; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/emacspeak/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/emacspeak/default.nix new file mode 100644 index 0000000000..5bc8bbc6a9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/emacspeak/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, makeWrapper, emacs, tcl, tclx, espeak-ng }: + +stdenv.mkDerivation rec { + pname = "emacspeak"; + version = "51.0"; + + + src = fetchurl { + url = "https://github.com/tvraman/emacspeak/releases/download/${version}/${pname}-${version}.tar.bz2"; + sha256 = "09a0ywxlqa8jmc0wmvhaf7bdydnkyhy9nqfsdqcpbsgdzj6qpg90"; + }; + + nativeBuildInputs = [ makeWrapper emacs ]; + buildInputs = [ tcl tclx espeak-ng ]; + + preConfigure = '' + make config + ''; + + postBuild = '' + make -C servers/native-espeak PREFIX=$out "TCL_INCLUDE=${tcl}/include" + ''; + + postInstall = '' + make -C servers/native-espeak PREFIX=$out install + local d=$out/share/emacs/site-lisp/emacspeak/ + install -d -- "$d" + cp -a . "$d" + find "$d" \( -type d -or \( -type f -executable \) \) -execdir chmod 755 {} + + find "$d" -type f -not -executable -execdir chmod 644 {} + + makeWrapper ${emacs}/bin/emacs $out/bin/emacspeak \ + --set DTK_PROGRAM "${espeak-ng}/bin/espeak" \ + --add-flags '-l "${placeholder "out"}/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.elc"' + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/tvraman/emacspeak/; + description = "Emacs extension that provides spoken output"; + license = licenses.gpl2; + maintainers = [ dema ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix deleted file mode 100644 index ad22faf3df..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ fetchurl, melpaBuild }: - -melpaBuild { - pname = "filesets-plus"; - version = "20170222.55"; - - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/filesets%2b.el"; - sha256 = "0iajkgh0n3pbrwwxx9rmrrwz8dw2m7jsp4mggnhq7zsb20ighs00"; - name = "filesets+.el"; - }; - - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/filesets-plus+"; - sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g"; - name = "filesets-plus"; - }; - - meta = { - homepage = "https://melpa.org/#/filesets+"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/header2/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/header2/default.nix deleted file mode 100644 index 171d8c6b16..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/header2/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ fetchurl, lib, melpaBuild }: - -melpaBuild { - pname = "header2"; - version = "20170223.1949"; - - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/header2.el"; - sha256 = "0cv74cfihr13jrgyqbj4x0na659djfyrhflxni6jdbgbysi4zf6k"; - name = "header2.el"; - }; - - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/header2"; - sha256 = "1dg25krx3wxma2l5vb2ji7rpfp17qbrl62jyjpa52cjfsvyp6v06"; - name = "header2"; - }; - - meta = { - homepage = "https://melpa.org/#/header2"; - license = lib.licenses.gpl3; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/hexrgb/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/hexrgb/default.nix deleted file mode 100644 index 8b9ebcd602..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/hexrgb/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ fetchurl, lib, melpaBuild }: - -melpaBuild { - pname = "hexrgb"; - version = "20170304.1017"; - - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hexrgb.el"; - sha256 = "1aj1fsc3wr8174xs45j2wc2mm6f8v6zs40xn0r4qisdw0plmsbsy"; - name = "hexrgb.el"; - }; - - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/hexrgb"; - sha256 = "0mzqslrrf7sc262syj3ja7b7rnbg80dwf2p9bzxdrzx6b8vvsx06"; - name = "hexrgb"; - }; - - meta = { - homepage = "https://melpa.org/#/hexrgb"; - license = lib.licenses.gpl2Plus; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/icicles/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/icicles/default.nix deleted file mode 100644 index 9463429222..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/icicles/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, emacs }: - -let - modules = [ - { name = "icicles.el"; sha256 = "1744n5g2kmv3r261ipa0fhrgnapl0chxz57bbbls3bp30cnnfrs7"; } - { name = "icicles-chg.el"; sha256 = "058sxa8wh3vqr3zy677q6m2lfx4n477rnb8921s1p6wgs55v7dp4"; } - { name = "icicles-cmd1.el"; sha256 = "064hyy8nxvlg298s5qnmk7aczbasfpddhx57jxaldyyzkca3n2h5"; } - { name = "icicles-cmd2.el"; sha256 = "0a77fx0pxyfrg9nxvqvzz247v6cljjfz9dnfs7lc8qgdvksxs261"; } - { name = "icicles-doc1.el"; sha256 = "04j5qvj7pqnjh8h2y2sdgi7x55czdp9xn7yysr3bzcmr1rq5p4bz"; } - { name = "icicles-doc2.el"; sha256 = "1k8vfhi3fa4bzsxr074bw5q6srvq6z6hi61rzlxdw7pah6qf7hcz"; } - { name = "icicles-face.el"; sha256 = "1pvygqzmh6ag0zhfjn1vhdvlhxybwxzj22ah2pc0ls80dlywhi4l"; } - { name = "icicles-fn.el"; sha256 = "02vwa9dx9393d7kxrf443r1lj7y9ihkh25cmd418pwfgmw2yd5s7"; } - { name = "icicles-mac.el"; sha256 = "13nxgg9k5w39lga90jwn1c7v756dqlfln2qh312vfaxfjfijfv9r"; } - { name = "icicles-mcmd.el"; sha256 = "17d4zlf3r09wmarwyc1cbjv0pyklg4cdhwh3h643d4v8mhs5hnil"; } - { name = "icicles-mode.el"; sha256 = "1xfv8nryf5y2gygg02naawzm5qhrkba3h84g43518r1xc6rgbpp6"; } - { name = "icicles-opt.el"; sha256 = "154mgcd1ksnmlyb4ijy2njqq75i8cj4k47phplxsi648pzqnda77"; } - { name = "icicles-var.el"; sha256 = "0f94299q1z0va4v1s5ijpksaqlaz88ay1qbmlzq0i2wnxnsliys8"; } - ]; - - forAll = f: map f modules; -in -stdenv.mkDerivation rec { - version = "2019-02-22"; - pname = "icicles"; - - srcs = forAll ({name, sha256}: fetchurl { url = "https://www.emacswiki.org/emacs/download/${name}"; inherit sha256; }); - - buildInputs = [ emacs ]; - - unpackPhase = "for m in $srcs; do cp $m $(echo $m | cut -d- -f2-); done"; - - buildPhase = "emacs --batch -L . -f batch-byte-compile *.el"; - - installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${pname}-${version}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${pname}-${version}/"; - - meta = { - homepage = "https://www.emacswiki.org/emacs/Icicles"; - description = "Enhance Emacs minibuffer input with cycling and powerful completion"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = emacs.meta.platforms; - maintainers = with stdenv.lib.maintainers; [ scolobb ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/lib-requires/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/lib-requires/default.nix deleted file mode 100644 index 84dae10127..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/lib-requires/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ fetchurl, lib, melpaBuild }: - -melpaBuild { - pname = "lib-requires"; - version = "20170307.757"; - - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/lib-requires.el"; - sha256 = "04lrkdjrhsgg7vgvw1mkr9a5m9xlyvjvnj2aj6w453bgmnp1mbvv"; - name = "lib-requires.el"; - }; - - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/lib-requires"; - sha256 = "1g22jh56z8rnq0h80wj10gs38yig1rk9xmk3kmhmm5mm6b14iwdx"; - name = "lib-requires"; - }; - - meta = { - homepage = "https://melpa.org/#/lib-requires"; - license = lib.licenses.gpl2Plus; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/libgenerated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/libgenerated.nix index 57bccc6081..d0c8b4565f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/libgenerated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/libgenerated.nix @@ -61,8 +61,9 @@ in { pname = builtins.replaceStrings [ "@" ] [ "at" ] ename; broken = ! isNull error; in - lib.nameValuePair ename (if hasSource then ( - self.callPackage ({ melpaBuild, fetchurl, ... }@pkgargs: + if hasSource then + lib.nameValuePair ename ( + self.callPackage ({ melpaBuild, fetchurl, ... }@pkgargs: melpaBuild { inherit pname; ename = ename; @@ -85,6 +86,8 @@ in { }; } ) {} - ) else null); + ) + else + null; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix index f04319f23d..313a21995e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -65,11 +65,11 @@ }; }; + emacspeak = callPackage ./emacspeak {}; + ess-R-object-popup = callPackage ./ess-R-object-popup { }; - filesets-plus = callPackage ./filesets-plus { }; - font-lock-plus = callPackage ./font-lock-plus { }; ghc-mod = melpaBuild { @@ -109,17 +109,8 @@ }; }; - hexrgb = callPackage ./hexrgb { }; - - header2 = callPackage ./header2 { }; - helm-words = callPackage ./helm-words { }; - icicles = callPackage ./icicles { }; - - lib-requires = - callPackage ./lib-requires { }; - org-mac-link = callPackage ./org-mac-link { }; @@ -134,12 +125,8 @@ sv-kalender = callPackage ./sv-kalender { }; - thingatpt-plus = callPackage ./thingatpt-plus { }; - tramp = callPackage ./tramp { }; - yaoddmuse = callPackage ./yaoddmuse { }; - zeitgeist = callPackage ./zeitgeist { }; # From old emacsPackages (pre emacsPackagesNg) 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 f5c77bd09f..87da207960 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 @@ -42,7 +42,9 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac }: let inherit (import ./libgenerated.nix lib self) melpaDerivation; - super = lib.listToAttrs (map (melpaDerivation variant) (lib.importJSON archiveJson)); + super = lib.listToAttrs (builtins.filter (s: s != null) + (map (melpaDerivation variant) + (lib.importJSON archiveJson))); overrides = rec { shared = rec { @@ -105,6 +107,11 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + eopengrok = super.eopengrok.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + ess-R-data-view = super.ess-R-data-view.override { inherit (self.melpaPackages) ess ctable popup; }; @@ -164,36 +171,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac ivy-rtags = fix-rtags super.ivy-rtags; - mandoku = super.mandoku.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - - mandoku-tls = super.mandoku-tls.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - magit = super.magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); - magit-circleci = super.magit-circleci.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - - magit-diff-flycheck = super.magit-diff-flycheck.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - magit-find-file = super.magit-find-file.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = @@ -224,30 +207,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); - magit-p4 = super.magit-p4.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - - magit-patch-changelog = super.magit-patch-changelog.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - - magit-rbr = super.magit-rbr.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - - magit-reviewboard = super.magit-reviewboard.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - magit-stgit = super.magit-stgit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = @@ -314,12 +273,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); - kapacitor = super.kapacitor.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - kubernetes = super.kubernetes.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = @@ -388,10 +341,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # Map legacy renames from emacs2nix since code generation was ported to emacs lisp _0blayout = super."0blayout"; - _0xc = super."0xc"; - _2048-game = super."2048-game"; - _4clojure = super."4clojure"; - at = super."@"; desktop-plus = super."desktop+"; ghub-plus = super."ghub+"; git-gutter-plus = super."git-gutter+"; @@ -402,10 +351,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac markdown-mode-plus = super."markdown-mode+"; package-plus = super."package+"; rect-plus = super."rect+"; - term-plus = super."term+"; - term-plus-key-intercept = super."term+key-intercept"; - term-plus-mux = super."term+mux"; - xml-plus = super."xml+"; }; stable = shared // { @@ -478,14 +423,88 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac packageRequires = with self; [ evil highlight ]; }); + kapacitor = super.kapacitor.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + forge = super.forge.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + gerrit = super.gerrit.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + gerrit-download = super.gerrit-download.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + github-pullrequest = super.github-pullrequest.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + helm-rtags = fix-rtags super.helm-rtags; + jist = super.jist.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + mandoku = super.mandoku.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + mandoku-tls = super.mandoku-tls.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-p4 = super.magit-p4.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-rbr = super.magit-rbr.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-diff-flycheck = super.magit-diff-flycheck.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-reviewboard = super.magit-reviewboard.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-patch-changelog = super.magit-patch-changelog.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-circleci = super.magit-circleci.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + orgit = (super.orgit.overrideAttrs (attrs: { # searches for Git at build time @@ -534,6 +553,16 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # Legacy alias emacs-libvterm = unstable.vterm; + # Map legacy renames from emacs2nix since code generation was ported to emacs lisp + _0xc = super."0xc"; + _2048-game = super."2048-game"; + _4clojure = super."4clojure"; + at = super."@"; + term-plus = super."term+"; + term-plus-key-intercept = super."term+key-intercept"; + term-plus-mux = super."term+mux"; + xml-plus = super."xml+"; + w3m = super.w3m.override (args: { melpaBuild = drv: args.melpaBuild (drv // { prePatch = 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 b512d5f5c7..2224c44f9c 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,11 +31,11 @@ "url": "https://git.sr.ht/~zge/nullpointer-emacs", "unstable": { "version": [ - 20200313, - 1542 + 20200411, + 1227 ], - "commit": "1d29192a3c28ba088d93410bfcdd4bee0abb6610", - "sha256": "02kmfzkrl35y599w5yal5d7rjb3xi02zhvb8q0m3iw4mbm16sw28" + "commit": "59136313132c08ab5fddaa875f6abeb22916a04b", + "sha256": "0acdh1r28v6xcsh39r13xppzqb6m00jgxgsxl17779isw98w9a3y" }, "stable": { "version": [ @@ -67,17 +67,17 @@ }, { "ename": "2048-game", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "0z7x9bnyi3qlq7l0fskb61i6yr9gm7w7wplqd28wz8p1j5yw8aa0", - "fetcher": "bitbucket", - "repo": "zck/2048.el", + "commit": "d3828ad7599d13728b5571b882344c3ada434b85", + "sha256": "0i7g7fg21ndpfbdydij3fb683pqgd1sicb7x6rradbc8jpmcf5sq", + "fetcher": "hg", + "url": "https://hg.sr.ht/~zck/game-2048", "unstable": { "version": [ - 20151026, - 1933 + 20200417, + 259 ], - "commit": "ea6c3bce8ac1c17dae5ac711ae4e931c0495e455", - "sha256": "1p9qn9n8mfb4z62h1s94mlg0vshpzafbhsxgzvx78sqlf6bfc80l" + "commit": "aad4a590ea91f9a3256233b9b345e9159c6993f2", + "sha256": "1jd50m5w0g0yplzms4qvkxx16f7xsbm9h7sdrw1p130gbij252l3" } }, { @@ -960,8 +960,8 @@ "auto-complete", "yasnippet" ], - "commit": "7b8db219080b714a7b8ba452ddb82bd08f7db152", - "sha256": "1zm04hqy6dg57swk05qvl5idzb11camcdmh7lrh6mqsvrcsvym2q" + "commit": "6ca9baaafd3a3e429429986cc59097dcbfa7cda2", + "sha256": "0gj1w0ynd3nk84ac2l3anmcvm44p662scdy80zwp2xisfc0c301x" }, "stable": { "version": [ @@ -986,8 +986,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20200103, - 656 + 20200425, + 835 ], "deps": [ "dash", @@ -997,8 +997,8 @@ "s", "xcscope" ], - "commit": "7b8db219080b714a7b8ba452ddb82bd08f7db152", - "sha256": "1zm04hqy6dg57swk05qvl5idzb11camcdmh7lrh6mqsvrcsvym2q" + "commit": "6ca9baaafd3a3e429429986cc59097dcbfa7cda2", + "sha256": "0gj1w0ynd3nk84ac2l3anmcvm44p662scdy80zwp2xisfc0c301x" }, "stable": { "version": [ @@ -1064,8 +1064,8 @@ "auto-complete", "rtags" ], - "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", - "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" + "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7", + "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3" }, "stable": { "version": [ @@ -1212,11 +1212,11 @@ "repo": "tam17aki/ace-isearch", "unstable": { "version": [ - 20200205, - 1105 + 20200420, + 518 ], - "commit": "cb6d7306cb5d2d4d36cb3803c0eaf779d88c2666", - "sha256": "1lrgjz7a4s50shc74kx6k958i1ayv5pfncsrjb3n87bvrx9wq6g3" + "commit": "58e4f1ad5cbbd2f86d161881d3f3ded3a3db984c", + "sha256": "0mlswnyd89ir060kiinzlrh70mdy8nfm2zpwr9jj2p19hrslmc4r" }, "stable": { "version": [ @@ -1563,32 +1563,30 @@ "repo": "pauldub/activity-watch-mode", "unstable": { "version": [ - 20200130, - 805 + 20200416, + 637 ], "deps": [ "cl-lib", "json", - "projectile", "request" ], - "commit": "153d93eac0b9511dc00b50c2ba409c085b58602b", - "sha256": "18idfbdrk3b2y573g2ld5sqkb9j216ixik679qj7qdnwa2b7m2xx" + "commit": "9d591c5ec9a2b2c7b55a754dd37c7434b2ef9fdc", + "sha256": "0a1ylq0il5aca5y9acykaa47p8d9xb3jy4wgi1lpm60z06n4m99y" }, "stable": { "version": [ 1, - 1, - 1 + 3, + 0 ], "deps": [ "cl-lib", "json", - "projectile", "request" ], - "commit": "153d93eac0b9511dc00b50c2ba409c085b58602b", - "sha256": "18idfbdrk3b2y573g2ld5sqkb9j216ixik679qj7qdnwa2b7m2xx" + "commit": "9d591c5ec9a2b2c7b55a754dd37c7434b2ef9fdc", + "sha256": "0a1ylq0il5aca5y9acykaa47p8d9xb3jy4wgi1lpm60z06n4m99y" } }, { @@ -1819,14 +1817,14 @@ "repo": "Malabarba/aggressive-indent-mode", "unstable": { "version": [ - 20190828, - 1828 + 20200421, + 1149 ], "deps": [ "cl-lib" ], - "commit": "c28246ba09d53e32cd9d8cafb1830f50387d9985", - "sha256": "19qklr4wqy55cb2133qlnrhf9yggsf096l14glw4jwpvx3cn61dd" + "commit": "58348d29adf8d2f23da2798badd7f89ff59cd7cc", + "sha256": "1d9hi36ml449x7qqpvcgxqx0r88jpqf1pq9k38af66ny3vd6zwl6" }, "stable": { "version": [ @@ -1894,11 +1892,11 @@ "repo": "ralesi/ahk-mode", "unstable": { "version": [ - 20191221, - 2202 + 20200412, + 1832 ], - "commit": "377f79484cc43458f66c1ba5a61459b77e363591", - "sha256": "0vf9pg2yjldzm4nzvzw0w2cvrnxj4xpm3ymsnpzdd55mp7q3y1ag" + "commit": "729007b5f22a49f5187ff47fca18c0d674e73047", + "sha256": "0989iva0igmd3y61hihwnc7mhn11midimrnbpvq7d062iy7g4vaw" }, "stable": { "version": [ @@ -1942,11 +1940,11 @@ "repo": "skeeto/emacs-aio", "unstable": { "version": [ - 20190601, - 753 + 20200410, + 1409 ], - "commit": "0e8a18f1bbb5f7be0f88d8e02ef13494736d63bc", - "sha256": "1aikvka4s97p5s26vclrnamgj8agx1j8ls6q3x7mxf8mhpv4ghqz" + "commit": "9367005c44c42c46c8ca1e7d3f780731c7d123dd", + "sha256": "063avjlizpjc53myjzvkqsp64gkxwcc7w7shjdf1xgjb9b58pbc1" }, "stable": { "version": [ @@ -1965,14 +1963,14 @@ "repo": "AnthonyDiGirolamo/airline-themes", "unstable": { "version": [ - 20180411, - 406 + 20200408, + 2114 ], "deps": [ "powerline" ], - "commit": "8b528fbae0e557461315bed82883275d58df41f2", - "sha256": "1xydgf9w0i2anpmjhy8m0zv1hql4gb37i11xfn6xzwna572z1ml9" + "commit": "d81ec80d6fc36157c20015e9fd6b192cfc679035", + "sha256": "0h9iximw1n5pwfd8zfn1xx4dcrsvxcy8rmr2ng20kl8bflir3i6s" }, "stable": { "version": [ @@ -2242,14 +2240,14 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20200326, - 1553 + 20200411, + 520 ], "deps": [ "memoize" ], - "commit": "f6cbb51c152dd60be5718218600a4ec14d9fd6cc", - "sha256": "0a59m1vv0s7czsccfalqyyp3v4lhydn1wbvyxkzy8i9fsjqbyxsa" + "commit": "0b74fc361817e885580c3f3408079f949f5830e1", + "sha256": "0y7wgwkspa800pck4ijyzgp3nrg8xkky079k1ywz7p04jqvgxrpp" }, "stable": { "version": [ @@ -2272,14 +2270,14 @@ "repo": "jtbm37/all-the-icons-dired", "unstable": { "version": [ - 20200327, - 758 + 20200403, + 1018 ], "deps": [ "all-the-icons" ], - "commit": "816987d339630e43f77a5a64ef308e95d341dda7", - "sha256": "01wgxdw222pz2sv7x9jwlislkasaw01bkq1nkpdp4jwl816aza8l" + "commit": "fc2dfa1e9eb8bf1c402a675e7089638d702a27a5", + "sha256": "0zhyhz4lhx0d8wwh1xxxf7ck4s621fk9757ql2ypxbr4iqh7sjlp" } }, { @@ -2531,15 +2529,15 @@ "repo": "zwild/ammonite-term-repl", "unstable": { "version": [ - 20190618, - 1517 + 20200416, + 559 ], "deps": [ "s", "scala-mode" ], - "commit": "9b3fe36654f03f6ab461bbec413f9ea014829a49", - "sha256": "09n9b1zkhaq0ikbgklnlxpgyyjf8hs9f7dcpgx5jjwi4pj0wzvi9" + "commit": "b552fe21977e005c1c460bf6607557e67241a6b6", + "sha256": "0g6ldvzcm6arm6hxiz1y168mj73kipgbjzxciif2b4sd3z7wpnp6" } }, { @@ -2595,14 +2593,14 @@ "repo": "stardiviner/amread-mode", "unstable": { "version": [ - 20200322, - 843 + 20200404, + 1143 ], "deps": [ "cl-lib" ], - "commit": "76ebe8d56b4d19f2bf75f54479f0e7ecc9cbaac9", - "sha256": "09jmllb9an992mzgncxral8i7j532l8i80yvvqwaqwv9azwab5sd" + "commit": "a595828fcc2257f765139b576beb6c33b4fc3bce", + "sha256": "1mwlj48hjp59mcafia612qqzmqxh30k0jshzrnzsnwlfbbsdxjwj" } }, { @@ -2613,14 +2611,14 @@ "repo": "DarwinAwardWinner/amx", "unstable": { "version": [ - 20200215, - 1901 + 20200417, + 1513 ], "deps": [ "s" ], - "commit": "e512e74e8368f9b1cf83bee16dd2522f3b1dbeea", - "sha256": "08vx7rd36j4ls7a7i2vn7mf74vbzcyrzzv0wzqzyb8ihv4qhjc0g" + "commit": "7fb7b874291e0cdeb1f0acb18564a686ec86788d", + "sha256": "0yc2b814zcl3c6lgamrr63cl4r3ayzlyfqql8875fzflc541nnnc" }, "stable": { "version": [ @@ -2670,6 +2668,37 @@ "sha256": "1vydyyxd5n0pz0jlib3yvw8vnklp15nvyyj7qkm4wcyssi70q1rf" } }, + { + "ename": "anakondo", + "commit": "197ff9f72a46a5732495d97c6b0ecb526e6995f4", + "sha256": "14kypppdgvzj2plydcpd22b9wpkircr0nc6gs4rcw416h157l2bv", + "fetcher": "github", + "repo": "didibus/anakondo", + "unstable": { + "version": [ + 20200426, + 28 + ], + "deps": [ + "projectile" + ], + "commit": "50ca8b69e0e53e4163215f3fcc325620b4d5d5af", + "sha256": "1sy0hxrj1vffqcwl5l48hl9yq4qswwjfgcc4445lairfycd4l9m7" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "json", + "projectile" + ], + "commit": "6ba040e6af4466949dcad2b4a47069705f200322", + "sha256": "05j9x11hy8wzq1fbbal1y1wzkw6h98l9pp8q0qmarg0lb6hjk52x" + } + }, { "ename": "anaphora", "commit": "8505db1945071a15ba0f2bb74b58d4a6875ca7d6", @@ -2845,8 +2874,8 @@ "repo": "davidshepherd7/anki-mode", "unstable": { "version": [ - 20191020, - 1441 + 20200413, + 1019 ], "deps": [ "dash", @@ -2854,8 +2883,8 @@ "request", "s" ], - "commit": "8022fbab57c47581102af831b4405fc27f71db92", - "sha256": "1nyiqd3093dbcimljj09vidanki6nbrzknzdxw4rkbl2kd1wfvlf" + "commit": "fcbcfa7cd7fb5c282e1138322e61242942729e3d", + "sha256": "06ab3zdaz5wf30zbci7cav3dvvnknnbzq18zfzzfi4xjcsi0zkvr" }, "stable": { "version": [ @@ -2930,11 +2959,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20200317, - 1703 + 20200330, + 1640 ], - "commit": "44b378b16ad407c36e8cf728e671c17116d854b6", - "sha256": "1xhmgadi4maci25si3mf854d0ammz7w9l317r4m81v1gkdfvv8wi" + "commit": "f0a71bb14806c79f09cb6aacb5ef98a852ef66e2", + "sha256": "1v2rbrhqg4kipk4l901xzfdc4wm5fkvvx4j3l8mfp7nvc2x8gcbw" }, "stable": { "version": [ @@ -3206,11 +3235,11 @@ "repo": "emacsorphanage/anzu", "unstable": { "version": [ - 20200328, - 2019 + 20200331, + 1717 ], - "commit": "61cb32aa61f9bd088c519ea3cc96b81e241efed7", - "sha256": "1b2zjich6mvypycsrz5jkpv5mbaj77jka17vcc5ss2390dad92f8" + "commit": "3e34fb3df53c0c68e842fa179c327a7395d1901d", + "sha256": "10jgh1mg8bxmpgaspsmqksgf3cqw9glap84cb9sdirvicsmisbsd" }, "stable": { "version": [ @@ -3271,20 +3300,20 @@ "repo": "dieter-wilhelm/apdl-mode", "unstable": { "version": [ - 20200329, - 2024 + 20200417, + 857 ], - "commit": "af7764828555486a78727194a001193d03dc12f0", - "sha256": "1p5w7kzmmsc3ayh4rvmd0a9g9wchvddhr22dx3jl7dx42s3sig5m" + "commit": "2fcf73e0d522e88e99813c84ac1c07f8a83b1e77", + "sha256": "1kfzvgxf34a1wdiiwv4q6bix24avdiwkldxbypkpw57sbrarwiva" }, "stable": { "version": [ 20, - 3, + 4, 0 ], - "commit": "17bbc63239d2b791887c3d263fa7b4e8ea9d0ccb", - "sha256": "0g9nf0853c56w8vpzys4rxw6ki887ajr3h7cgqb295aa16bg65x7" + "commit": "03d4d55f5d44584d6de50033cdc1b1bc87db83a3", + "sha256": "0yv3l3j3syn2i4ff9rvsx7a2vp7mv7p9y08dzcvl6km1909adzc6" } }, { @@ -4632,14 +4661,14 @@ "repo": "rranelli/auto-package-update.el", "unstable": { "version": [ - 20180712, - 2045 + 20200421, + 309 ], "deps": [ "dash" ], - "commit": "55870d313fbe9db40b1a2b59dbc420ba66a9297e", - "sha256": "06hnr7id7w774adip0yffxh6c2xk27j2kch03r8y0v19mnfrvb39" + "commit": "cf7f7486ed699f2ed7cc8af950740aece0de6124", + "sha256": "14sq8p3qbhlfmpisanjxpginiibngmb84mjga97aq5sgpxy38wix" }, "stable": { "version": [ @@ -4790,7 +4819,7 @@ "deps": [ "f" ], - "commit": "bfad607be640bed3a107e36c91b091e136c1c9ec", + "commit": "22cd3dd6d3206cdab5c72792479a8f7f04a2b3e9", "sha256": "0nwnmqhfy4378p43a12bc32y4qqw349xjkrdh6x7fkdsd4wpf7f4" } }, @@ -4822,16 +4851,16 @@ "repo": "robert-zaremba/auto-virtualenvwrapper.el", "unstable": { "version": [ - 20191120, - 1159 + 20200416, + 1128 ], "deps": [ "cl-lib", "s", "virtualenvwrapper" ], - "commit": "6380e8986d593655021f7f884d0d21895d7e63ad", - "sha256": "18k7azy456l7qizn3xnpb2dkj58gfrxy5q77dwplgakyvkr13y8p" + "commit": "f33e8c40e53c247ee6a4fd90af8805a9806735a1", + "sha256": "0hxwlm364xq66rp8izv0x09r37pg9kiddik0xbss736fdlw0sx4z" } }, { @@ -4909,11 +4938,11 @@ "url": "https://git.sr.ht/~zge/autocrypt", "unstable": { "version": [ - 20200327, - 1958 + 20200330, + 2301 ], - "commit": "f970fb51c80d582dcc6682106388d6a870ef2c83", - "sha256": "0qfawvnjyc0rrvr5zhkq7ngllrf5h9z3wsi2a75s74545d6nyyjq" + "commit": "a16bf93ba833264b10d19abfa8fa684d9be32081", + "sha256": "119nii5qdds53cmwz3f8rl7f4k5l783h6k6ahizdawy4rf54xfz4" } }, { @@ -5125,14 +5154,14 @@ "repo": "abo-abo/avy", "unstable": { "version": [ - 20200311, - 1106 + 20200422, + 1153 ], "deps": [ "cl-lib" ], - "commit": "3bf83140fad4c28f2dc4c7107b9d8fef84d17cb9", - "sha256": "1zicf7xynvxdx0pvg0zshvllabmjprvprjgg54phcbqlilcrq0hk" + "commit": "509471bad0e8094b8639729ec39ca141fae7d4bd", + "sha256": "0kj4nbp8g22xyvjdy8vh54v6zgd4f3z6srrw5pd55gbczm5csnbj" }, "stable": { "version": [ @@ -5319,11 +5348,11 @@ "url": "https://bitbucket.org/pdo/axiom-environment", "unstable": { "version": [ - 20200109, - 2207 + 20200411, + 1031 ], - "commit": "2c5384b994266008a20558db4ffe0525e66c0f5f", - "sha256": "17f40w9r4whz0v007pp13w060jq87ag42p21hcj93c14py5s4g67" + "commit": "25932da0dc40c6877463cbf019b14ab05a6b0164", + "sha256": "1xbps0k4x982gh1a0pscpx4kayjjyykvm5pyj516wwkya7bac4a6" } }, { @@ -5569,20 +5598,20 @@ "url": "https://git.sr.ht/~zge/bang", "unstable": { "version": [ - 20200325, - 1053 + 20200414, + 1123 ], - "commit": "11e121aed7f5fe90700bd3f49d987bff0a796c2d", - "sha256": "0y6rdfhywjp0d4l39hjhlzzwp64wgd3xrvr80c2f6xbc74c6l5hk" + "commit": "1fb0162ffd2115080d4e1ddf65935277cf3c75db", + "sha256": "12nr5la6y5dnh46rfij3p1srgpwdc3fiaf4ckfx6f9kl0n1zyrls" }, "stable": { "version": [ 1, 0, - 1 + 2 ], - "commit": "87b5ad3c81ccf0f2435e3c26ad7f9a1d6191ddb9", - "sha256": "10cybpw6wks2p21g1cz9rr6chvhv1s7jasrnzbcgpg8vkzb3dj48" + "commit": "1fb0162ffd2115080d4e1ddf65935277cf3c75db", + "sha256": "12nr5la6y5dnh46rfij3p1srgpwdc3fiaf4ckfx6f9kl0n1zyrls" } }, { @@ -5661,11 +5690,11 @@ "repo": "belak/base16-emacs", "unstable": { "version": [ - 20191031, - 1607 + 20200414, + 2048 ], - "commit": "9eba6874c80ab429bf5cbf6c76bb0399d3d2a2cb", - "sha256": "0ag5fsr3377rz6xfa0b9j54r90zh0yiz98kpa27xzhky4f5jpdah" + "commit": "d68512c0856f57a19cd49d1034199836352c15a0", + "sha256": "1h98ra53i7hc7zi9yjc6p29f70r04hivdczhw4imds13akq6j034" }, "stable": { "version": [ @@ -5719,6 +5748,44 @@ "sha256": "0q6scyva1psyam7jzygqcr1wayf70vrp237hm01q5i9cin8j4j1z" } }, + { + "ename": "basic-ide", + "commit": "9aaac29f5711f93f9ba7c14e5a332888e8920a86", + "sha256": "1pvgbc3vxqm4l8qc43g7b4viz4ilw828k9qlmb6ynzmij5ykrfrq", + "fetcher": "gitlab", + "repo": "sasanidas/emacs-c64-basic-ide", + "unstable": { + "version": [ + 20200416, + 1953 + ], + "deps": [ + "basic-mode", + "company", + "dash", + "f", + "flycheck" + ], + "commit": "5d186623fb6805db71fe5b226df497e6b2904b96", + "sha256": "1v9mhvi1fqh4pni03y3qrlrzj2jrz2s9jc5g3jjpxll4zhsfr6w4" + }, + "stable": { + "version": [ + 0, + 0, + 3 + ], + "deps": [ + "basic-mode", + "company", + "dash", + "f", + "flycheck" + ], + "commit": "5bfd5f91b9f91e46158e0419c6bb5c350e7684a1", + "sha256": "0nb6dbk8aclkq7jki52y4lwgbxg61xh1598l08yfv2l1ykhgg0n0" + } + }, { "ename": "basic-mode", "commit": "71801bdc0720f150edeab6796487c753c6e7c3f5", @@ -5794,17 +5861,17 @@ }, { "ename": "bazel-mode", - "commit": "3945f7eba7d5f248cace11a7946262ac2500b01a", - "sha256": "10590pbpg6mwkcwlm01nxf0ypw694h1b57frvn5rnc53al87i586", + "commit": "10f3918c55426c8c4754ef0dfccf19300e516012", + "sha256": "1gylmwlhzg6kgj9936799ppahbhicrxn2zpbr3417qycib84nl8x", "fetcher": "github", - "repo": "codesuki/bazel-mode", + "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20191110, - 2228 + 20200424, + 1953 ], - "commit": "7798e33cba5db14eb2c06ddcbc4e8fa361eb679c", - "sha256": "0gjm8276qj3a5kmh2qg93yadjhc2gcny058zpxwr6sialq9p7iwz" + "commit": "668a44907f7b3ad0e6fd300e319fba5862780140", + "sha256": "13llvkl40pybi4f1chak3v4f58fwwqw1kn9ygmv6dmn2wg4ag2mp" }, "stable": { "version": [ @@ -6099,11 +6166,11 @@ "repo": "DamienCassou/beginend", "unstable": { "version": [ - 20200203, - 1035 + 20200415, + 1752 ], - "commit": "3ab68d77839060f5e85bbf9455846b68cc63ef00", - "sha256": "049r18sa4646rhp2cidpdnk09c87xxf52d6mffq82xphzsniqarz" + "commit": "bb51f7ee9229ff0b6ec5ba4a730f7360246fb9ea", + "sha256": "0l7lbmn6ljh8yv7ch2fax47mr7kxly5b5ps5vg61ra15nv8v5vfr" }, "stable": { "version": [ @@ -6177,6 +6244,21 @@ "sha256": "0j508n860dp4in1psnkcriqck6by1jvnscalyff5na8hx6xgyysm" } }, + { + "ename": "bencoding", + "commit": "a668dc6c90a3be1a51be7478e385b9ab395f6852", + "sha256": "1qjk71gkzqq07yy84i0bkyg2wh0jn4gvglcknpcia38dd80m8b7z", + "fetcher": "github", + "repo": "xuchunyang/bencoding.el", + "unstable": { + "version": [ + 20200331, + 1102 + ], + "commit": "f0af19511831f3ade590879e7d1636387682a8e7", + "sha256": "1sfj694a6yjc4qwkxn2yvnl8xp8rzrkdgnsaj8ncwdyaa50xgw78" + } + }, { "ename": "bento", "commit": "aad104fd26adb419c5da1e3472807244794e8949", @@ -6373,14 +6455,14 @@ "repo": "cpitclaudel/biblio.el", "unstable": { "version": [ - 20190624, - 1408 + 20200416, + 1407 ], "deps": [ "biblio-core" ], - "commit": "efeeab720cb8e3f95ddb4298d0cc62393cf237e9", - "sha256": "1ikp1899sn8v46ng561nfj7j7vg234l3n8l8xx3gg7yxp2l9g8ms" + "commit": "eb9baf1d2bf6a073d24ccb717025baa693e98f3e", + "sha256": "0s7wld8ikfyn2rz8zr4g3lj59b2g95mj1jnqw6xvmxys0ahnb0r5" }, "stable": { "version": [ @@ -6420,16 +6502,16 @@ "repo": "cpitclaudel/biblio.el", "unstable": { "version": [ - 20190624, - 1408 + 20200416, + 307 ], "deps": [ "dash", "let-alist", "seq" ], - "commit": "efeeab720cb8e3f95ddb4298d0cc62393cf237e9", - "sha256": "1ikp1899sn8v46ng561nfj7j7vg234l3n8l8xx3gg7yxp2l9g8ms" + "commit": "eb9baf1d2bf6a073d24ccb717025baa693e98f3e", + "sha256": "0s7wld8ikfyn2rz8zr4g3lj59b2g95mj1jnqw6xvmxys0ahnb0r5" }, "stable": { "version": [ @@ -6501,6 +6583,45 @@ "sha256": "0vcdi0q6rbs3qqlpccy9hdv82zrx61gdj3fn444qashk84s085vf" } }, + { + "ename": "bibtex-completion", + "commit": "873ae2af16e03c8e10494be3f0e7840eb27172a3", + "sha256": "06mg9fwp6jwr6fbnzh4z8am47bspcl8hv0icmdpc9lmzbcyfpg8f", + "fetcher": "github", + "repo": "tmalsburg/helm-bibtex", + "unstable": { + "version": [ + 20200417, + 1725 + ], + "deps": [ + "biblio", + "cl-lib", + "dash", + "f", + "parsebib", + "s" + ], + "commit": "631dc607e8f29f1a585adde01d6785af1fb35d12", + "sha256": "09l1h1z493dc7hp109sqs1lkkcaw0mh762p5cpda9xymr9hf6w31" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "deps": [ + "cl-lib", + "dash", + "f", + "parsebib", + "s" + ], + "commit": "d6a98ac6f28d2a6a05e203115211c98333d40aca", + "sha256": "0arhy051945lxjqg77b275ny9nsv60cqj0qfpmvd8xkc07lqfn23" + } + }, { "ename": "bibtex-utils", "commit": "5764b6a880e8143db66e9011cc1c2bf0bcd61082", @@ -6852,11 +6973,11 @@ "repo": "raxod502/blackout", "unstable": { "version": [ - 20200326, - 1640 + 20200404, + 1550 ], - "commit": "87498cc91916c2f41d28e93fd80102c42b93ccf6", - "sha256": "156mnqwcpv3zl5pklqvmayq5j76hm4jc3has4qydfygz8fhx1zhy" + "commit": "af37650d99bb5ae3ab05577a5bf99d5ff26b1e66", + "sha256": "18n1l6rwwfjrgaygm7nhrxg92fdd21aqkb38lc55lx3qhlrw1qwv" }, "stable": { "version": [ @@ -6926,11 +7047,11 @@ "repo": "Sodaware/blitzmax-mode", "unstable": { "version": [ - 20200211, - 2205 + 20200415, + 1529 ], - "commit": "4814c35007035f0e26e0fadc50fffc4ab6d298ad", - "sha256": "160jd2rn1lgwgnm1ygdcsz1z0yxg9f1ps9wxqkv30xnkbnnxq10c" + "commit": "5f67bb3c8e4baf1f6881cc998f9f031641a7b08a", + "sha256": "1hcx6b3ka0n6sbi9p0z2wqlsxk5d2pvkjawpcyh40b5f1r6dpfmc" }, "stable": { "version": [ @@ -7126,8 +7247,8 @@ "deps": [ "cl-lib" ], - "commit": "b5df3647f55359f8546dcfa991a351673a069a49", - "sha256": "1rfv036wzlrbqbki5i24871a9f2h6zk7yqd1lq6gnqrc4y7m477c" + "commit": "6c8fa1b4961e279ae63130902996c5f71a2e64e4", + "sha256": "0kph9898s2m086p8gj97bbzr7mba9y7hmyxh1z4mgpv5808zvd05" }, "stable": { "version": [ @@ -7504,8 +7625,8 @@ 20200321, 2126 ], - "commit": "51f2d43e08960aa65a67273101733636026790a6", - "sha256": "0dzgkpaqlrqfzsmb61idlrp91vs3lrcymbdd4k6ls58kdv75v1j8" + "commit": "3b34032bdde6a37b4566c45ce93cb38da21d4965", + "sha256": "16p4404mxqgl1zqdalnq3bvbhwv11wgfl42871lxv3nndcsd30gr" }, "stable": { "version": [ @@ -7620,6 +7741,21 @@ "sha256": "08qz9l0gb7fvknzkp67srhldzkk8cylnbn0qwkflxgcs6ndfk95y" } }, + { + "ename": "brutal-theme", + "commit": "e415b9a4d269cfee5ee2b0e58acb18804c2a8cb7", + "sha256": "1xjj2ssw3lbx21w6g4m6vqc471v8jgmgk0zw1z1hkmygg0xipgl3", + "fetcher": "github", + "repo": "topikettunen/brutal-emacs", + "unstable": { + "version": [ + 20200415, + 602 + ], + "commit": "ee63563b7cb07aeec342722ae684426cb0465a98", + "sha256": "1wx6771iv4psvlwhng0n09g0w3yml1pw3ga5lghjz9j6hba0bc6s" + } + }, { "ename": "brutalist-theme", "commit": "ec889956a5685c3a60003ad2bfa04b03b57aa8e8", @@ -7946,14 +8082,14 @@ }, { "ename": "bufler", - "commit": "b50d5939113ca9a8ad1ba606f3d3030f110a800b", - "sha256": "0y1gfpb99777sxizxvqyffsmbv6ib4zasi2dyrf8imf4z45r6adh", + "commit": "4ba5657f237eea9073a46a4127be5795be07c687", + "sha256": "1zxvkrgwk7v3404vcwyv5nag60ri72qqi5fkpwwmzc9cs2bckj20", "fetcher": "github", "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20200318, - 2005 + 20200409, + 1253 ], "deps": [ "dash", @@ -7962,16 +8098,23 @@ "magit-section", "pretty-hydra" ], - "commit": "39e756a23196d12792a3af4a06ab024d8235ee19", - "sha256": "1b9ddgdd7b6x6353f8s6cv97xqsmmka6vwmv68sq75104wr189w5" + "commit": "b2b260e4f9e8ba76bb8b4d71344c7b75e05ac44f", + "sha256": "0ww7z2xz185i97wa1rnmqwlx2mvwx69hhlyi5m3sm0nkyckb2hjs" }, "stable": { "version": [ 0, - 1 + 2 ], - "commit": "2eca0959657030c5853020da017fe98a19bba3f1", - "sha256": "0yqgaqz41sbfdbvjxf773p5m2qsr4mm22j2qgn3mp0z1r5dx67ai" + "deps": [ + "dash", + "dash-functional", + "f", + "magit-section", + "pretty-hydra" + ], + "commit": "d6c79f04b7d288174d8294fb30488b567586364d", + "sha256": "0l35ssjry15wqcxnr8rf5lrv856pgnm0k2d4d6ag14ypjx9nfhw3" } }, { @@ -8275,11 +8418,11 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20200308, - 2200 + 20200412, + 1148 ], - "commit": "b360e3501703d8829a7dfc2d141e8c7c32c9bcfe", - "sha256": "0b3xkykfw8888zdg5w45kzij0d547j67crpc62mizh0fnc5naqvr" + "commit": "a91f2820256a4e0c8636cc33a2ef8515a26d3f81", + "sha256": "0nhsxj48a9aqfmwqs4m65zh2g0cmvijz4m69cvx1bcia31jaabpx" }, "stable": { "version": [ @@ -8304,8 +8447,8 @@ "deps": [ "buttercup" ], - "commit": "400227a45164e4e849048d288a02ab8243d09cd2", - "sha256": "1z972i1pzg8bkrzzbjha802486mybqyh9bhbvfk2sr6nzhvx2w1k" + "commit": "3ae4f84813c9e04e03a6e703990ca998b62b6deb", + "sha256": "0ndxbh2jff6qryczawzbg580744h18z7grg82dpg7fv0rbxnyi3j" }, "stable": { "version": [ @@ -8559,6 +8702,25 @@ "sha256": "1a0qdiihyc5qwz5j68hnpfp0fx3qbzgvzflrbfv072r7ldxzfi57" } }, + { + "ename": "calc-at-point", + "commit": "9ab725281ae66c1b97875518614a0f6312ace3a8", + "sha256": "1yzb2gmmdrcckgq1kd1gcbnbqf65aia7nx4j2lgrh2n9dlp40d03", + "fetcher": "github", + "repo": "walseb/calc-at-point", + "unstable": { + "version": [ + 20200406, + 1618 + ], + "deps": [ + "dash", + "dash-functional" + ], + "commit": "11e40c8db9493ada71964b73069c6db529016492", + "sha256": "06dmm6b2xflkwgk5mysi3ycbi6yz5n0sci191a15nnzxg7vh1fbf" + } + }, { "ename": "calendar-norway", "commit": "c5d01230027d5cec9da2545a9ce9270a611f6567", @@ -8721,8 +8883,8 @@ "repo": "beacoder/call-graph", "unstable": { "version": [ - 20200211, - 240 + 20200402, + 910 ], "deps": [ "anaconda-mode", @@ -8731,8 +8893,8 @@ "ivy", "tree-mode" ], - "commit": "768a1b2169dca60a130204065dbc54bdff415b0f", - "sha256": "12f9wc3kp3pafip283yr8qd5s93nmcf84b07i72fv69nxxi4a41q" + "commit": "2f47dcb65ed8dc5393df846b4175a4872e254c05", + "sha256": "0xn8xk2x3ih22vlfjvnl6853ddpk57q70z9b0vwhjvwmi4idz7xp" }, "stable": { "version": [ @@ -9190,8 +9352,8 @@ 20200314, 1557 ], - "commit": "37593d191b255d8633231099c70b1b26b3da0d39", - "sha256": "02pn3pxawl6268sy981iqialzyj9zy9dz6ci9jrkvbc8gp9gcvwh" + "commit": "11d91b4cce988e15d7c5fc4345535c9d7a92d53b", + "sha256": "19fgk6m951q9swr958337a3jk9b4xgvswkc73al6wsdkigygmhji" } }, { @@ -9240,8 +9402,8 @@ 20200314, 1557 ], - "commit": "37593d191b255d8633231099c70b1b26b3da0d39", - "sha256": "02pn3pxawl6268sy981iqialzyj9zy9dz6ci9jrkvbc8gp9gcvwh" + "commit": "11d91b4cce988e15d7c5fc4345535c9d7a92d53b", + "sha256": "19fgk6m951q9swr958337a3jk9b4xgvswkc73al6wsdkigygmhji" } }, { @@ -9421,11 +9583,11 @@ "repo": "anler/centered-window-mode", "unstable": { "version": [ - 20171127, - 949 + 20200426, + 1053 ], - "commit": "24f7c5be9def20879f46659082d497e67b55d7af", - "sha256": "0387x0z2l0yvbhkvh3rf3h2ddk7bvwgkpvpngwhhsjbc4hh4k3hz" + "commit": "f50859941ab5c7cbeaee410f2d38716252b552ac", + "sha256": "1l7m3gfn7j1mxs0rj1pm5avknplw2f34dd2k24n5rldfm41pf8i8" } }, { @@ -9510,17 +9672,17 @@ 20171115, 2108 ], - "commit": "f09d88781a5557d4b2b7d039757cc5e9a7ddd275", - "sha256": "10zr6a3z7gzvqvn5fb4l7hg9wi5vhmkdln0c44gskmikdsm173x1" + "commit": "5d5692e7526eb228308f91c10761f22c69c8ea35", + "sha256": "1shwvgakkv9q9mlvzcsxnrj4zd1ld8nf7k8pw6zl6j3wg0sj5fd3" }, "stable": { "version": [ 3, 15, - 0 + 1 ], - "commit": "76bc1fad91478de7064380c31d333e1975cf8126", - "sha256": "1amjzy3v7rhc6djl1ldqnhpd4m3prh7lfyd5hyb9fp0v8jhyg3w2" + "commit": "e766ee2484f9a7609688ac1832ff2ca7528624c5", + "sha256": "18iv6s2g7gz2dmqhipn6ln6g4qngywcj7fm4gqwrph04bx5dfqac" } }, { @@ -10183,8 +10345,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20200328, - 1555 + 20200420, + 735 ], "deps": [ "clojure-mode", @@ -10195,8 +10357,8 @@ "sesman", "spinner" ], - "commit": "dfc13f9c199920522ee02feac1d5da1c0b578b6b", - "sha256": "12yifir74qicryl5v5gl80s5m2qvlb09ck6jywx20yin3jkw6l58" + "commit": "7f4d4e81816e64238370e028824e6389f02a38c8", + "sha256": "03rbanapb2rg9is91r6c549gx96va5gkpdqhlm0gqgph4jg4jvfi" }, "stable": { "version": [ @@ -10688,8 +10850,8 @@ 20200327, 2241 ], - "commit": "7ee3f9c52f70f80820a8c66fb6f796d6e01dd92d", - "sha256": "1vgk4ci5di0dxm2ql02g1h484nd6abqiv2xa7fh2d9rbkfh9px30" + "commit": "01b39044b9b65fa4ea7d3166f8b1ffab6f740362", + "sha256": "1g1awdcqzrnw1a6gl4n87a97lniyn0ck5a51l9n6jz2m8k3idmsg" }, "stable": { "version": [ @@ -10794,8 +10956,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20200229, - 1105 + 20200405, + 1419 ], "deps": [ "cider", @@ -10808,8 +10970,8 @@ "seq", "yasnippet" ], - "commit": "92d372393a031e5fa73ef926447afe72b574cb45", - "sha256": "0lnis1qwk1gyxgapl06d7ww1mlb9a8ahl8zwa7y2n3jrgfm25qp4" + "commit": "8259791e054382457b87d1f78061b5e3ce948907", + "sha256": "0vn32b8vhlp75vj4schy8blmiddc6dn92jl4f935yd4sg7pm04cj" }, "stable": { "version": [ @@ -10972,11 +11134,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20200326, - 1542 + 20200419, + 559 ], - "commit": "2f8f3ce4974a5290a99077fcc9b36f1c42309b55", - "sha256": "145wpnbv3g2l7i6nckcs7bcrv8fj28gzpz3n0dl8vqlw0qb7hmgr" + "commit": "da9f1ec717dac1194404b4a4562dba6bd9a4ee3a", + "sha256": "0v4q031rvy34llbxhksqlzf3ign4q5xcwf6b3fzblb9k5nz2b3hr" }, "stable": { "version": [ @@ -11002,8 +11164,8 @@ "deps": [ "clojure-mode" ], - "commit": "2f8f3ce4974a5290a99077fcc9b36f1c42309b55", - "sha256": "145wpnbv3g2l7i6nckcs7bcrv8fj28gzpz3n0dl8vqlw0qb7hmgr" + "commit": "da9f1ec717dac1194404b4a4562dba6bd9a4ee3a", + "sha256": "0v4q031rvy34llbxhksqlzf3ign4q5xcwf6b3fzblb9k5nz2b3hr" }, "stable": { "version": [ @@ -11305,17 +11467,17 @@ 20190710, 1319 ], - "commit": "887eb6b7680685ae9bc8697f30bf6406df2d318e", - "sha256": "1lcfn79fn3cn0sdhw5f50l8830w6lh0j7lhrz7la27sg4ag5rmg0" + "commit": "eadafe2ebc419414fba42a3fe28b534bb2fc7a93", + "sha256": "11yhjsg2y6mxpd674wkqfwzfm4qzrmbh0mywq7617brg6hk71kb9" }, "stable": { "version": [ 3, 17, - 0 + 1 ], - "commit": "e3185e3d1b92a95c18f22f70b3cef6944dd019eb", - "sha256": "1r8nnaisx10d5r3kzyfz4af9mwb5f0nzz8nmn3xvnr12rryg2bwl" + "commit": "bd580b7d568493a795a855c0710ba4ad88532485", + "sha256": "1ng8svdxwgjj4aq9f89lx18znrlhcjgl0brsfxwissf1z0539l9d" } }, { @@ -11768,8 +11930,8 @@ 20200315, 929 ], - "commit": "6c25e4f29e1c75dabd350e04c190e81f7bca3cc3", - "sha256": "0fi0w7mjardvblqwvii9grgfzd11mjr2c35vzbq5dx01ydfib387" + "commit": "40464198e7bf2121694a7e6d87588342140a84ff", + "sha256": "0fhr0rvfrb9fmbh9zgzxx2c2zl28v16hxmn9jx6k73nsfwpy498j" }, "stable": { "version": [ @@ -11815,11 +11977,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20200220, - 1500 + 20200419, + 156 ], - "commit": "437bdd7a96fee751c6f817aff0100dd44bb07b23", - "sha256": "0cjbl7m6a0mmiiidn7w7hcggc58l5503swfnasbzyd1pzdrnn15y" + "commit": "344b06ed3c139af717ebff59505fc66635678f6c", + "sha256": "00as07y5q71bscchbz3yzck4ljzbcd5x5ghzzajgz3pj484smz6z" }, "stable": { "version": [ @@ -11950,11 +12112,11 @@ "repo": "cyrus-and/comb", "unstable": { "version": [ - 20200114, - 1325 + 20200411, + 1040 ], - "commit": "bd8e11b8593bc48f81ce01c0657d5a7977cafdf6", - "sha256": "0ndz25x1l0rzn5j8xg9ql2s2lgin1893kzf722chyk8147qwb0i8" + "commit": "59e025c3afb867706b869ac4bf2623665eb99821", + "sha256": "16swixv88nbs6gscgzy5lizi66pw0c9fm03xpm1kinan8v2s9m3v" }, "stable": { "version": [ @@ -12246,11 +12408,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20200324, - 2145 + 20200425, + 118 ], - "commit": "61ddd9afb58879267bf947b152a68f3dbadb9259", - "sha256": "097xy8ar6dms4zn7ymxxgmhap096fs8nc5j3js5srzmv14rswm36" + "commit": "fdde3d112ba85d034f83f95deafa24fd13be36e4", + "sha256": "1krc5gxlkhr87hw5wlch1wfrjxdin8isg51f8m6kjy20jx57jalc" }, "stable": { "version": [ @@ -12270,8 +12432,8 @@ "repo": "pythonic-emacs/company-anaconda", "unstable": { "version": [ - 20200129, - 1830 + 20200404, + 1859 ], "deps": [ "anaconda-mode", @@ -12280,8 +12442,8 @@ "dash", "s" ], - "commit": "a31354ca8ea35c0b2c1f6bb2b1a02a6cfb5e564b", - "sha256": "05qaxb3qpz3bi6c88qspf50sh15hzc01354zhj0amd07bmqzhwfg" + "commit": "da1566db41a68809ef7f91ebf2de28118067c89b", + "sha256": "1x260p0fj33xg6hkrz9q9dqrpibp4yn2n9is3a6s4xxfb485rz0g" }, "stable": { "version": [ @@ -12388,8 +12550,8 @@ "axiom-environment", "company" ], - "commit": "2c5384b994266008a20558db4ffe0525e66c0f5f", - "sha256": "17f40w9r4whz0v007pp13w060jq87ag42p21hcj93c14py5s4g67" + "commit": "25932da0dc40c6877463cbf019b14ab05a6b0164", + "sha256": "1xbps0k4x982gh1a0pscpx4kayjjyykvm5pyj516wwkya7bac4a6" } }, { @@ -12528,14 +12690,14 @@ "repo": "redguardtoo/company-ctags", "unstable": { "version": [ - 20200209, - 47 + 20200407, + 803 ], "deps": [ "company" ], - "commit": "fa5a3f7b765fc0e42a378fa2293be4c2817fe04e", - "sha256": "1wgxmy1pwwc7mvgw9bx3vvaay1pirzghvpqs6d9mnx1wbzn1x29b" + "commit": "b159e45b38226e046cf6fb7d08a0cf864ebbf772", + "sha256": "0h0k06c9fabyz6akka1bpwkz69wzl7ajcm0p108xdf5lymc75v5h" }, "stable": { "version": [ @@ -12623,41 +12785,6 @@ "sha256": "0yvp3dwa9mwfyrqla27ycwyjad4bp1267bxv0chxcr4528hnygl3" } }, - { - "ename": "company-edbi", - "commit": "5d881ff0927d5bd7f8192f58927ceabb9bad4beb", - "sha256": "067ff1xdyqy4qzgk5pmqf4kksfjk1glkrslcj3rk4zmhcalwrfrm", - "fetcher": "github", - "repo": "proofit404/company-edbi", - "unstable": { - "version": [ - 20160221, - 1923 - ], - "deps": [ - "cl-lib", - "company", - "edbi", - "s" - ], - "commit": "ffaeff75d0457285d16d11db772881542a6026ad", - "sha256": "16v4wzb9sp9ryfhgl3rk108pqvam2v6rh6hl6008083g557nmhq1" - }, - "stable": { - "version": [ - 0, - 1 - ], - "deps": [ - "cl-lib", - "company", - "edbi", - "s" - ], - "commit": "08dc69ccfbcf10ca83f7075e9b735c6885cd7e11", - "sha256": "0n2hvrfbybsp57w6m9mm7ywjq30fwwx9bzc2rllfr06d2ms7naai" - } - }, { "ename": "company-emacs-eclim", "commit": "1e9d3075587fbd9ca188535fd945a7dc451c6d7e", @@ -12912,8 +13039,8 @@ "company", "go-mode" ], - "commit": "939b4a677f2f843ea13d9dd90206d57111f0ceb9", - "sha256": "1yfw8y6czkqgxpyfdxwvkcrsmwbca7l0lr4jqmnpmm5m5rylcwr9" + "commit": "4acdcbdea79de6b3dee1c637eca5cbea0fdbe37c", + "sha256": "0i1hc089gb6a4mcgg56vn5l0q96wrlza2n08l4349s3dc2j559fb" }, "stable": { "version": [ @@ -13192,8 +13319,8 @@ "company", "native-complete" ], - "commit": "11803df3706fb23d58e418a14ce981204a64e847", - "sha256": "0maljdxigd4fvrm7pv3ssyywl3c1zhfpqdymq933iig7d2hrwxm1" + "commit": "ccb5b52940a9374fbfe92947f0101e7254ba445d", + "sha256": "0p3qrl59qhczwysydsak66j7ixpykr3397xdvjj3hkmmcrsachic" } }, { @@ -13285,16 +13412,16 @@ "repo": "jethrokuan/company-org-roam", "unstable": { "version": [ - 20200329, - 609 + 20200403, + 614 ], "deps": [ "company", "dash", "org-roam" ], - "commit": "0d14bf56f53b1fcf14418d3e545785f4857b5f06", - "sha256": "0kjf3pqlb95m1z057sjkqmsi1qhh3d4snp29gk3fzz278bc7sl45" + "commit": "be645587aa51e764127dcbe49e70a13e618d4537", + "sha256": "0gk865wwkb9c6slfvm6sfq88c61s523bf52vi9rdq3gxghvqaaby" }, "stable": { "version": [ @@ -13325,8 +13452,8 @@ "cl-lib", "company" ], - "commit": "7b8db219080b714a7b8ba452ddb82bd08f7db152", - "sha256": "1zm04hqy6dg57swk05qvl5idzb11camcdmh7lrh6mqsvrcsvym2q" + "commit": "6ca9baaafd3a3e429429986cc59097dcbfa7cda2", + "sha256": "0gj1w0ynd3nk84ac2l3anmcvm44p662scdy80zwp2xisfc0c301x" }, "stable": { "version": [ @@ -13358,8 +13485,8 @@ "company", "phpactor" ], - "commit": "31fe2ea4dbd5c2f23efd6a4ec2ec881a4ced6b05", - "sha256": "0j52n0vs85q7zz5xfqw4rgrjjpr7mzfiqbzk7vwkcdmpnax608w5" + "commit": "860d7e8784b261ee71deba354d01c3038cd777ab", + "sha256": "1d3fijh11g70xhx3a47l75mrp64bvkk7hh9lg83nl30qhn2vrbn3" }, "stable": { "version": [ @@ -13423,15 +13550,15 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20200327, - 148 + 20200408, + 400 ], "deps": [ "company", "posframe" ], - "commit": "18b83d29dae75239e22ca73d91eb09ceca5e77c4", - "sha256": "0gb3y80qhk1xgdx0iglcj78wvnbxnaiyvfgg0bmfvhswjii80160" + "commit": "9b59cd679c4396cbfe8118a9dfa8a5acfe038ac6", + "sha256": "1z18libg2nplx8a8dcycdzm354gczqzg8r37agzz0jk1a7frxa7m" }, "stable": { "version": [ @@ -13455,27 +13582,27 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20191224, - 220 + 20200404, + 1550 ], "deps": [ "company", "prescient" ], - "commit": "a194852e8022762843052e58a9d0fbdaa1df0fe5", - "sha256": "0da4s32fza42vdiqhh7cdim08by5i4909q93ivxkmgrmqfgdvz0p" + "commit": "0f4a89bdec61395138d968a38d375e63ccfbed63", + "sha256": "0nnf4y49pl9lcs90y5z6f02g1xwk1jjrl0qs7gcv6kpn0vn8kn0h" }, "stable": { "version": [ 4, - 0 + 1 ], "deps": [ "company", "prescient" ], - "commit": "ad9fbe8a17fe74b27a39bcc034f3da1865663387", - "sha256": "008hxy1vasnyz36wwg44gikpi80ng75hj85nrswk60b7z7cznbmr" + "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0", + "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3" } }, { @@ -13651,8 +13778,8 @@ "company", "rtags" ], - "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", - "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" + "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7", + "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3" }, "stable": { "version": [ @@ -13717,8 +13844,8 @@ "company", "solidity-mode" ], - "commit": "b190993dcb8376e80fb1d9b71f3ed6170bd2a341", - "sha256": "0s5xk38k3mc1d40dszlcgfpn5rvb7nsnnpmgr3c0bwqa4xh6yqrg" + "commit": "022b3159832384a7dcdc2168809e698600826047", + "sha256": "144w84abffbrbb4wflgipndaasx82axf36xm373ybdih4131mi69" }, "stable": { "version": [ @@ -13873,46 +14000,6 @@ "sha256": "1g5qv1fg22x1nkj696n12ixa2akgzivdc5q7yzy502kqjg67mkx5" } }, - { - "ename": "company-tern", - "commit": "acc9b816796b9f142c53f90593952b43c962d2d8", - "sha256": "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh", - "fetcher": "github", - "repo": "proofit404/company-tern", - "unstable": { - "version": [ - 20161004, - 1847 - ], - "deps": [ - "cl-lib", - "company", - "dash", - "dash-functional", - "s", - "tern" - ], - "commit": "10ac058b065ae73c1f30e9fb7d969dd1a79387be", - "sha256": "1pjyiy95axv92yxzks4ac871vcqxjnp7n2116nkdrdzzpmlb1x9h" - }, - "stable": { - "version": [ - 0, - 3, - 0 - ], - "deps": [ - "cl-lib", - "company", - "dash", - "dash-functional", - "s", - "tern" - ], - "commit": "b20b3e490bf277c8480712210e3c92ea489859ef", - "sha256": "1l4b54rqwsb32r8zwwrag7s35zc3kpviafdrqkq8r1nyshg2yccm" - } - }, { "ename": "company-terraform", "commit": "1d9732da975dcf59d3b311b19e20abbb29c33656", @@ -13952,15 +14039,15 @@ "repo": "Wilfred/company-try-hard", "unstable": { "version": [ - 20191106, - 2105 + 20200417, + 1603 ], "deps": [ "company", "dash" ], - "commit": "8a417255b4da9f2e3889f6024755290dcc5884d1", - "sha256": "14b3sad9a7dr8j7xhnspk905ybidqz8h4hx2rw4bgl25imhmlysz" + "commit": "2b41136b5ed6e02032d99bcdb0599ecf00394fa5", + "sha256": "07c4vsrixqw6d6d2mqm6xzzzc9l9mgwgabcc6jlnw78cxij1wrsx" } }, { @@ -14074,14 +14161,14 @@ }, { "ename": "competitive-programming-snippets", - "commit": "0100042ee1356dd709d8bbeec4539ddc64317baa", - "sha256": "1mdkv2pn83mgj7yy4xf8nkm9bvxldiy7gdx4bpv36b9xw5zz6q6r", + "commit": "9a6d2467c37bf095c0a1e4605744474999ce04e2", + "sha256": "1yblnm1ar466fgwvhxybqv8sp2hn40p10p6hhnn9gi1xj9napam7", "fetcher": "github", "repo": "sei40kr/competitive-programming-snippets", "unstable": { "version": [ - 20200122, - 1558 + 20200213, + 1521 ], "deps": [ "yasnippet" @@ -14102,6 +14189,21 @@ "sha256": "07l495vv3by6r62i48jbfyr5pp1p6896cz25gkc7p3xqwrhi2min" } }, + { + "ename": "completions-frame", + "commit": "dcbb088900f76c05b04ffe25d32e43a477a0556f", + "sha256": "1ng5wmk1vp6yqrcyld23mrs8xdfa010l9acjy1vgkcsxjp3nmv3x", + "fetcher": "github", + "repo": "muffinmad/emacs-completions-frame", + "unstable": { + "version": [ + 20200419, + 2027 + ], + "commit": "2e726a497605752d7d57aaf0adf53178c1e9f7e4", + "sha256": "0f4vaq84si57p7y0zl0l93vixv0ld1srrxvav40ipil3p9fm1yig" + } + }, { "ename": "composable", "commit": "1fc0f076198e4be46a33a26eea9f2d273dda12b8", @@ -14221,8 +14323,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20200120, - 1721 + 20200420, + 1418 ], "deps": [ "dash", @@ -14230,8 +14332,8 @@ "pythonic", "s" ], - "commit": "335474e409774e31125fe320a4a54c8d92bf5fa2", - "sha256": "10aadbvsg6qy11nfkmc5rvivjvyak6501srmjl6lvzxsw8q79fj4" + "commit": "f187948f7bda856befb54a08473c9aae3e595c8a", + "sha256": "02i3nq35cq0vlrg3xppyldi7s0zimvlf8j07xdn6pxm5ilrlmsl6" }, "stable": { "version": [ @@ -14654,6 +14756,30 @@ "sha256": "00055gzv032xxzqm1hffipljy8fzgsm58cbv8dzajh035jvdgpv7" } }, + { + "ename": "cort", + "commit": "1c99109a816303b1a14ff15e7a8300c73910e3a7", + "sha256": "1r1plngky2djgpbja0xr2j7hgj79d0l2jcjq4kj97q6874r4fswq", + "fetcher": "github", + "repo": "conao3/cort.el", + "unstable": { + "version": [ + 20200330, + 1641 + ], + "commit": "eb94d2a5b3a048a495fb0218b2df9021f8c864f4", + "sha256": "0rc1jfqkc05ml41cp8dc8akrxx3ifziyjy1w4vvgpbb5z49m83ky" + }, + "stable": { + "version": [ + 3, + 0, + 5 + ], + "commit": "1df178e296feaf4465967567b1cfdce1dda5a09b", + "sha256": "0y23w34dcifk6cxw2kcgwydqdc8hn0mj5129z560fm6iwxd6cgkx" + } + }, { "ename": "cosmo", "commit": "3ab914dfefcddf6ecd65261bc11bd3eb12929c79", @@ -14677,14 +14803,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200319, - 1329 + 20200422, + 1208 ], "deps": [ "swiper" ], - "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787", - "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q" + "commit": "47ec37b395cc1b304bbf91e804f138634544a9df", + "sha256": "05k2qjj4z8vljfppkphfhw67wvb5ij4nz4m158v89lx87y0phh74" }, "stable": { "version": [ @@ -14757,15 +14883,15 @@ "repo": "hlissner/emacs-counsel-css", "unstable": { "version": [ - 20191031, - 345 + 20200331, + 632 ], "deps": [ "cl-lib", "counsel" ], - "commit": "61a38c9d50fa9d1e38b2fa550d07130eb9322524", - "sha256": "0c8assn7dc8dhzyzk37x7y8s266pvr6hs0vh13y65z0sgxk59i2w" + "commit": "6427dfcbda0d2bbd81db03f9d6b56b06c260ac02", + "sha256": "1g8gz5mz2qclia64qmgw02h5ivywgn46d6djlr7vcdfyp774cf64" }, "stable": { "version": [ @@ -14824,14 +14950,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20200320, - 19 + 20200413, + 213 ], "deps": [ "counsel" ], - "commit": "0abd7a1b6abaf59a01774ca05f51cc0c6ce7f287", - "sha256": "0kfj3b8gx95pa7yaps25javmag2bnlz5zn802wf0x81np4d3hgjs" + "commit": "65298d82468a2221f154de3606ead9a7a7806fa0", + "sha256": "0zk4axx64s9bmwfnhi2yhcfd9bkxxv3l5q33ak6l6q5dmyprp8ay" }, "stable": { "version": [ @@ -15323,11 +15449,11 @@ "url": "https://git.sr.ht/~zge/cpp-capf", "unstable": { "version": [ - 20190723, - 1158 + 20200405, + 8 ], - "commit": "ca6d50f3853e1226a0ccad435aa8fbd7852c2149", - "sha256": "19vhayxy3ha3kkncz8vy5as2pdc17k4mycqszi2g0wywllnirhvv" + "commit": "0a4fd531e9e47369ff29d9f8583efd0bacd6bc50", + "sha256": "0q6kgh2mdx3pr8ywr3fhn96chvrf6zx6xxs2lyfviwmfq2c3pyph" }, "stable": { "version": [ @@ -15362,6 +15488,21 @@ "sha256": "1rk0bwdvfrp24z69flh7jg3c8vgvwk6vciixmmmldnrlwhpnbh6i" } }, + { + "ename": "cpu-sos", + "commit": "612eddcec84562a1f060c9eb5a63f77ce88da7ea", + "sha256": "1mjbcyz8j1d0l6jnfa3bk4ba5dbb8xih56rvfri61caqmy73s6pz", + "fetcher": "github", + "repo": "oitofelix/cpu-sos", + "unstable": { + "version": [ + 20200409, + 2356 + ], + "commit": "1594b76d4ad3a6e3c471d82da366226d156e6226", + "sha256": "1pqw1gilj3m35fqaj5j51ggmxzwhdiks0k36hxmw3ihr63am0j5f" + } + }, { "ename": "cql-mode", "commit": "1084dd0ec0f2e8fe6fa8e97b322833c14e8e59d1", @@ -15581,11 +15722,11 @@ "repo": "emacs-pe/crontab-mode", "unstable": { "version": [ - 20190827, - 1300 + 20200330, + 920 ], - "commit": "9acbb426c6bfb832e1e83f10fe01a8829452eb7e", - "sha256": "04wyngg5n5dr4ninfljl3n0gqx0pik5jbj6ny79bchrnxlh22f3k" + "commit": "9625228cbfce29ac3b443c6eff893ff828268f7d", + "sha256": "01s32ivn1fdqq99ms3s6a73hrqdc2r5khrg4jv3sniviql2k3i31" } }, { @@ -15707,11 +15848,11 @@ "repo": "josteink/csharp-mode", "unstable": { "version": [ - 20191126, - 1928 + 20200402, + 919 ], - "commit": "57bd21bda4edc16671a85c7d6d51484e40a6e640", - "sha256": "0chl9lzxn1mq59vy5lsim2iiy2hl20rg3d7ri41ljksjcfz9ki6v" + "commit": "31124dba6833a4de144ca508edb90d5adfeec209", + "sha256": "0jrj2ayna8bzhi441hhszhch3na08iciqnd7fsqrm8xbwlrq7l2x" }, "stable": { "version": [ @@ -15731,8 +15872,8 @@ "repo": "hlolli/csound-mode", "unstable": { "version": [ - 20200326, - 2154 + 20200402, + 1509 ], "deps": [ "dash", @@ -15740,8 +15881,8 @@ "multi", "shut-up" ], - "commit": "f278a0e13ecd6b00cd7b056a2e36021322bed8ea", - "sha256": "1axib3rgy7kdyprpp8cs94rc9yr34faii4n9f70jjkk6x7pr398m" + "commit": "81bec1a71934a56f677f442e2c22fb6336b366c4", + "sha256": "1cxg2c8sz76b3ml8blb4f268xl6ql959p2hi5i4llil4fggw6df2" }, "stable": { "version": [ @@ -15918,6 +16059,29 @@ "sha256": "1d89gxyzv0z0nk7v1aa4qa0xfms2g2dsrr07cw0d99xsnyxfky31" } }, + { + "ename": "ctrlf", + "commit": "46073c430c271aa1971e27948e7f6d4b65b3d533", + "sha256": "01d2zv7x588r55namcda58l21lg5sbwcn1ycnvg5md69pv5cg461", + "fetcher": "github", + "repo": "raxod502/ctrlf", + "unstable": { + "version": [ + 20200417, + 1549 + ], + "commit": "97b59f1974ddcfcd9eedcf4c2d286a38f5200273", + "sha256": "1axi9wdpr82ghsbjxz1k73v82kkp9g63ahgqy38w6560f40m32dr" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "41eecedf44f2235ce13e021906c4ce92deddefdc", + "sha256": "10gnhafas54zj3z9173h1g7b519ac4i26afclmw3w1pk6qyyb03z" + } + }, { "ename": "ctune", "commit": "927ecd888bc00abff13f5fc335a88dffc2bf6779", @@ -16266,8 +16430,8 @@ 20190111, 2150 ], - "commit": "6a30fecff5decdf20029763afea6183de3177dc3", - "sha256": "1qdxr4wdl7mmbahsdhybq4qmc6ahf2h342gf6y99y6jkj8akvjy3" + "commit": "f09e61ab721ad51526ec7a6798fc01d8346f539d", + "sha256": "0l6yzbshqkkbb4fhvnakrilbyc441va6r3yhczksaz0rxlyminlw" }, "stable": { "version": [ @@ -16364,11 +16528,11 @@ "repo": "cbowdon/daemons.el", "unstable": { "version": [ - 20200129, - 929 + 20200421, + 912 ], - "commit": "9320c6af524f923f20aa95c1a48b7ae41c3005a8", - "sha256": "0wlv3vjhw6v6q5br4bassw34k4kai6nrw10av4y6nkvw58i5b3h7" + "commit": "a26155d04cec399ffe25b88f71cbfa4ada784569", + "sha256": "0bvfcrr3blyz0861ysfw2qbfh1iq8nfdh1kw9wz4m7g6big27qgd" }, "stable": { "version": [ @@ -16433,8 +16597,8 @@ "repo": "jyp/dante", "unstable": { "version": [ - 20200131, - 1211 + 20200416, + 1217 ], "deps": [ "company", @@ -16445,8 +16609,8 @@ "lcr", "s" ], - "commit": "4955bc7363e250d22579bc34b0b4ab6611c0766c", - "sha256": "06xagrjl00iwvaf0cli3dhhvvn4x7ysvkir4120lwc9ispzc077m" + "commit": "7411904bfbde25cdb986e001ec682593dcb7c5e3", + "sha256": "0dhkp9g1cc1vlfk1fjncl3x3s7zd9a633ya85pjyxl70kky2qhnz" }, "stable": { "version": [ @@ -16474,8 +16638,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20200325, - 546 + 20200425, + 606 ], "deps": [ "bui", @@ -16486,8 +16650,8 @@ "lsp-treemacs", "s" ], - "commit": "e2086fc9fbde4413f779b314bd5a93f808a3fb78", - "sha256": "1ig4s5aimd7zfyaa4fgb584lpzmi38kbfqc4jncifh0i69mi6x9k" + "commit": "43c672747e537620f5385ec4bd86c393b16d84dd", + "sha256": "0mqhzwk0l32k94msxq69wlcwxn8gc34cqbgxs7z1x9nddjirqmb1" }, "stable": { "version": [ @@ -17144,6 +17308,37 @@ "sha256": "15r0qwjkl33p8kh2k5kxz9wnbkv1k470b1h0i6svvljkx9ynk68a" } }, + { + "ename": "dbc", + "commit": "0f82920ec0b8544c7008a57a412fe3ba15fc5e0f", + "sha256": "0xba153ky52iiyjndryzm6n3v019d0710r4k91chvv8gvyb4jr9z", + "fetcher": "gitlab", + "repo": "matsievskiysv/display-buffer-control", + "unstable": { + "version": [ + 20200331, + 1826 + ], + "deps": [ + "cl-lib", + "ht" + ], + "commit": "17c6640a409424ec32fdb6bfd6065562e726bf1f", + "sha256": "18mamp8j3lmmcpcyfrwrqppxvyx7zirn30rwp4wndczpyapkwv4n" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "cl-lib", + "ht" + ], + "commit": "5123477396a562fae350a89fbed79464cc498bc9", + "sha256": "0xd94cpqpv0yw70ajrvs69ygds62m40fk0m4s59zvdn5qs7ivj4k" + } + }, { "ename": "ddskk", "commit": "6eccccb79881eaa04af3ed6395cd2ab981d9c894", @@ -17152,15 +17347,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20200325, - 1337 + 20200403, + 1308 ], "deps": [ "ccc", "cdb" ], - "commit": "37593d191b255d8633231099c70b1b26b3da0d39", - "sha256": "02pn3pxawl6268sy981iqialzyj9zy9dz6ci9jrkvbc8gp9gcvwh" + "commit": "11d91b4cce988e15d7c5fc4345535c9d7a92d53b", + "sha256": "19fgk6m951q9swr958337a3jk9b4xgvswkc73al6wsdkigygmhji" } }, { @@ -17202,16 +17397,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20200202, - 1520 + 20200411, + 652 ], "deps": [ "dash", "s", "spinner" ], - "commit": "3ec95398d09719a9dbdc3a67d29d22ca224516cf", - "sha256": "0rxzm30md5s87s6j1aqgjxa9kb637v11b7q194l8zzhf457ky6la" + "commit": "bdcdf138cd71b0a5a80ca64b3bd68b7355084757", + "sha256": "1f0gbl2s6h945h1d4pg6cms3w2jwppqiddy3ja9b02ckcld1c227" }, "stable": { "version": [ @@ -17235,11 +17430,11 @@ "url": "https://salsa.debian.org/emacsen-team/debian-el.git", "unstable": { "version": [ - 20181020, - 1513 + 20200401, + 1622 ], - "commit": "8ff1f5d73d5d56bee65e45e9d8ac4e75aa8b8e4c", - "sha256": "0hqxl0gi9csp2zfc65s01c3i6himh38fia46cn68i3hh5d6kb6qx" + "commit": "d7117ab18b15f449f194cd7d91ff22e55fcfa817", + "sha256": "09i2n4990d5ra4zqswzv8sjk4psd9lf71xdsgnfbr88pdv1q8bhf" }, "stable": { "version": [ @@ -17471,11 +17666,11 @@ "repo": "abo-abo/define-word", "unstable": { "version": [ - 20191031, - 1736 + 20200417, + 844 ], - "commit": "d8c76d503be3d561221631067ec5274e7c147248", - "sha256": "18yy7gw8x3y9sk3v7xpd59p425qc36dymj0wgk6mzarfq5rhv79h" + "commit": "08c71b1ff4fd07bf0c78d1fcf77efeaafc8f7443", + "sha256": "053kyg2jqayphdkm7s8fz8yl97yspib6qszcajyr77m6n7j4i764" }, "stable": { "version": [ @@ -17806,11 +18001,11 @@ "repo": "raxod502/diary-manager", "unstable": { "version": [ - 20190702, - 2148 + 20200404, + 1549 ], - "commit": "964dd7bf60a8e8abc880ef5b73319bc65d5ea5e3", - "sha256": "1w1hffypsx41n63yrpz0lcyzia4x4lis0sja8gksik7dvwwkyhwb" + "commit": "6d9b86faecb2ab7c2e1eb90dcf7bffdf70804470", + "sha256": "05v449px4nq565w9kcg2bbz1j27qlgiw17z4drgriz2qf2m50v18" }, "stable": { "version": [ @@ -17849,15 +18044,15 @@ "repo": "cqql/dictcc.el", "unstable": { "version": [ - 20200209, - 1810 + 20200421, + 1422 ], "deps": [ "cl-lib", "ivy" ], - "commit": "e07ebfc577b904b3387705a91395ac873e42c727", - "sha256": "0wi3iz31qizd3xsys1pyfr2zfn03x27lrja5s8170s27zqkwm56j" + "commit": "3950011197ba81f27cc82b4e6075c9100945f936", + "sha256": "0xmmkzsg48q6awhkbi5naqjm0yjdnwb437k17razgd6y99vyh0ns" }, "stable": { "version": [ @@ -17936,11 +18131,11 @@ "repo": "ideasman42/emacs-diff-at-point", "unstable": { "version": [ - 20200106, - 441 + 20200413, + 200 ], - "commit": "c26027d701f2a1512e0a2b18e4b34f02e9140ee0", - "sha256": "1c5pibjmpkw7fi26vnsvv5yjg4y851jccwymzwa06gbxb3jf5ggc" + "commit": "5b06de513297a80cf3a2081b8ee0914e90da810b", + "sha256": "1ib8297alpsvcxl9c56n2bjh5j4m49k92nz1mgdybiqwg3z4is21" } }, { @@ -17951,14 +18146,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20200329, - 1724 + 20200406, + 37 ], "deps": [ "cl-lib" ], - "commit": "7fce94f7d5eebea06aed153b0f574567182c8d2b", - "sha256": "11m9ab7ymvbsxgddwxwcr8mrll3m67lnib8bpmb9vmh16zb2mzcl" + "commit": "a625033fb1dde83f6e4c2fc21f632b22ec34b609", + "sha256": "01m0aknqn0pgb46877kbz9n1nqmlamrlm58g2q894imbhybgfpan" }, "stable": { "version": [ @@ -18627,11 +18822,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20200318, - 1715 + 20200403, + 308 ], - "commit": "1f73233065ddb077adb7019ae33efd8acce9b561", - "sha256": "1sc0y7ffvyq5785gcmlgkkblz1nyyx4a5h1m1bi50zkqpna1pxbf" + "commit": "6e5d26ca859f7af624351ba2af6b1be83982053b", + "sha256": "0xy8c90d6lv21cp5p2xzqqv5da2m3mry8bdkz54rknv2v9in8g0l" } }, { @@ -18831,14 +19026,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20200226, - 333 + 20200409, + 801 ], "deps": [ "dired-subtree" ], - "commit": "5f88a4570eae9645be06ff22542f110aeb70dd7d", - "sha256": "0l1wr7g4lfqmvhw3vir6fmwxmid9sasxlf5pxxvh0z8kps53f0cn" + "commit": "6e569c851418890c21fd37d03a62f85343aa0900", + "sha256": "0jxljpmzncbh9xb22y4xr9bzcxwijy68pn8chqsvqmivss5py7n9" }, "stable": { "version": [ @@ -18928,11 +19123,11 @@ "repo": "renard/dired-toggle-sudo", "unstable": { "version": [ - 20151109, - 1006 + 20200401, + 1353 ], - "commit": "02449dbda4e168f99fe5352c9628df5d39e11483", - "sha256": "0ajj8d6k5in2hclcrqckinfh80ylddplva0ryfbkzsjkfq167cv2" + "commit": "13bbe52c54893f5aa3e56228450ffdd0c9e1d169", + "sha256": "1fw1pb1z6krqd1pfxxhr6rrfr9ckkcb0zsjzbjk0i2i1q5cg6car" }, "stable": { "version": [ @@ -19754,8 +19949,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20200218, - 1257 + 20200421, + 822 ], "deps": [ "dash", @@ -19765,8 +19960,8 @@ "tablist", "transient" ], - "commit": "a2092b3b170214587127b6c05f386504cae6981b", - "sha256": "1q3fgh3sjly62h86yvjqhr7j1yyrsfygk4rqkx0p7a052s2qvqi7" + "commit": "08745207332d940130a2357eb5c5e00fd88bd6af", + "sha256": "15fgcmld7z83b89jkwi0a5i9lls43kpbqav0lhfdyq3m941whzs4" }, "stable": { "version": [ @@ -19925,11 +20120,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20200329, - 1548 + 20200413, + 157 ], - "commit": "e788ec71dafdd57a5c0eb3633794abbe3355f0c9", - "sha256": "19zqhcjpb23h4nn9h22jn1gh7a53y5v8f52809scl3vif0ch9b2h" + "commit": "c237e72e0bc53a67a83c05d9c1bb28e80fd15c1e", + "sha256": "0bh7yckr1cfampc1kmigbg98b6kwvnjgq8143lqlj1hmg0hw5cb6" } }, { @@ -20044,30 +20239,30 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20200322, - 636 + 20200425, + 553 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "0642f7107102e88fb8818da02e6612c6855537ff", - "sha256": "1wmsrvzbvixzps6zp1d2r5fn7gkfwvjz2ksjqd6a8sd4swdx9ggk" + "commit": "c177959bbfa7fa6f199b1145c6986e55f462f1c1", + "sha256": "0iclkfryfj72c5377rydsxh090maq6i0sxj90cm6dalyazd7rl4k" }, "stable": { "version": [ - 2, - 9, - 2 + 3, + 0, + 0 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "e6d690bae01cb68e7171857fe07ac914d7a19f4b", - "sha256": "0k5rppzpycl1aggg6cvwvgxylgvjbxksvdah8fkrrmx3dwcr2y3p" + "commit": "b44955841a301f4930b054e912fa4c1a700d426d", + "sha256": "08m75rl5i812pa87zcsjvb4mm3jjhpwzgx9mf2m7sxj807airz5d" } }, { @@ -20078,14 +20273,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20200327, - 1325 + 20200331, + 1901 ], "deps": [ "cl-lib" ], - "commit": "bbb3725af973485424f6ca716b648923defa176c", - "sha256": "0pybwshmcfj0ll2hjcdrqdqbf6crn10pjlkbiyf3k23w5ayaql49" + "commit": "8d5ddbbb72752fdd981407bdc2e33d917675e919", + "sha256": "16d1mlz5ll89p2f4avz8cbyg2wkxkjydb19aff9y6c75pw948cks" }, "stable": { "version": [ @@ -20314,11 +20509,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20200324, - 1726 + 20200412, + 1112 ], - "commit": "e4672e22885772d2be0c75df03c4f805f1acf5fa", - "sha256": "0pb0q8grybzl3sh75km93n1cvk7wh5c2r2nbm8rkwzzhxrhrvffl" + "commit": "81d06717d1b75d2b51c1b7d3da93b6a01d7e253d", + "sha256": "1ywzxhygf8qyif4d6kg0rhbpdxxb74wnip8n4n9m9mabmff5xkzk" }, "stable": { "version": [ @@ -20562,19 +20757,19 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20200306, - 1054 + 20200410, + 920 ], - "commit": "1569b712ea691a9b8df12af5ee8c8a4aa4853e45", - "sha256": "1149s9ym30nfdbb2ndk5ypl5wb984an6n37gycra15j3z15d60mh" + "commit": "9163cd990fb1f43dafed3948c6e406c13a45a6be", + "sha256": "1x73akd8l7bsn59wnz2cg0mxms98r1li40w3by121p9md49fd0r8" }, "stable": { "version": [ 1, - 0 + 1 ], - "commit": "1569b712ea691a9b8df12af5ee8c8a4aa4853e45", - "sha256": "1149s9ym30nfdbb2ndk5ypl5wb984an6n37gycra15j3z15d60mh" + "commit": "9163cd990fb1f43dafed3948c6e406c13a45a6be", + "sha256": "1x73akd8l7bsn59wnz2cg0mxms98r1li40w3by121p9md49fd0r8" } }, { @@ -20644,8 +20839,8 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20200306, - 513 + 20200423, + 1658 ], "deps": [ "dash", @@ -20653,8 +20848,8 @@ "popup", "s" ], - "commit": "e8e9b0c2d1eda594fd40db9c64e93a70b426641b", - "sha256": "0m8771bzz972zf2lhv7f4z2x0rnnfc0iidb5jpz072wr3v52kark" + "commit": "d760aa880fc1052570ab0fd7e586eeffb7636af6", + "sha256": "0a27fv2yi4c19g78hgflrp8vx135v74q6n8ak3g3b2gh66vkvq7p" }, "stable": { "version": [ @@ -20698,17 +20893,17 @@ 20191016, 1241 ], - "commit": "d864995d98479a21fb88fcf6d24b8262f2fdeae2", - "sha256": "091c58yvvwly070dgzz1202njlp695fzq85873v4dak1rwxisrwh" + "commit": "17895c30724c2a5ea18c0140d4022e2ef83d7208", + "sha256": "0sgn56g1225ar45kgp5qcdd6fc95skr36zci1lz1fszy94v162z7" }, "stable": { "version": [ 2, - 4, - 0 + 5, + 1 ], - "commit": "ccd447e41a711f8a52bc854d71dba8677c900c34", - "sha256": "0i8b84mi38r431z4a1yh4xnn9z5mnk1g3di0qz6h4lsxq8pg2m0v" + "commit": "4d1ef91df8c732d516ddea4a953f5956e99692b2", + "sha256": "1ljhwsyl277lvmii4v439dafyc0y2l2jf2ds5zivpbrh168851di" } }, { @@ -20767,11 +20962,11 @@ "repo": "dylan-lang/dylan-mode", "unstable": { "version": [ - 20190831, - 1910 + 20200425, + 1347 ], - "commit": "4801b7adcc984edfffa3f951e2c35329fae2b6e4", - "sha256": "1xm27fc98rj8fsfm9na1x3d7zgp8fkxf782ajvirzbbq5nj0lyma" + "commit": "64f3aed546315c766331c69be3c7e78c7da6c333", + "sha256": "1r63gxy1hlij1ck570agvj39rynby6kna5kcfhrr0imi7hl98mzz" } }, { @@ -21098,14 +21293,14 @@ "repo": "redguardtoo/eacl", "unstable": { "version": [ - 20191230, - 1057 + 20200407, + 756 ], "deps": [ "ivy" ], - "commit": "a25c28f4ee1126d1ee51dae22843f3440520f1a3", - "sha256": "0pz894saz6ncira9ag9aqmfw394v56sfxldv25phh3z44y1ij01z" + "commit": "47b839f305e63e119b6a554497cd4b99512e8e00", + "sha256": "1gdppgjdapjx25ns5ja1lnnypq26m8w9s5vbnfg7p0j64kd2mdwh" }, "stable": { "version": [ @@ -21367,14 +21562,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20200327, - 1040 + 20200419, + 2017 ], "deps": [ "parsebib" ], - "commit": "f57e138d56bd293f30a64c33ab8b374758acfb08", - "sha256": "0h8bxy6p91hhx6mvzbxv2j3cr6bxcdbpgbaqa9ibcaxy72d9xrjp" + "commit": "87920ab793e6e854903eb101b80a0746f588dab6", + "sha256": "0mw5spmjn8yyjbdpas06rf9cmfsfa3k2z0yfrs7xvmaalpxz55xm" }, "stable": { "version": [ @@ -21397,11 +21592,11 @@ "repo": "flexibeast/ebuku", "unstable": { "version": [ - 20200203, - 1122 + 20200422, + 723 ], - "commit": "2f1af38469966c788483cbce4ab70436f72cf30d", - "sha256": "15liiczqjf8p2jr9356zrj65ijp5gdrnb5i7m09armyhb8282rmg" + "commit": "ec8a5057dd2bf6275c8cdfca53c51e0b7f21b8f3", + "sha256": "0j6g56vqi12m5533dm6f716vsqcw59awfbiiv0jafb5kw9wj698v" } }, { @@ -21547,90 +21742,6 @@ "sha256": "0xy3q68i47a3s81jwr0rdvc1722bp78ng56xm53pri05g1z0db9s" } }, - { - "ename": "edbi-database-url", - "commit": "e25bf3d65ef2fb09eb0802cfd3e3faee86a5cfdb", - "sha256": "018rxijmy0lvisy281d501ra9lnh5xi0wmvz5avbjpb0fi4q1zdn", - "fetcher": "github", - "repo": "proofit404/edbi-database-url", - "unstable": { - "version": [ - 20160221, - 1923 - ], - "deps": [ - "edbi" - ], - "commit": "d56c580268cd93651998c4c6b1c5558e6b6ca90f", - "sha256": "1nkfl8jngkdz8h951jig39af1wh5vrc5lqk58l2i4lc2znprj9lx" - } - }, - { - "ename": "edbi-django", - "commit": "10dd853022ab93e345761b04d760b3763f4d2384", - "sha256": "02vcbqgkvhlw9msf65777f85c8myxr95g2dz199nlfmz4vpqrkgq", - "fetcher": "github", - "repo": "proofit404/edbi-django", - "unstable": { - "version": [ - 20190212, - 1417 - ], - "deps": [ - "edbi", - "pythonic" - ], - "commit": "9b73db66c02a222fc62dc3bc590962f58c5b43d8", - "sha256": "1yinm4qzwpdmr4a0isbkiw6ny23gllajcppwh7g0d62di3v242dm" - } - }, - { - "ename": "edbi-minor-mode", - "commit": "5fb878b60c7ecbb1e3a47aef1d9765061c510644", - "sha256": "0p7vdf9cp6i7mhjxj82670pfflf1kacalmakb7ssgigs1nsf3spi", - "fetcher": "github", - "repo": "proofit404/edbi-minor-mode", - "unstable": { - "version": [ - 20160706, - 1447 - ], - "deps": [ - "edbi" - ], - "commit": "566a2141a6eb9d9d5d7e1bd7c251d1c5e8f0d2ec", - "sha256": "1g6mlmrwl8p5ffj9q298vymd9xi2kpp7mhbmz4by4f6a3g831c88" - }, - "stable": { - "version": [ - 0, - 1 - ], - "deps": [ - "edbi" - ], - "commit": "566a2141a6eb9d9d5d7e1bd7c251d1c5e8f0d2ec", - "sha256": "1g6mlmrwl8p5ffj9q298vymd9xi2kpp7mhbmz4by4f6a3g831c88" - } - }, - { - "ename": "edbi-sqlite", - "commit": "acc9b816796b9f142c53f90593952b43c962d2d8", - "sha256": "1w53ypz3pdqaml3vq9j3f1w443n8s9hb2ys090kxvjqnb8x8v44y", - "fetcher": "github", - "repo": "proofit404/edbi-sqlite", - "unstable": { - "version": [ - 20160221, - 1923 - ], - "deps": [ - "edbi" - ], - "commit": "52cb9ca1af7691b592f2cfd2f007847e7a4ccd5f", - "sha256": "1vll81386fx90lq5sy4rlxcik6mvw7zx5cc51f0yaca9bkcckp51" - } - }, { "ename": "ede-compdb", "commit": "3b70138b7d82aec2d60f4a7c0cd21e734a1fc52a", @@ -21787,8 +21898,8 @@ "deps": [ "websocket" ], - "commit": "7074fe87c2df4aa7afecb7513326f5d481dcf92d", - "sha256": "17kbakpr6d79cih1fmvnrivs0vk41fw0njhb5y6dbml6ppi11i57" + "commit": "e9ef6a72bdc6b58f932c51aa161869cee11b4bc9", + "sha256": "1akyxq0ja06q5bywa6nb4klnbvrw6f6d83bzrjdz2sc7ddk3a4hz" } }, { @@ -21887,8 +21998,8 @@ 20181016, 1125 ], - "commit": "af46de40e2991b046f04856c18a6483badce38aa", - "sha256": "1lfdfnc7cx3lqa69mpn72jhsz4dwmfnrfpzrnk6lfh10h65yfdiw" + "commit": "43f180809fcbc7e104f96f95608a97c4c2a2c8b3", + "sha256": "0v9nn85pw7lll516p8bb9y6dk44rj2h88ky4zz9wgkrppjs7qdb0" }, "stable": { "version": [ @@ -21961,8 +22072,8 @@ "deps": [ "editorconfig" ], - "commit": "ddf60923c6f4841cb593b2ea04c9c710a01d262f", - "sha256": "1v5a6s4x7cm6i0bxaqdpsg8vqj479lp5h45glx4ipk0icdq8cvd9" + "commit": "4f75e175ad15ce2038f926fe4f0e5a0c1d0cbc46", + "sha256": "12a78187ar4mxdf1sk8bkrdcxly1nc5m9krkry04jklj6h9dayj3" } }, { @@ -22071,8 +22182,8 @@ "repo": "sebastiw/edts", "unstable": { "version": [ - 20200304, - 1709 + 20200413, + 1929 ], "deps": [ "auto-complete", @@ -22083,8 +22194,8 @@ "popup", "s" ], - "commit": "22eb59692a792c6769ae0b2b9f9a2583133764b8", - "sha256": "015irp4vd4s2j2iw4p0r98kb60xyjbrpvckj8iixsja3qj8b63rw" + "commit": "e797eb57ede8332205b3abd7d7adeccbb319ad29", + "sha256": "1101yx1dg82msw0bbji9hpnzq029ghh9ca4a6588fik8sn3v786j" }, "stable": { "version": [ @@ -22247,17 +22358,17 @@ 20200107, 2333 ], - "commit": "6ea43326d142b714363042a27e06d3487f7845d7", - "sha256": "0pvaz69rjaz8m32s4chq7kavf20njb78l380xl97blj9h0yry1l4" + "commit": "8e0706fdb5ae139a1db93bdd24203a261b13c875", + "sha256": "09jqjdgjrg740a326vn086wj3gv548w19dk8pz9k7k3dvlncw24y" }, "stable": { "version": [ - 3, - 10, - 3 + 4, + 0, + 0 ], - "commit": "79ab16f093aa3b2373422d0044f3119467755f5e", - "sha256": "0fisq0g3css641fh7y9vhagkfbsm2rfw9pnzyz434cr41wnjmjfz" + "commit": "400465de0ece5b03607895bd1c83b1cfae34079a", + "sha256": "196jn2cmyjvjai3nbij5kk64djz908ch4kddi4qdpkighwslkh2i" } }, { @@ -22268,27 +22379,27 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20200320, - 852 + 20200424, + 1852 ], "deps": [ "flymake", "jsonrpc" ], - "commit": "2209779972eee595ff6ea8e75c002f7e5726b0c8", - "sha256": "08mfgg9s76wmjzvpdirnm8rsa3fsvlvjivxjdn53aj1pnky55z8d" + "commit": "e5cf30e26bd3107583418f2b4539c7385d37d6c8", + "sha256": "0fx2zx46j4mivb2h1bdz7n17bmmd6811az1wzi8g4q430kiv9hpi" }, "stable": { "version": [ 1, - 5 + 6 ], "deps": [ "flymake", "jsonrpc" ], - "commit": "33a4f869972f0958c15c33b47035672b265a8b55", - "sha256": "1x6nlsc93scq8lidx1l5ipi7r7s0p63m2vwkl77p3v59glir15cb" + "commit": "e02479a8c20cd79c3dfeb553deaaecd7d6e97e51", + "sha256": "13r1ysdhnxkc025wypwi6w507v18hm5qf0x29qrycql46f8klrjb" } }, { @@ -22299,28 +22410,28 @@ "repo": "non-Jedi/eglot-jl", "unstable": { "version": [ - 20200120, - 1457 + 20200413, + 1930 ], "deps": [ "eglot", "julia-mode" ], - "commit": "94e84fe0d14585192dca53e1e962bec7596f095c", - "sha256": "0dsnyp30c9nrglv4ifv6g272sa6pgrn5f75ak81z4pkdhdn6wvnb" + "commit": "a37aaa7c2a3e0282e02f97c0b8946dbd6d6cbf06", + "sha256": "09mzxg0j5a9dqx8sf5m91sapzdlr3vj5ds2ll7nxmgd57m185pfs" }, "stable": { "version": [ 1, - 1, - 1 + 2, + 0 ], "deps": [ "eglot", "julia-mode" ], - "commit": "94e84fe0d14585192dca53e1e962bec7596f095c", - "sha256": "0dsnyp30c9nrglv4ifv6g272sa6pgrn5f75ak81z4pkdhdn6wvnb" + "commit": "a37aaa7c2a3e0282e02f97c0b8946dbd6d6cbf06", + "sha256": "09mzxg0j5a9dqx8sf5m91sapzdlr3vj5ds2ll7nxmgd57m185pfs" } }, { @@ -22348,17 +22459,17 @@ }, { "ename": "eide", - "commit": "a42244392719c620b47bc43a7a8501dab4b6f74e", - "sha256": "1962shxcfn3v1ljann7182ca6ciy5xfbcd6l9l8rc8gikp55qv8m", + "commit": "1dd52b48fbac25ee2873645d87a1238351a6ff74", + "sha256": "1akmb48rpq05mmb022yh0qnjlbs1wx5x6f1gk2kw5fb5g45swb0c", "fetcher": "git", - "url": "https://framagit.org/eide/eide.git", + "url": "https://forge.tedomum.net/eide/eide.git", "unstable": { "version": [ - 20191213, - 2119 + 20200419, + 2126 ], - "commit": "2153a68b58910e7892b16cc32414e2be99e33f36", - "sha256": "17fbxijpiachsb16ngbv7wpy9f4m0456bc5q9g7z8qi28dgzlz9p" + "commit": "827f29b9fd8e20e2e460cffc67a8f9ac9623c450", + "sha256": "1bqsvk70l9n929b41xz6j3sg3irwrcrlbvqxpvq0d8jqjl4nw51g" }, "stable": { "version": [ @@ -22393,8 +22504,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20200328, - 2131 + 20200425, + 1940 ], "deps": [ "anaphora", @@ -22404,8 +22515,8 @@ "request", "websocket" ], - "commit": "6fc75f20aa0b6666e743ce674c6da526f88793b1", - "sha256": "10cm3pvpjrqy76xd9067ayn108z34014cyaal4vj2l69yrkfr0m1" + "commit": "42134adf3c95b7768e2d725bab39ddb98feafa09", + "sha256": "07lwxl5kbsc0xlmnvp524p3r4m9f4ldxnkwm0gmbk8aq1lg1gyw6" }, "stable": { "version": [ @@ -22479,8 +22590,8 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20200325, - 1455 + 20200424, + 1623 ], "deps": [ "auto-complete", @@ -22489,8 +22600,8 @@ "direx", "spinner" ], - "commit": "5bf46fc49b7827604ee82d56b80eee36630b562d", - "sha256": "0dcnzq9l1mnfrn7rq8kvyfkbw36r6iagp61c0p757xwfawsaxns4" + "commit": "0914ff731630ebdaa4e07dba97644e0e57bbf18e", + "sha256": "0qm4sdzxmkm35kg3ldijj6vwbdn8yflivyv09m4w05vz0liks0qa" }, "stable": { "version": [ @@ -22573,8 +22684,8 @@ 20181006, 225 ], - "commit": "456fea0866ee71cb5a68eb65e9464565674081bf", - "sha256": "1hcjf88xjgkgp5wv7ccnfifnmpdj33csx6xm7rrdal3cy0f3ydj8" + "commit": "64abd393d5cefb1d59380dcc1344befdf618735b", + "sha256": "006c2kgkky81mv7an24m55521ay0d6ang5cwi16ac88j8x3n1q4i" }, "stable": { "version": [ @@ -22687,20 +22798,19 @@ "repo": "raxod502/el-patch", "unstable": { "version": [ - 20191114, - 1639 + 20200404, + 1548 ], - "commit": "4744d6b1a5405001cb75f2c362a681964367319c", - "sha256": "1l4rjvdrdzvgq5zq6njg6gv0b7p6j545h4v27mpyxfh3z5jc8c49" + "commit": "f5c785a6f951a4aa6d6ab5cda84460dad2a072cc", + "sha256": "12fw4zk3w8kh8g94k4hcqjixxb1vvnv4qivc672lwdj4d8a218jw" }, "stable": { "version": [ - 2, 2, 3 ], - "commit": "ef56cbc6950dffd91de93009bafe51efb81eb84f", - "sha256": "18djslz177q6q33y82zmg2v6n9236a76kiqfvxdk4vbqzjbq82f7" + "commit": "278a27477a4d7032fe06bb56ab01701cb10df808", + "sha256": "15bwjl6377ngg3qwn1g8wc2wi61pcm6xlhjzj28ap5vz7y7zxps2" } }, { @@ -22841,11 +22951,11 @@ "repo": "tumashu/el2org", "unstable": { "version": [ - 20190504, - 1114 + 20200408, + 146 ], - "commit": "fbb2c5bff78564111ff1826976101555314bfc53", - "sha256": "17d85fdckbzj551j98j0hrhdj0ag8ba2kpk2ix8fmvdnssxdnvm0" + "commit": "7db77fdd73f378d4e60e34c11bbdf00677adc32c", + "sha256": "196nrg4cp57calv36if0fkc8bjiz6qzisr29ry49zmkgjlqaafq3" }, "stable": { "version": [ @@ -22991,8 +23101,8 @@ 20200316, 1956 ], - "commit": "7fa3b78d073c235ad945fc28d692c5f5fb60860a", - "sha256": "06cy6dsn3drfk0jkc10b96qzvi5rfhkjy7cib5dk2kqgg615is6d" + "commit": "c1a1b77ec0c7fff9ecf7122d10dcd16eebcd3829", + "sha256": "1gg3gxw5ks4fds7lgl9mqxyb2qjrdsdwyyc183nfz6aq0m4w91yb" }, "stable": { "version": [ @@ -23114,14 +23224,14 @@ "repo": "davidshepherd7/electric-operator", "unstable": { "version": [ - 20191005, - 1109 + 20200410, + 928 ], "deps": [ "dash" ], - "commit": "71d65e4abaef5e49a9e1b8fce706ce0296f9d5e2", - "sha256": "168ri3wahr6zjv2dvqc3jbqih2m4d0mfzp4gqw5mss000fqmx9ns" + "commit": "f8454905a147045f25ab03da7aa6406e4f20cc64", + "sha256": "1x087fry0yx5sk9vvgqv1zh7fkpgzvykl14fzns1920sxacgms68" }, "stable": { "version": [ @@ -23268,15 +23378,15 @@ "repo": "fasheng/elfeed-protocol", "unstable": { "version": [ - 20200307, - 1242 + 20200426, + 1143 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "328dcf40def951ddc193f3d6ccb01cb58f9fc1cd", - "sha256": "0zqgkx6s9dcy6la62vlv4c12wx5a505pc1hhxiwhhpp93r61bh1z" + "commit": "294b0d70f2cb85d5563019343f14c64938ae4b07", + "sha256": "0bm6vn61awwa4yd97idjqbbwp3ypz11n5w9mswg5yivhg4kc82sm" }, "stable": { "version": [ @@ -23473,6 +23583,24 @@ "sha256": "09xbrk1li76fwa85kvd5xpr0zswrkh51p7a62sb8g422wpaqxiwx" } }, + { + "ename": "elisp-depmap", + "commit": "8c86ca9b1ad39282f965d36ec2a8df807cc0ebb1", + "sha256": "08qjrc3vrn18apnb856qd2m0wzza8755fbh8ly9nh58dlbjhkkd7", + "fetcher": "github", + "repo": "mtekman/elisp-depmap.el", + "unstable": { + "version": [ + 20200413, + 1215 + ], + "deps": [ + "dash" + ], + "commit": "e47616c968dd82e30cb10961452e2b46c7900163", + "sha256": "1jpqdi15lvyd48jsbndlallnjc8bkmv0mxwyf51m483vz9v8nn2i" + } + }, { "ename": "elisp-docstring-mode", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -23699,8 +23827,8 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20200301, - 19 + 20200406, + 214 ], "deps": [ "dash", @@ -23708,8 +23836,8 @@ "reformatter", "s" ], - "commit": "3f042ec430e7d915bfdca21d4f4d6201a882434b", - "sha256": "16b66kv49bslnnhya2a9q0zshcwx58017sy0ab451j5zsq42v2qh" + "commit": "7782be0814b52f7c35a09b21a4839c1502a4707f", + "sha256": "0g3mxp80hfjwf3adaslwykk01w5fh5y6nwj4687wbm5dldvhr42i" }, "stable": { "version": [ @@ -24047,8 +24175,8 @@ "s", "yasnippet" ], - "commit": "fc54812f5f53889842e7e707727e50d9589443ca", - "sha256": "1jdpg6vq88kxg1wfhp9hwnvfadxazmznzscfhvr967fbgq46w6qj" + "commit": "816061cf16d53448d95612380855e7ccaf59a417", + "sha256": "0fjz3y0yh2hfmx0470jcyni1glc6m3bm5gh20iakvlwxf4wa8801" }, "stable": { "version": [ @@ -24236,15 +24364,15 @@ "repo": "wamei/elscreen-multi-term", "unstable": { "version": [ - 20151022, - 233 + 20200417, + 821 ], "deps": [ "elscreen", "multi-term" ], - "commit": "7b6048a0dd80f69460a62bbc6f1af8856141a5ea", - "sha256": "1cninrbgxzg0gykkpjx0i8pk2yc7sgr2kliqd35lgcxz2q4jlr51" + "commit": "4ea89bae0444d9d4377515929f76cb3e98140f1f", + "sha256": "0j5dpikjxwn1679ndy894g55qm9hs0n65lqyxx483h584nqxsdkg" } }, { @@ -24350,11 +24478,11 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20191226, - 1614 + 20200422, + 1352 ], - "commit": "4cbdcd79524db4a71abbf761a3945617086f5d09", - "sha256": "1gb2sh2mcx8va8lgyc46pch9fswfm761935806myi9fl1v67ayk6" + "commit": "d5ebd8ab6439fea3dcae0bcaece6e914f4ee1f6c", + "sha256": "1h1dx6dpwr4cml2a57mz3lq4f746cja007ckrpk3vii9ap413hf8" }, "stable": { "version": [ @@ -25172,8 +25300,8 @@ "repo": "Wilfred/emacs-refactor", "unstable": { "version": [ - 20191122, - 1911 + 20200420, + 721 ], "deps": [ "cl-lib", @@ -25186,8 +25314,8 @@ "projectile", "s" ], - "commit": "8038ab88a000a835ca73af2068b1ef536bc7e33c", - "sha256": "1d27y6chxjf4k9cgsk93xjf1wq9lrv0516lpnqqlp2rdd7m3nv7y" + "commit": "a8f6ab823453decf43f0764d02e554d05009a631", + "sha256": "0d1qd9jzmh0vg1in6q1xjlwq85sgds5lfvyg2wi6z8ci5a7m3ahs" }, "stable": { "version": [ @@ -25358,25 +25486,6 @@ "sha256": "1in4wbwkxn8qfcsfjbczzk73z74w4ixlml61wk666dw0kpscgbs5" } }, - { - "ename": "envdir", - "commit": "79c1497f709f6d23e4886359e09ab0456ed61777", - "sha256": "085bfm4w7flrv8jvzdnzbdg3j5n29xfzbs1wlrr29mg9dja6s8g8", - "fetcher": "github", - "repo": "proofit404/envdir-mode", - "unstable": { - "version": [ - 20160221, - 1923 - ], - "deps": [ - "dash", - "f" - ], - "commit": "f29346c55ccf11d8c75628edc6d430ed63c36917", - "sha256": "1jyhr9gv3d0rxv5iks2g9x6xbxqv1bvf1fnih96h4pgsfxz8wrp6" - } - }, { "ename": "eopengrok", "commit": "2b87ea158a6fdbc6b4e40fd7c0f6814d135f8545", @@ -25647,14 +25756,14 @@ "repo": "atomontage/erc-crypt", "unstable": { "version": [ - 20200103, - 1329 + 20200424, + 2024 ], "deps": [ "cl-lib" ], - "commit": "26e16e0fc3af78e70b095f47995d2a368f8de61d", - "sha256": "197sj97j7mc9jwhamra4narnypdg3xpxy5rb95an5gqqzhy9bccm" + "commit": "ba36632666ea0a631d23b6fc54c16ada55673b02", + "sha256": "1q7bia9l672dfa0q4mrhv2cnxk2c8vhpl7n649zw7zwfpkqnzh70" }, "stable": { "version": [ @@ -26069,18 +26178,18 @@ 20200313, 1030 ], - "commit": "f805a35f696d965b297de3988a2340f86bfe88ba", - "sha256": "102yzbgmqyy5m74zhr8kaai17dyhg8k6w0ykxyvmb0q7ghwaq01s" + "commit": "7ec0ad6ed076b76de8cd52e28445f324a5f2853a", + "sha256": "0r0sn8vfmgamf3mnjjkkv9y0r8a6xkn5f5axw1av0liiv95kgrm8" }, "stable": { "version": [ 23, 0, -1, - 2 + 3 ], - "commit": "a24425668beed38e04039c292361e09c4826683f", - "sha256": "1i91p2hsajcwjqv10ri6jj2a94g68mb6fmxqx47g50fbc5f0dqj5" + "commit": "9f17d424ada5353db1e5b31296484d95679f8ca8", + "sha256": "0012fbf9a1whq2bzii73m645bvf4vww403fcd54j9k27916vcfx5" } }, { @@ -26870,14 +26979,14 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20200328, - 1547 + 20200419, + 1920 ], "deps": [ "julia-mode" ], - "commit": "1c2387fdba509c1c9d072150f65ccc318a570870", - "sha256": "0llsjqrvabcvpd2nhixiklwmm2lisywif77iwfrsdc6lfxp8cdd0" + "commit": "007fa4b5192154db3d90e6e861f96193c1b145f5", + "sha256": "12kj006yxl84fav2ryxx6ajk284rskgy6imi9wjpfl8qqfcykcm0" }, "stable": { "version": [ @@ -27326,16 +27435,16 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20200304, - 1421 + 20200417, + 1238 ], "deps": [ "cl-lib", "goto-chg", "undo-tree" ], - "commit": "296932406a0b55474fe4b6cb8db8b7d5e05633aa", - "sha256": "1gvmvczdfgq07chj98gqg5j2zyfdrq3znl8l6a81mbrjbvsyvmd3" + "commit": "d243eae8649272799ec3864fde14c1164f036940", + "sha256": "0fpjcxyzql7fl904asxbff3gqdc1byhwn32i38r4zd4bqrqsqfw4" }, "stable": { "version": [ @@ -27529,16 +27638,16 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20200327, - 722 + 20200426, + 848 ], "deps": [ "annalist", "cl-lib", "evil" ], - "commit": "2df9bedfa48bdc22e46bf4d43f6e2792d4cafbea", - "sha256": "17737k612gl5bhkkq8fdivk9rxbcypfl9hnm3mbp5v2wpr8chw3a" + "commit": "695e941d8ac59dc7534524e5cd27ced9490259a1", + "sha256": "0fdqxgkp0fl5862b15qxnl2njs97vznsydw5jm6hw8fq94a1crhn" }, "stable": { "version": [ @@ -27611,15 +27720,15 @@ "repo": "PythonNut/evil-easymotion", "unstable": { "version": [ - 20180114, - 654 + 20200424, + 135 ], "deps": [ "avy", "cl-lib" ], - "commit": "79c13ed3bce018ac09d358e642e5bd7025e93603", - "sha256": "0496dnbciq8gbivihas1y58gwd4nbfz767rr98zpwgkz8l2jvy73" + "commit": "f96c2ed38ddc07908db7c3c11bcd6285a3e8c2e9", + "sha256": "0xsva9bnlfwfmccm38qh3yvn4jr9za5rxqn4pwxbmhnx4rk47cch" } }, { @@ -28063,15 +28172,15 @@ "repo": "emacs-evil/evil-magit", "unstable": { "version": [ - 20200302, - 1611 + 20200409, + 1909 ], "deps": [ "evil", "magit" ], - "commit": "0b79aa33a478770865716dc0e09f95d91ec042a2", - "sha256": "0qxapq9nl1yr3ryg1q9n2ajffm308fai115mbvwmjl9sd6x2p3ly" + "commit": "253c644807013fe92429acdef418748794b8f254", + "sha256": "08mh7phxsdb9w4dfs0pmr4l4fdzzr2rm88z2s8karfi5j5ik2ag5" }, "stable": { "version": [ @@ -28131,8 +28240,8 @@ "deps": [ "evil" ], - "commit": "11d98debf8b051b10068137668eb54c2fede0e30", - "sha256": "1jppiqz1mlmz9wnxmaymg15sz6j59kghhrv95r6hkv90zwdvbqvw" + "commit": "076ace3ee22a61890f375ae492c634f71ce84301", + "sha256": "0d4xdrqa8ylh67wgyywxsh0crm06y31babc8sksrpwxlr12xyaww" }, "stable": { "version": [ @@ -28260,11 +28369,11 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20200324, - 2310 + 20200417, + 59 ], - "commit": "4387407615258d5e95f71bfb425cbe92dd813290", - "sha256": "0v31gbn423g20lqksvbc72z325lh0qjmgz8nhy8ygqli4b2msvzb" + "commit": "1bd2de52011c39777a3e8779b14cee2790dc873b", + "sha256": "0h8hzqjh6qq4fj0imrb5ic5m4zn3ig6s3b7b2x9r6ig9m15jpg6n" }, "stable": { "version": [ @@ -28672,15 +28781,15 @@ "repo": "hlissner/evil-snipe", "unstable": { "version": [ - 20200103, - 923 + 20200422, + 519 ], "deps": [ "cl-lib", "evil" ], - "commit": "3ec8adfd4990f95fa0fab2b7019ead3596857673", - "sha256": "0q689f52saky3rfap351n4bkjn0kpg7xkjias926affqpghywb1r" + "commit": "2ba6353bb9253dbbc4193f1d35403e7dcc1317b1", + "sha256": "1sqbwg41by88qq7npsw7w9q3zmfk5adzqpqh2m84zk6fd64mc6h2" }, "stable": { "version": [ @@ -28863,8 +28972,8 @@ "deps": [ "evil" ], - "commit": "296932406a0b55474fe4b6cb8db8b7d5e05633aa", - "sha256": "1gvmvczdfgq07chj98gqg5j2zyfdrq3znl8l6a81mbrjbvsyvmd3" + "commit": "d243eae8649272799ec3864fde14c1164f036940", + "sha256": "0fpjcxyzql7fl904asxbff3gqdc1byhwn32i38r4zd4bqrqsqfw4" }, "stable": { "version": [ @@ -29617,11 +29726,11 @@ "repo": "extemporelang/extempore-emacs-mode", "unstable": { "version": [ - 20200312, - 224 + 20200408, + 2253 ], - "commit": "9f370d6cba7f115896579b634c7550923503a4ab", - "sha256": "11qm9f850zm8l26q75j9mlbl5ydiyw7alan47h4nyfihpl4498qz" + "commit": "09518ae6650d7be33a4633a4c0f31b7130d04c6e", + "sha256": "0hfza9lzdsz94gxhmzyp9fwviscv19rmnjgd0q613faayn11sjsp" } }, { @@ -30549,11 +30658,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20200206, - 2001 + 20200405, + 1935 ], - "commit": "c02f4a9ed1b9c26f9cfc3237906c2844f5937622", - "sha256": "1bcdicgp3wlxpdzardx1ry9js192dy26q8af6pdlvrnxqvdl2asm" + "commit": "7fadf2580c3afcae3f6ebc54dad0e519b7600f1d", + "sha256": "1qpfpfdm2d8bdqm7h62y3hgbip67yqmblhg66zlmfxfdnsad5ls6" } }, { @@ -30635,16 +30744,16 @@ }, { "ename": "figlet", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "1m7hw56awdbvgzdnjysb3wqkhkjqy68jxsxh9f7fx266wjqhp6yj", - "fetcher": "bitbucket", + "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203", + "sha256": "0p5xnq3c4bvvy7nqgi18ylsha7kz9r7apw7lz84kq5hwhni298k5", + "fetcher": "github", "repo": "jpkotta/figlet", "unstable": { "version": [ 20160218, 2237 ], - "commit": "70ca269d706eedd34838fe2435073c6860be470b", + "commit": "19a38783a90e151faf047ff233a21a729db0cea9", "sha256": "1c18b1h154sdxkksqwk8snyk8n43bwzgavi75l8mnz8dnl1ciaxs" } }, @@ -30959,11 +31068,11 @@ "repo": "jming422/fira-code-mode", "unstable": { "version": [ - 20200316, - 1708 + 20200415, + 2356 ], - "commit": "64c4e655ea6ef29c7e720a5bf9281e865f2e3fa7", - "sha256": "0c11lfwdibx35wwvpq3vl4img4rz2slslqhlqaqbab212ii9jsmy" + "commit": "a61d7fce35eadba39236a6a3e9aa301e161d147b", + "sha256": "1bn81qwkvhznc5pi6bq08kp83208pj09vknfszx152r72sv5fpmz" } }, { @@ -31022,20 +31131,20 @@ "repo": "johanvts/emacs-fireplace", "unstable": { "version": [ - 20181211, - 1927 + 20200402, + 2206 ], - "commit": "571ffa7dd0ce46edca838df74d055aaa83da4d78", - "sha256": "1iw17rkihsn50p3zljag82v09zyav8bzgfn6mfa267fkf4f1fgjy" + "commit": "f6c23e259349922aae25cf2898ba815a7d8f2527", + "sha256": "16cb8grw2cfgdix1sr5a3fnwhhc93ci8qgbhgs5ilyayy2cb6s4c" }, "stable": { "version": [ 1, - 1, - 2 + 2, + 0 ], - "commit": "2b966ed65b714c613f79e9144d004dfa3b28f1ed", - "sha256": "1f5053bbvjdmm64zv6r2qkswkpwvx0s3qz4bwm9zya583a6g0nv8" + "commit": "f6c23e259349922aae25cf2898ba815a7d8f2527", + "sha256": "16cb8grw2cfgdix1sr5a3fnwhhc93ci8qgbhgs5ilyayy2cb6s4c" } }, { @@ -31325,6 +31434,21 @@ "sha256": "0z77lm6jv2w5z551pwarcx6xg9kx8fgms9dlskngfvnzbqkldj1f" } }, + { + "ename": "flatfluc-theme", + "commit": "de15ce71674965c5e0a8564ae2e640bc05dbd589", + "sha256": "0rpmiw71scdl3dgrvf2j9d909wmafyvlgraxfg5hsxngcyj5gjk0", + "fetcher": "github", + "repo": "seblemaguer/flatfluc-theme", + "unstable": { + "version": [ + 20200419, + 1033 + ], + "commit": "42f93b2ffb651901d6bad7eb5587790298dda371", + "sha256": "035zm6dh416jk1ipg35qnkr8cbfsjkb92dhc4ryay4p30rp1yljz" + } + }, { "ename": "flatland-black-theme", "commit": "641d1959bd31598fcdacd39a3d1bb077dcccfa5c", @@ -31442,16 +31566,16 @@ }, { "ename": "flex-isearch", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "1msgrimi2a0xm5h23p78jflh00bl5bx44xpc3sc9pspznjv1d0k3", - "fetcher": "bitbucket", + "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203", + "sha256": "0y5j90y4ssw3kwqhji9h4icy8xj2pa5fjvkbkl4x7rxs8kwwm989", + "fetcher": "github", "repo": "jpkotta/flex-isearch", "unstable": { "version": [ 20170308, 2010 ], - "commit": "8b934ea6f1e4324088f055454a2e8b714961854a", + "commit": "b1f7e04de762282c276343cc2709af9ff4abc9d2", "sha256": "0xbwrzkfv4i91qxs80p0pfjlvj5pyigvidby8m5lammm8idwx9dh" } }, @@ -31481,14 +31605,11 @@ "repo": "IvanMalison/flimenu", "unstable": { "version": [ - 20170418, - 147 + 20200415, + 2353 ], - "deps": [ - "dash" - ], - "commit": "9351201d89b05cbdaec312a6ebd7fd10c38d6112", - "sha256": "1qb08j66a9mvybqhc2vyywwn16w3kkjb06k50rfqf6sbcmndz8va" + "commit": "f110bc77415a7594742f3b12551571c4069c9157", + "sha256": "1y832w4n10k9lfi90lhq8l9s56zcg24j9j8jklkzby1vf34vq0ql" } }, { @@ -31633,11 +31754,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20200226, - 640 + 20200416, + 1225 ], - "commit": "ec92a4df842ad7e5bd8f60a648ffe7b004abb09d", - "sha256": "1l7nd01p5p9l2a4k2rl61vjs337sagx4m3qr4isvhvy2bk2cppmy" + "commit": "293b7225b9bacbad4bf14d43d20a765f4862c563", + "sha256": "0acn2bdqcvj1m6plm304adgw6ndycv04qh6asgbgdwlz1admzjga" } }, { @@ -31655,8 +31776,8 @@ "flutter", "flycheck" ], - "commit": "ec92a4df842ad7e5bd8f60a648ffe7b004abb09d", - "sha256": "1l7nd01p5p9l2a4k2rl61vjs337sagx4m3qr4isvhvy2bk2cppmy" + "commit": "293b7225b9bacbad4bf14d43d20a765f4862c563", + "sha256": "0acn2bdqcvj1m6plm304adgw6ndycv04qh6asgbgdwlz1admzjga" } }, { @@ -31766,8 +31887,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20200329, - 2344 + 20200425, + 1426 ], "deps": [ "dash", @@ -31775,8 +31896,8 @@ "pkg-info", "seq" ], - "commit": "1751a4e9f8f6f20706a1620429422f101eabcd38", - "sha256": "10w9fgcwyni5iid7sfzrza155wrh481gdylwrwa7v640a9jmbyls" + "commit": "c8218044c849f21cc628b6c077e41c690f046bc0", + "sha256": "11n3h7x9nszqljd0awi6jzrhrkac7sdyrwvb94bikrj1d7yin25g" }, "stable": { "version": [ @@ -32053,14 +32174,14 @@ "repo": "borkdude/flycheck-clj-kondo", "unstable": { "version": [ - 20190619, - 1743 + 20200414, + 1444 ], "deps": [ "flycheck" ], - "commit": "f652a8dc4cff01e78bba50b555bae7ba6115b552", - "sha256": "09k87wfz4m16r32g6ry4jl2zagh1gpgfd9sik54wvyky24s605y4" + "commit": "5472c26ffdf754a0661357564874ffd4f8598805", + "sha256": "0nb88mil1nlhv0nalswl3xwndzz91yah52zpri2jfbyvivshpfm4" }, "stable": { "version": [ @@ -32491,8 +32612,8 @@ "let-alist", "seq" ], - "commit": "debd0af563cb6c2944367a691c7fa3021d9378c1", - "sha256": "1vl0lss2n50pz5wscqj6vhjwb4hbg8xx2chh5vafsrnn0a3fryrd" + "commit": "1b60050efd4729bfba548f3e5adbcb58436667cb", + "sha256": "1kjms9d2c98ffd1qxs879qhg0n4jzic0r5kni9y4gz3v09ww8zms" } }, { @@ -32637,20 +32758,20 @@ }, { "ename": "flycheck-grammalecte", - "commit": "fdd82aa0568d998a3d176b5ee47b8a227438ea09", - "sha256": "0xqg995a42cl6mvmpi68ay56fgs636cbzg65q5si5yc1yzgl74nv", + "commit": "ddaffa55c1b99cce9097c019efe9a236e2f5a395", + "sha256": "1fblc6mvj9n676ci8597as3rnwh6hmbh2hfwr92gi1dd8ibnd2pn", "fetcher": "git", "url": "https://git.deparis.io/flycheck-grammalecte/", "unstable": { "version": [ - 20200308, - 1452 + 20200416, + 1620 ], "deps": [ "flycheck" ], - "commit": "ca4b87d22474d3337db72e19f88105f557f44867", - "sha256": "0wj81xfy3wlgdlnhhyhz5lfkl6sfb2ajwb6s8f2y4bcvqa8gz3qj" + "commit": "d99833992eb874cbbd25e991e3037642e125bb59", + "sha256": "07ph5kk9zb375nkdqryzpfzqn9rr89minf2jgyzlnv58fzqiwpjp" }, "stable": { "version": [ @@ -32805,14 +32926,26 @@ "repo": "gexplorer/flycheck-indicator", "unstable": { "version": [ - 20190729, - 1501 + 20200331, + 1142 ], "deps": [ "flycheck" ], - "commit": "6b1386296ddf2ccc11ca8fa719dc0b2f16808424", - "sha256": "0bd8k3jzipm0r0242hpl2lkcdfnb367yf4xpj6r23g3y99f6f0yk" + "commit": "e00d9a20cbc21d6814c27cc9206296da394478e8", + "sha256": "0y3dzamm7xcac9fcgx88z48l6nkgmz5lx0a6lnxxywkh0h1y2kqn" + }, + "stable": { + "version": [ + 1, + 1, + 1 + ], + "deps": [ + "flycheck" + ], + "commit": "e00d9a20cbc21d6814c27cc9206296da394478e8", + "sha256": "0y3dzamm7xcac9fcgx88z48l6nkgmz5lx0a6lnxxywkh0h1y2kqn" } }, { @@ -32920,26 +33053,26 @@ "repo": "candid82/flycheck-joker", "unstable": { "version": [ - 20180913, - 504 + 20200412, + 2346 ], "deps": [ "flycheck" ], - "commit": "51e99e697761ee8dab863930910abdba7607c1bd", - "sha256": "07pxfvnrgp7f3rb27j1zrq04pncvga4291krqqy3dzwazsjplz48" + "commit": "93576295fef7a749bf779eeece5edd85e21868e2", + "sha256": "1hz5nlrhbrlwwk8rcjvc3jhj0g9wgm6xw903ap8fxq470mj99gln" }, "stable": { "version": [ 1, - 3, + 5, 0 ], "deps": [ "flycheck" ], - "commit": "51e99e697761ee8dab863930910abdba7607c1bd", - "sha256": "07pxfvnrgp7f3rb27j1zrq04pncvga4291krqqy3dzwazsjplz48" + "commit": "93576295fef7a749bf779eeece5edd85e21868e2", + "sha256": "1hz5nlrhbrlwwk8rcjvc3jhj0g9wgm6xw903ap8fxq470mj99gln" } }, { @@ -33162,8 +33295,8 @@ "deps": [ "flycheck" ], - "commit": "12a77ee8ee3f6e774365f63be3cd5aede6462dd5", - "sha256": "187v8877wh247j26d5h2qcnc8i3fmqgyzfvjjjlw9sswqgrln6m7" + "commit": "5b4e14ab0cbce2ff35fee7e69b5b95eafd609c80", + "sha256": "1cx1rm40ns3y5bdbk8hfycdaq16p4zxkjjss02xs6hl96yvc4kaj" } }, { @@ -33374,28 +33507,28 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20200122, - 1256 + 20200411, + 531 ], "deps": [ "flycheck", "phpstan" ], - "commit": "a1c30ca634107551c20c846b5316ca5697adb06d", - "sha256": "0b7rnzk1zkrzh978bmh2dsy78f0sb4ia1w06khyqiby52m27q9k1" + "commit": "2f715a186c5fe6576de83d4c0b64a37e2bfce101", + "sha256": "03ix2s068pzmybj0fcb08dlfgdqw0pmqhbdf4id2077f67bfad0w" }, "stable": { "version": [ 0, - 3, - 3 + 5, + 0 ], "deps": [ "flycheck", "phpstan" ], - "commit": "535e172e1c561bc7b8c706b4e03bbf71689bd83a", - "sha256": "1hn1rdgymv81rm8nkibnc5jazgjrx3sz4w1lin85rgypzbfaf6wk" + "commit": "bf9e82a63f2ccb12af02c9e79a83e7989eeb7cb1", + "sha256": "15kv5xv6lcfgf048wr2zsnpvrplbxypy3wq56zvrzbq18hwprqg1" } }, { @@ -33406,16 +33539,16 @@ "repo": "Wilfred/flycheck-pkg-config", "unstable": { "version": [ - 20180430, - 2243 + 20200409, + 501 ], "deps": [ "dash", "flycheck", "s" ], - "commit": "e72e4c1b8153611ed82695673af84096f4d52795", - "sha256": "07zyrbib9qzy4kj3p7kljcfi53qhb28nf0sjhhkqzdj09iv2k9wf" + "commit": "b76b24ea1f4800f5fb96ce9c6c4788e0e63133d3", + "sha256": "01wzzrpfgh3z28qsynxvkfm92xy98vyvkkv31qh53kxxdicnzlh0" } }, { @@ -33575,14 +33708,14 @@ "repo": "msherry/flycheck-pycheckers", "unstable": { "version": [ - 20200206, - 2158 + 20200414, + 1901 ], "deps": [ "flycheck" ], - "commit": "c5349c0fb3b719469b7e66dbdfbe58d0813f6a74", - "sha256": "02886xggdb09880jp57cah3fmf1nm77gvb0aaws8j4abl278g7x5" + "commit": "467f9b94d9eecc8a8027cf204d304e258f72edaa", + "sha256": "03yiva5lmbfawdjjfsmqlqgvrdgfni1gh1qbdpma5gqhckz5j0d7" }, "stable": { "version": [ @@ -33679,8 +33812,8 @@ "flycheck", "rtags" ], - "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", - "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" + "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7", + "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3" }, "stable": { "version": [ @@ -34778,6 +34911,36 @@ "sha256": "1z6m3bggd3gmxvx92j16jmqm5h9jjxnmsd7adyf12ziy5n5rqcbc" } }, + { + "ename": "flymake-phpstan", + "commit": "bc0ea837b6813002826d861acb7f3cc506c337ba", + "sha256": "0fg2skkzd9xn42a5jdxg69bjg0jw26p5jrq6i5v815vgisxfgjbv", + "fetcher": "github", + "repo": "emacs-php/phpstan.el", + "unstable": { + "version": [ + 20200415, + 1637 + ], + "deps": [ + "phpstan" + ], + "commit": "2f715a186c5fe6576de83d4c0b64a37e2bfce101", + "sha256": "03ix2s068pzmybj0fcb08dlfgdqw0pmqhbdf4id2077f67bfad0w" + }, + "stable": { + "version": [ + 0, + 5, + 0 + ], + "deps": [ + "phpstan" + ], + "commit": "bf9e82a63f2ccb12af02c9e79a83e7989eeb7cb1", + "sha256": "15kv5xv6lcfgf048wr2zsnpvrplbxypy3wq56zvrzbq18hwprqg1" + } + }, { "ename": "flymake-puppet", "commit": "302dbe34e7949da9c65e9c7bf2ab924db91b968f", @@ -34980,8 +35143,8 @@ 20200329, 2005 ], - "commit": "bb413006afc23105a0f84df6fb82504a06483a55", - "sha256": "09cqn0255pxim34v5zfypbzr4clfd2ajlsyxpc9h64wg6v9876y5" + "commit": "78956f0e5bb9c4d35989657a55929e8e3f5691e6", + "sha256": "068mx5p4drwgppy4ry1rfq6qi79w6d82b4rnpl2jm37grsg94lix" } }, { @@ -35097,8 +35260,8 @@ 20200215, 1408 ], - "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87", - "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp" + "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", + "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" }, "stable": { "version": [ @@ -35125,8 +35288,8 @@ "avy-menu", "flyspell-correct" ], - "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87", - "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp" + "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", + "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" }, "stable": { "version": [ @@ -35157,8 +35320,8 @@ "flyspell-correct", "helm" ], - "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87", - "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp" + "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", + "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" }, "stable": { "version": [ @@ -35189,8 +35352,8 @@ "flyspell-correct", "ivy" ], - "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87", - "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp" + "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", + "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" }, "stable": { "version": [ @@ -35221,8 +35384,8 @@ "flyspell-correct", "popup" ], - "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87", - "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp" + "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", + "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" }, "stable": { "version": [ @@ -35505,8 +35668,8 @@ 20200321, 533 ], - "commit": "1a54066611da213626ab69ea426ba3c63ece3438", - "sha256": "1c7n099b8dkrcrvxsva7da1m1z01p0acbyj271lix9w331h9gbf6" + "commit": "9f82d31f9f0fb06bbc2ce18e21e79d1eabbe6c5e", + "sha256": "0b6g36frvp1i92qn8rv3dcm8sxiw5yvbvhl7j58x2xwvawn79nfd" } }, { @@ -35710,8 +35873,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20200309, - 937 + 20200425, + 2225 ], "deps": [ "closql", @@ -35723,8 +35886,8 @@ "markdown-mode", "transient" ], - "commit": "2e2d26cf428012f0ece53a81cde02179e72648aa", - "sha256": "0mpim6699cda3ds8gv1f2y021gssjrw9rg7w9b8h1ifhrl54x0qn" + "commit": "e2da80660a0550f613400ce3b238025589800417", + "sha256": "0m80w0qh6icj365pcg9d0kb2nvmv48c3874wy15mjcilzb6i97av" }, "stable": { "version": [ @@ -35758,8 +35921,8 @@ 20160102, 2253 ], - "commit": "799ca3e72b20a59a755a094b8cead57f654f3170", - "sha256": "0nj056x87gcpdqkgx3li5syp6wbj58a1mw2aqa48zflbqwyvs03i" + "commit": "15bbcb2d2df21910af3b9686b671e0c7d1c93b26", + "sha256": "1vfnpm6kp4xf3qc73i41rg73bhbym1sd4z6jam4k1f44iny0zqxz" }, "stable": { "version": [ @@ -35779,15 +35942,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20200219, - 1628 + 20200422, + 1731 ], "deps": [ "cl-lib", "language-id" ], - "commit": "8c8c47a863a397d947999fff4358caf20bafca0a", - "sha256": "0ayb57p114z64ppf74g2wpm2g2iga2vrl8rhay7fnfv1j2i4xjss" + "commit": "c157b57e963da0b44a079b0477d6c742e9c5a10b", + "sha256": "15pqff80ydcvkvbiyi50aix5mnwgrhvvajk60i6cwgkb2xghs20r" }, "stable": { "version": [ @@ -35924,26 +36087,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20200312, - 1315 + 20200416, + 841 ], "deps": [ "seq" ], - "commit": "92fdd9c8a5e405cd77ee6f338351b9ebc8976038", - "sha256": "0wa28wdd3kgxwaaiay0mha4w87x2p8z01vfn93y1256awx8kgg78" + "commit": "5998d977ca84930e124558007dc65370164ed960", + "sha256": "1hmc3pacscr0f02cw6hbbv444k07k5gf1909lyz8jpfr5r5wi2in" }, "stable": { "version": [ 3, - 0, - 3 + 1, + 0 ], "deps": [ "seq" ], - "commit": "974c9df2c73cf52030dfe0c771d97d3d37bd08e4", - "sha256": "0103rnq9x07a11930jgcg04ayd7npri9wd2j2ghr510y7sm86p0d" + "commit": "9027c6f2b2a2d7d64501e55ff3531cdef26c463d", + "sha256": "08giwg0jwk8zzj2i4cm08322qr6znrnv9a49za7c6j47bykpwj6s" } }, { @@ -36210,20 +36373,50 @@ "repo": "rnkn/freeze-it", "unstable": { "version": [ - 20200322, - 700 + 20200416, + 1605 ], - "commit": "0e2ddd99dc1211800d55e874c1bd078f879e0d9c", - "sha256": "08jdlwn8da8cgkpwpx8834rhx8is5iigq0cv3abbydmz5lrd72nl" + "commit": "b93af18633bc783c2cb8443808aeeaaca33e1146", + "sha256": "0gljal6hmchx5zyd268kwlqn8pqq206y8a89ff7kq6qaql88mngn" + }, + "stable": { + "version": [ + 0, + 2, + 1 + ], + "commit": "b93af18633bc783c2cb8443808aeeaaca33e1146", + "sha256": "0gljal6hmchx5zyd268kwlqn8pqq206y8a89ff7kq6qaql88mngn" + } + }, + { + "ename": "friendly-tramp-path", + "commit": "cb18ad238792570e5ef825a101059bfdc293949f", + "sha256": "120g9w1l4i544km5d1jx5g4vsfb92lizn7ibxl767zffgahqhbdf", + "fetcher": "github", + "repo": "p3r7/friendly-tramp-path", + "unstable": { + "version": [ + 20200419, + 851 + ], + "deps": [ + "cl-lib" + ], + "commit": "ce7d15dd96300d376d483d685aa4a34357da8d6a", + "sha256": "01v311c8w86s954adl1ncmbhmk07acm8pnak70gn93dpz77vl9g4" }, "stable": { "version": [ 0, 1, - 2 + 0 ], - "commit": "cf53f31e4f266b7f0b12e091de074e763c7d565b", - "sha256": "0drznbwci4swfxmmdvkm14qmpb9y9pykyflhh69l5fdxiigpdlb8" + "deps": [ + "cl-lib" + ], + "commit": "be2714118876c592fae199aaa877c49475b6176a", + "sha256": "1z1rcm8pc8p2d7zzf02nms6cz2ik8y1b95a58lqxlp8n75rz4c5i" } }, { @@ -36349,8 +36542,8 @@ "repo": "FStarLang/fstar-mode.el", "unstable": { "version": [ - 20200305, - 1654 + 20200424, + 2235 ], "deps": [ "company", @@ -36360,8 +36553,8 @@ "quick-peek", "yasnippet" ], - "commit": "aaaf2568881d3e5e08f8cbd04a9add49912552ad", - "sha256": "1wqbfz8sbvfl7v31a1i6mc6c8p5fyp8yflj87lavpk1d0h5dl8ly" + "commit": "d8b586518f32d4acde049852d81902670d1ee277", + "sha256": "0av315lf58nwgvix100bj279mq2pm175vwc5dip19gn73bq4d9vi" }, "stable": { "version": [ @@ -36391,8 +36584,8 @@ "deps": [ "cl-lib" ], - "commit": "2d85dafa9872fa34b463f6473e61a1ed71c17788", - "sha256": "0zwrlvp2i0n4imba84cc0hsivyaxv4sy98bsqfwpy65xm94h0d96" + "commit": "298bbddeb1dcc135c075d484f283f409f0d0d055", + "sha256": "199a1gs7ja9l3bc2sw9cwv9jv0zvqqaa2pp6hibbyl00rsk2xs58" }, "stable": { "version": [ @@ -36545,14 +36738,14 @@ "repo": "diku-dk/futhark-mode", "unstable": { "version": [ - 20200123, - 931 + 20200415, + 1228 ], "deps": [ "cl-lib" ], - "commit": "ca22b1e5fe46125b968c3da46e0bc9780b32e346", - "sha256": "1zkqlacxmiwprx8xbnp6phf3gh3faxghxv0j90019k0g3dq9l3ws" + "commit": "2befd490ce7d78a43d001b4bb0bd4300d086d645", + "sha256": "0p4ii7mbspx1fsmzx9n8z2siq9n8ixpisxs388ndd2ccp7x3k6nm" } }, { @@ -36821,11 +37014,11 @@ "repo": "koral/gcmh", "unstable": { "version": [ - 20200315, - 950 + 20200409, + 1456 ], - "commit": "9e241e0a9f921b04407050a0f0fada3d0c3b254a", - "sha256": "0k2qwkj0lacdb5kmvx2ip17wn7bg01y5166bi9lk9zzk3jbh70d3" + "commit": "b1bde5089169a74f62033d027e06e98cbeedd43f", + "sha256": "0k0gh1dr3hipg73mpgkw6hlg27c7c5r8aa61p4vj2rpmf6k90pc5" } }, { @@ -36836,20 +37029,20 @@ "repo": "GDQuest/emacs-gdscript-mode", "unstable": { "version": [ - 20200328, - 1820 + 20200404, + 112 ], - "commit": "56a864ecff99ae314b838b755cf26af66f4f9323", - "sha256": "0mlvvagdr2bj13ibms1vq8p9zp10ag4qhyfklkj93lg6j744qav4" + "commit": "9a74dd3b6cfe73dd7510faf26ee7bc14e3c7dbc6", + "sha256": "1rrwhb6ak0gajcci4kk7fdyfm0c5wfhj6zys9f4m5xjya9pb3wb4" }, "stable": { "version": [ 1, - 0, - 2 + 1, + 0 ], - "commit": "361439f28bd10649c9f58f1d3290b4ee63ee4f54", - "sha256": "1ymblv04as076yfi3inmc3s66j0nqslqvfx34s3da6s8g8zi0ash" + "commit": "86577f81dc2640d5388565d0430b4df241bdd38e", + "sha256": "0cpfdbza3gh1s6y5igs51b1m7g7dfa7jszjfawz3v2g49p4a5m2d" } }, { @@ -36937,11 +37130,11 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20200327, - 2213 + 20200419, + 2111 ], - "commit": "9b45785173dc61a2897b17edf27df9407d1d94ce", - "sha256": "0r21fs262jzzpilynnlnqc9bd42fbq7hn522dfnx93jjmni35kjc" + "commit": "07912e512a7bf1507d0dd5ba3774b684c5ac3287", + "sha256": "0w2rhk04x4wqcx6brfacqx3r7whyzdnbgwzfgmba0xsrpb2x7rpz" }, "stable": { "version": [ @@ -36961,14 +37154,14 @@ "repo": "noctuid/general.el", "unstable": { "version": [ - 20200320, - 2340 + 20200425, + 1425 ], "deps": [ "cl-lib" ], - "commit": "14ad4c888b34eb8ebd946d26917aaf2dd4fcce29", - "sha256": "09hp8aavimlhasnxl5z74pk6afvjpcpd6fpv7j2amdmyhbflxv9h" + "commit": "42e38034cd2305fa7432866323c923979d8f9b06", + "sha256": "0aalp4x5gp0yhv037ymspsj4n3vqzxld0c1nk8ihl50k6krl4kxy" } }, { @@ -37384,15 +37577,15 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20200309, - 936 + 20200425, + 2233 ], "deps": [ "let-alist", "treepy" ], - "commit": "a8bf337534ec583906db77a3d56f7d1b84bda952", - "sha256": "0cpbz79k6q5ang47qw4j3i99qz093xc40k8lsc9j21g07fihxiv5" + "commit": "03d2546614619f42ac2983e79d0069ca4cbcfbfc", + "sha256": "0j0j86cbv87i2wfcvcyjb53wdzd003770krlnpx0gjkq036vvkwk" }, "stable": { "version": [ @@ -37668,15 +37861,15 @@ "repo": "walseb/git-backup-ivy", "unstable": { "version": [ - 20191224, - 1254 + 20200424, + 1049 ], "deps": [ "git-backup", "ivy" ], - "commit": "0a6226c37b63660e6b246bc9bbcf919e44270a99", - "sha256": "081dfbxs417zv2dds4i16ak6dri41cfn012sbfmalp8qslpclb6z" + "commit": "d9361c9ad903e0d58f25ccebad99d9a753f1937a", + "sha256": "0jkkajv0scbp91al18fqqyvvcda2z6wkkbz0p1rcwzap5g96b7ag" } }, { @@ -37743,8 +37936,8 @@ "transient", "with-editor" ], - "commit": "236c44518d30c43c7035be32f02ba615d148b5ef", - "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6" + "commit": "8de6ecf5c5c840f8a964c3e5bd4d7a1aedf04e10", + "sha256": "0fwaasr7g4qj9l8dxcy1228p2rpb2xy16w2g27gqdzyd6a5sc2jw" }, "stable": { "version": [ @@ -38015,11 +38208,11 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20191119, - 1420 + 20200331, + 2329 ], - "commit": "2fb0e4be8801e7d53e02fc7f14ec0f9a14586ba2", - "sha256": "1y5qw5iyblj14zjvw4is51qyvmy2z0f0iba7cqr628zn9q1fqll6" + "commit": "7142ec898f0cb97aa5d1a68da7957b4710bbfa87", + "sha256": "0xcgzhlxd7ycfxmbgkwm04pdfjysygkka3jis4p45zy6mrackn4c" }, "stable": { "version": [ @@ -38811,11 +39004,11 @@ "repo": "jimhourihan/glsl-mode", "unstable": { "version": [ - 20191017, - 2148 + 20200420, + 1839 ], - "commit": "43d906688a8e2fe650005806eb69bea131d9321a", - "sha256": "1783gimn1adfgs2xybz15nrx8wsz1xb4xk8mxrc18hyci7fwk04r" + "commit": "9bf168017eb3af7a396165a79a7b870572d59666", + "sha256": "13k4am1bk20b6pncg145g4p9abw42ksgaj0zq2bz7b4b8pnfdzp0" } }, { @@ -39272,8 +39465,8 @@ "deps": [ "auto-complete" ], - "commit": "939b4a677f2f843ea13d9dd90206d57111f0ceb9", - "sha256": "1yfw8y6czkqgxpyfdxwvkcrsmwbca7l0lr4jqmnpmm5m5rylcwr9" + "commit": "4acdcbdea79de6b3dee1c637eca5cbea0fdbe37c", + "sha256": "0i1hc089gb6a4mcgg56vn5l0q96wrlza2n08l4349s3dc2j559fb" }, "stable": { "version": [ @@ -39517,8 +39710,8 @@ "cl-lib", "go-mode" ], - "commit": "85a20dac6cee1e4bcfff554a665bcb7cd21dc0d9", - "sha256": "09xivjss1vlpqyp8cbv6652sgy3rxp00ml7f76prx22cwfpq67db" + "commit": "734d5232455ffde088021ea5908849ac570e890f", + "sha256": "0228l3s3afmvm4cy3vwcpz3g2gkmyhqdq2kwwn1n5dsha8fzbdps" }, "stable": { "version": [ @@ -39610,11 +39803,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20200309, - 303 + 20200425, + 1740 ], - "commit": "85a20dac6cee1e4bcfff554a665bcb7cd21dc0d9", - "sha256": "09xivjss1vlpqyp8cbv6652sgy3rxp00ml7f76prx22cwfpq67db" + "commit": "734d5232455ffde088021ea5908849ac570e890f", + "sha256": "0228l3s3afmvm4cy3vwcpz3g2gkmyhqdq2kwwn1n5dsha8fzbdps" }, "stable": { "version": [ @@ -39718,8 +39911,8 @@ "deps": [ "go-mode" ], - "commit": "85a20dac6cee1e4bcfff554a665bcb7cd21dc0d9", - "sha256": "09xivjss1vlpqyp8cbv6652sgy3rxp00ml7f76prx22cwfpq67db" + "commit": "734d5232455ffde088021ea5908849ac570e890f", + "sha256": "0228l3s3afmvm4cy3vwcpz3g2gkmyhqdq2kwwn1n5dsha8fzbdps" }, "stable": { "version": [ @@ -39850,20 +40043,20 @@ "repo": "emacsorphanage/god-mode", "unstable": { "version": [ - 20200329, - 209 + 20200413, + 2144 ], - "commit": "b82ce18ae4db2078c03d92946e21808c1f325f15", - "sha256": "1a490s5s8884rhb35gw4dxdzk2djvdiw4zsp9866sfrwh7xcama4" + "commit": "1eb6ef3a4f67a805c5d6deb1e3895b6c853707d7", + "sha256": "0kqw6w72prhxbqvxccbrc80q82yfif0y99nfgqd60rfk9mpl369k" }, "stable": { "version": [ 2, 16, - 0 + 2 ], - "commit": "b82ce18ae4db2078c03d92946e21808c1f325f15", - "sha256": "1a490s5s8884rhb35gw4dxdzk2djvdiw4zsp9866sfrwh7xcama4" + "commit": "1eb6ef3a4f67a805c5d6deb1e3895b6c853707d7", + "sha256": "0kqw6w72prhxbqvxccbrc80q82yfif0y99nfgqd60rfk9mpl369k" } }, { @@ -39939,11 +40132,11 @@ "repo": "jixiuf/golden-ratio-scroll-screen", "unstable": { "version": [ - 20170224, - 229 + 20200419, + 451 ], - "commit": "44e947194d3e5cbe0fd2f3c4886a4e6e1a0c0791", - "sha256": "1wd19jskpp9w0lrg0ky3hvnliq9l09kmxy59hdp06hsdmvr31jwv" + "commit": "1b6ff0e3e8822423335d3f7d88c1fcb4cf43ce42", + "sha256": "0kniznqdbaim9llf76zi0cbwpa21xcf07w970hrspffjpzkcadnv" } }, { @@ -40038,8 +40231,8 @@ 20180130, 1736 ], - "commit": "305ac8725a166ed42e3f5dd3f80d6de2cf840ef1", - "sha256": "05znbhy98pyc6r7dii8drw4p8vy6f5b3zk0hmlw8w73vcwia59ay" + "commit": "43f20c361143beba2e0f3f737597f2f1f8725160", + "sha256": "0md3y2vr113sdgyf5q692fzif10bl0is96ly2hfgh6z27awb76l6" } }, { @@ -40401,8 +40594,8 @@ "magit-popup", "s" ], - "commit": "a01612b9850519603bfef116bd7bddd9c8e3b975", - "sha256": "0kbnhm6m7sf1j63yykrn4p7ykkjvvair3x95wi4b59icc6ydvwv7" + "commit": "3decde69e9aa0bcc8a831e3f87acae26c2151c4a", + "sha256": "1zvnhcbqqiv8671x3zizrpm789ci8z74xb6qr2ik6h4z79agmri8" }, "stable": { "version": [ @@ -41325,6 +41518,30 @@ "sha256": "1nl2ji5wvmfzchxpnmsgxn4v2lybyymyyh99lw3riqg6gb0phl9l" } }, + { + "ename": "gtk-variant", + "commit": "12bcbebf4b604e29cee443825c56336f5249e088", + "sha256": "1dcj0k2j89yx7k0cqqinb4xnhl0i2yivlvrb87xbj89zbijss967", + "fetcher": "github", + "repo": "bepvte/gtk-variant.el", + "unstable": { + "version": [ + 20200416, + 2136 + ], + "commit": "4462a5ab071ec001734e92d1ac2e5fa9721b94bd", + "sha256": "0v2h846k9xv47am66nv4piqhvn74xijhp2bq84v3wpls4msvfk70" + }, + "stable": { + "version": [ + 1, + 0, + 4 + ], + "commit": "4462a5ab071ec001734e92d1ac2e5fa9721b94bd", + "sha256": "0v2h846k9xv47am66nv4piqhvn74xijhp2bq84v3wpls4msvfk70" + } + }, { "ename": "guess-language", "commit": "6e78cb707943fcaaba0414d7af2af717efce84d0", @@ -41592,14 +41809,14 @@ "repo": "hhvm/hack-mode", "unstable": { "version": [ - 20191218, - 1628 + 20200421, + 157 ], "deps": [ "s" ], - "commit": "fd6a661b091490920804d043303596f9e60a5dd7", - "sha256": "1x4nymp53rdm1d0jjkz0mha4d8y8wzmakf65d56fn5mnziqh2l5d" + "commit": "330df61f7297344cff9cf9e2d802a4d041279de3", + "sha256": "00g9h96kb9d3qg544x9143hx4nc5crw67cq93ip4mrh3d86rkpc1" }, "stable": { "version": [ @@ -42043,11 +42260,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20200315, - 140 + 20200408, + 247 ], - "commit": "7032966ee76b23520001af916d9184b4a2d7a689", - "sha256": "0mk2fw33j1k8m6w0b6p15n7zl52kbwjda0p2zzvxbhlk3cvqmgd0" + "commit": "bbdbc0e9231f49a45ce787ebfb3f2b019615bf61", + "sha256": "0qln2zc4zx8w4ffplp6b17sksg578x61hyvwv1l79pc8bmpgn0ww" }, "stable": { "version": [ @@ -42377,30 +42594,30 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200325, - 757 + 20200426, + 534 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "0181b7ef468def6ef5547c7241b5c4c854816166", - "sha256": "09yvc6jpcb93fwa5blgzaqpk3f3v5h6m2hxajih1y6fxrdaxgnhq" + "commit": "3fddd8c425c918074a4bda9982ce90c29e45adbd", + "sha256": "1vhdiwvv2s9gw6mh4dr1blqlyy1k0cvm4wx833cwzgdg5iakan1f" }, "stable": { "version": [ 3, 6, - 0 + 1 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "ac3c49be00df1efecc76ef0b33db2884039579b8", - "sha256": "0miq2q52pbicijp7pmj0widk252qixswywc03d120s4hya2b7vd7" + "commit": "55281e1390bae54310dc880ae3805e0595d5c1bd", + "sha256": "1sghq7xjd4a9ysh3cywd5rss9y47rwk82y86cwh1g7p0jv89gqaf" } }, { @@ -42500,14 +42717,14 @@ "repo": "emacsorphanage/helm-ag", "unstable": { "version": [ - 20200328, - 533 + 20200426, + 1427 ], "deps": [ "helm" ], - "commit": "ad3ef038584007fbf1b7d6e727be1f18e39a8730", - "sha256": "06gjbc1rkxg13nb2hr3gm65zyzpxv77pvsz7b7c9i3qfw782zsax" + "commit": "6387437acf687a64af66138649f8604d65eb6789", + "sha256": "177grx9flqg6d9vcl2ln7gflvh3r2in8va39sgd7a4vl6qn2w1lh" }, "stable": { "version": [ @@ -42638,26 +42855,22 @@ }, { "ename": "helm-bibtex", - "commit": "f4118a7721435240cf8489daa4dd39369208855b", - "sha256": "037pqgyyb2grg88yfxx1r8yp4lrgz2fyzz9fbbp34l8s6vk3cp4z", + "commit": "873ae2af16e03c8e10494be3f0e7840eb27172a3", + "sha256": "0ciz4lczfv9b4n12jd9r5w81yj884pmi53xmm9cqzvrv3hh9n8hs", "fetcher": "github", "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20191028, - 1313 + 20200415, + 1311 ], "deps": [ - "biblio", + "bibtex-completion", "cl-lib", - "dash", - "f", - "helm", - "parsebib", - "s" + "helm" ], - "commit": "d4471232be26793fbf56c0ac3690b5f537c378b9", - "sha256": "1bkzhic6qckb267025il1r3xcpz99kisphxiafni1pxvf9jafr0j" + "commit": "1e5b50652d1f5189cfeb6b5ce3c4437e0239d4f5", + "sha256": "05xl3x98w4cr81zp04dcqy5xnims8x3k77qxzddcqcrvi9zjlfc7" }, "stable": { "version": [ @@ -42810,6 +43023,37 @@ "sha256": "1yr5prp9xvd73balxbn4yn52zah2advq1186ba5aanj436pal0fh" } }, + { + "ename": "helm-bufler", + "commit": "4ba5657f237eea9073a46a4127be5795be07c687", + "sha256": "0wb1ds3acc36hl7798phbvhygfljjc6br11lf4y3043q8v0lz6gi", + "fetcher": "github", + "repo": "alphapapa/bufler.el", + "unstable": { + "version": [ + 20200409, + 1253 + ], + "deps": [ + "bufler", + "helm" + ], + "commit": "b2b260e4f9e8ba76bb8b4d71344c7b75e05ac44f", + "sha256": "0ww7z2xz185i97wa1rnmqwlx2mvwx69hhlyi5m3sm0nkyckb2hjs" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "bufler", + "helm" + ], + "commit": "d6c79f04b7d288174d8294fb30488b567586364d", + "sha256": "0l35ssjry15wqcxnr8rf5lrv856pgnm0k2d4d6ag14ypjx9nfhw3" + } + }, { "ename": "helm-bundle-show", "commit": "2f10f7387cca102696c38af1d8dc0fe5da5e366f", @@ -43232,26 +43476,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200306, - 1417 + 20200424, + 607 ], "deps": [ "async" ], - "commit": "0181b7ef468def6ef5547c7241b5c4c854816166", - "sha256": "09yvc6jpcb93fwa5blgzaqpk3f3v5h6m2hxajih1y6fxrdaxgnhq" + "commit": "3fddd8c425c918074a4bda9982ce90c29e45adbd", + "sha256": "1vhdiwvv2s9gw6mh4dr1blqlyy1k0cvm4wx833cwzgdg5iakan1f" }, "stable": { "version": [ 3, 6, - 0 + 1 ], "deps": [ "async" ], - "commit": "ac3c49be00df1efecc76ef0b33db2884039579b8", - "sha256": "0miq2q52pbicijp7pmj0widk252qixswywc03d120s4hya2b7vd7" + "commit": "55281e1390bae54310dc880ae3805e0595d5c1bd", + "sha256": "1sghq7xjd4a9ysh3cywd5rss9y47rwk82y86cwh1g7p0jv89gqaf" } }, { @@ -43415,14 +43659,14 @@ "repo": "emacs-helm/helm-dictionary", "unstable": { "version": [ - 20191110, - 2202 + 20200406, + 1632 ], "deps": [ "helm" ], - "commit": "6a21ac1ba424ffa87b3b3e1b53d0fdd529844a28", - "sha256": "1qpcly4v7yf6ncp951gl1c18riln86xgyasf66n56qj26mfq8bhq" + "commit": "1dfec049c7851754a5967329a60e9e9a9f805423", + "sha256": "042rn38myq8b2024mdpisakmqysp34mmhvbdnw433vl9qxw6pikd" } }, { @@ -44430,14 +44674,14 @@ "repo": "emacsorphanage/helm-gtags", "unstable": { "version": [ - 20200321, - 1456 + 20200409, + 1559 ], "deps": [ "helm" ], - "commit": "ff4329fec2cc1f53b404054ddab4cd16faef7241", - "sha256": "14jjjk258hg2d47d8fgg6qb410ij16400anx5kcghi2680a92f2w" + "commit": "25b81d7774622911c1e95d9020209ae4ace1542b", + "sha256": "14k0yrf8p015gsgdgq8ykvrjjhd1brq2gsfx7m3jv0p789yxw7zk" }, "stable": { "version": [ @@ -44949,16 +45193,16 @@ "repo": "emacs-lsp/helm-lsp", "unstable": { "version": [ - 20200103, - 1659 + 20200420, + 1546 ], "deps": [ "dash", "helm", "lsp-mode" ], - "commit": "6f62659cc528b7e37ffcc8fb356633acd7031be8", - "sha256": "1gf3pzrcxrymlj677mghxf4yrqiqa90y3ip1g1f1h186wnwa2vcg" + "commit": "db243993ea70be6343949759b4f2c556d9130751", + "sha256": "0yaik74g61iyrg9inarl7s9r6vnj75q5vxzxc5bkl224w49hf5bh" } }, { @@ -45145,16 +45389,17 @@ "repo": "emacs-helm/helm-navi", "unstable": { "version": [ - 20181226, - 29 + 20200401, + 904 ], "deps": [ "helm", + "helm-org", "navi-mode", "s" ], - "commit": "3b9abcc39ce7c657bc2dcc054b850dc2a7cf0448", - "sha256": "1kxv8qx7s51fnzrslwqrgayqvyq30ycnb84p5qy7jf0rf69hxxjh" + "commit": "9bba79119edd8959d26484326c2f6868b7d942c0", + "sha256": "136shiqwr7k95gqywrlqqykx1pgpvyjbfzggwj7q1akqjslxfffn" } }, { @@ -45280,6 +45525,42 @@ "sha256": "0j3xz59hl84asv332fk94j5c06w3ix6b14zrkhxr8vb5ci1b2b1k" } }, + { + "ename": "helm-org-multi-wiki", + "commit": "536cf8f9a0b16e6e9bda30de67d0da44bb1b5877", + "sha256": "0wk08m6y2rvjbj28h3hqf9w3cgx0ykiv8z6f6kqjfpik8fl2bzbj", + "fetcher": "github", + "repo": "akirak/org-multi-wiki", + "unstable": { + "version": [ + 20200419, + 1833 + ], + "deps": [ + "dash", + "helm", + "helm-org", + "org-multi-wiki", + "org-ql" + ], + "commit": "aef5975ac18d7cb101c0fb688333cc241782a8a0", + "sha256": "1m3p839wkrvf7n2467czj03rljv43bk32p7vlzdp5zby22bn7nag" + }, + "stable": { + "version": [ + 0, + 4, + 0 + ], + "deps": [ + "dash", + "org-multi-wiki", + "org-ql" + ], + "commit": "80791ea872939df0578dc3a2992a2f7fd5618971", + "sha256": "0avg5xwnb3c9ylj9dqdcqmh8kykl98jsr6cl3rrivkj7l47i1rl0" + } + }, { "ename": "helm-org-rifle", "commit": "f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615", @@ -45999,8 +46280,8 @@ "helm", "rtags" ], - "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", - "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" + "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7", + "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3" }, "stable": { "version": [ @@ -46866,25 +47147,26 @@ "repo": "jjzmajic/hercules.el", "unstable": { "version": [ - 20190929, - 637 + 20200420, + 747 ], "deps": [ "which-key" ], - "commit": "031f8eec95240fc46481061f0f44822c0f7fe65e", - "sha256": "0snfmvri4cpmhrk5s4hxxlyzs3d58ysmqzaiyiz4979admdc1lmb" + "commit": "557da39878d0637395fdded91243b340c37eff7b", + "sha256": "1rp37rhkj8jm07dwr74vc68dhrbvyvrxjdavpb0h073ps9vl9dsc" }, "stable": { "version": [ 0, - 3 + 3, + 1 ], "deps": [ "which-key" ], - "commit": "031f8eec95240fc46481061f0f44822c0f7fe65e", - "sha256": "0snfmvri4cpmhrk5s4hxxlyzs3d58ysmqzaiyiz4979admdc1lmb" + "commit": "557da39878d0637395fdded91243b340c37eff7b", + "sha256": "1rp37rhkj8jm07dwr74vc68dhrbvyvrxjdavpb0h073ps9vl9dsc" } }, { @@ -46925,11 +47207,11 @@ "repo": "kuanyui/hexo.el", "unstable": { "version": [ - 20180815, - 219 + 20200416, + 1410 ], - "commit": "6bca18f911f6b2cd5c055ed73ddec98c385f9f86", - "sha256": "1zawz3nry832rhx80hyfqfs0gfw3hyrn96060zj3n75avx13rr8j" + "commit": "d600b6c2d51959f1331c8abf3953365544322afa", + "sha256": "07w6jlq3z5y019n5kplqn38gw60ffk2yx4vchp6qgif98lhcjiyr" } }, { @@ -47267,11 +47549,11 @@ "repo": "DarthFennec/highlight-indent-guides", "unstable": { "version": [ - 20190108, - 3 + 20200412, + 2328 ], - "commit": "0b10f38c54ffc099861ce8463e16a1b07ddbb203", - "sha256": "0fa41y9gdci60417zksj9bgjx1knwh781i3dfphkgr7qbx25iky7" + "commit": "1b12c7b440ff988c7237936187c1375ac4ddc7f4", + "sha256": "03dpwklrwbkminfds8v129w0i47p5mkwdyhlhv05a22xnmlanyrs" } }, { @@ -47345,16 +47627,16 @@ }, { "ename": "highlight-operators", - "commit": "e7bd74b7a3484e437c6db4f18613744ebae030f5", - "sha256": "00agrwp2i3mkacnp4qhqcnpwn5qlbj9qv97zrw7a7ldqga0vwvhn", - "fetcher": "bitbucket", + "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203", + "sha256": "1l0ci20r0qm4lc9chvvwxgyi3vg41n3ccj0csfgzilzicsvjs9ic", + "fetcher": "github", "repo": "jpkotta/highlight-operators", "unstable": { "version": [ 20170213, 2220 ], - "commit": "3938e88e78c592936fc8fc6eabbfaf7205a967c8", + "commit": "7696b43419505d6e3511ad2781f9f1dd3c55ef8c", "sha256": "1h5whrc1iphzq0g8x9mmkhjkbmbdg9i9bvr1y8zrwrs8za8k127y" } }, @@ -47729,11 +48011,11 @@ "repo": "ideasman42/emacs-hl-block-mode", "unstable": { "version": [ - 20200118, - 310 + 20200404, + 702 ], - "commit": "6a8f871d7aa5d0d58b7c6ede281f8f8965124c9e", - "sha256": "1jdqz3cfncka4rdqxa4qg7f8dhkwx2h9s16gd3xqjwh8xrpf9qnd" + "commit": "6dc75e71b0b179d7c087cf7de51823f5810d671a", + "sha256": "142nrxq72dkl45lq93c076nl2ifdl6vdgiydpcs4lwg0crja8qzl" } }, { @@ -47744,14 +48026,14 @@ "repo": "laishulu/hl-fill-column", "unstable": { "version": [ - 20190608, - 203 + 20200404, + 306 ], "deps": [ "names" ], - "commit": "612441e69772c24f9ce67ae73e47c84f29ee653d", - "sha256": "0b7770prp5sj4yinrdgzvblqky05vm245i40d38frcbghwqr2jl4" + "commit": "43cb3c35a92c912b7205b8a36f1ad0ec0a5b4a22", + "sha256": "0pf1hk21xbahccw1cdz95haqvhrf50cwg32qa36v9nammd37752z" } }, { @@ -48142,17 +48424,17 @@ 20200321, 1819 ], - "commit": "cf1cd543f68525732e0a9178c96a5f83a3cabc7f", - "sha256": "1yjfvx94ipps91fr8qbgafpkdp38yhlbzvggyi97g91ib2pxfals" + "commit": "6f9ed1a6517e3a43ef2deafc2f86c70b2abce008", + "sha256": "06vhxmvd57hf8kc21ncv6is9h70syjbzqwfcl3xf5zwcpc8vn13s" }, "stable": { "version": [ 1, 1, - 0 + 3 ], - "commit": "cf1cd543f68525732e0a9178c96a5f83a3cabc7f", - "sha256": "1yjfvx94ipps91fr8qbgafpkdp38yhlbzvggyi97g91ib2pxfals" + "commit": "6f9ed1a6517e3a43ef2deafc2f86c70b2abce008", + "sha256": "06vhxmvd57hf8kc21ncv6is9h70syjbzqwfcl3xf5zwcpc8vn13s" } }, { @@ -48538,11 +48820,11 @@ "repo": "humanoid-colors/emacs-humanoid-themes", "unstable": { "version": [ - 20200310, - 940 + 20200403, + 1939 ], - "commit": "57d7db70904faeeba9ccd0151e4ebf889403a40d", - "sha256": "0vxfq6gycgkfypyk91mwf2jg1mkldxpkd2v39j2nmlgbbw1ldaka" + "commit": "22c9a0987c7d746d7eb9fe850f93f232d91cae14", + "sha256": "1h3v76p17mzigwr0kpjlm5fgas4vvrm59g73l1699pnq1n1i5kgx" } }, { @@ -48979,6 +49261,21 @@ "sha256": "1mgn7b786j4hwq1ks012hxxgvrfn5rz90adi2j190gmjz60rc5g5" } }, + { + "ename": "icomplete-vertical", + "commit": "1a952162da476b4a0f496d9dc15d2d7a8d0964f6", + "sha256": "10rbsxp3jp8xyzcklpcc2zs0sv4pvvkqb7i96js9cp13nc9a7rgz", + "fetcher": "github", + "repo": "oantolin/icomplete-vertical", + "unstable": { + "version": [ + 20200417, + 1755 + ], + "commit": "a2ee9254085431ec9e5c88d522e2c700355003ef", + "sha256": "1bqnlvv1gvrjriazvzd3bq98r8ii6fqax0zznhvkl1ij5pf55a90" + } + }, { "ename": "icsql", "commit": "bf2a7e6572418d2f252d63068edd82c21eab874e", @@ -49651,11 +49948,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20190419, - 803 + 20200412, + 756 ], - "commit": "e2c100cdd67b7d82835d281ac2cd1bf4f374bc8f", - "sha256": "0wr3w2id95wx2rma8n1ifjrv9rx37ly26ijc5zi58id0yrip3hnc" + "commit": "0fb3d380866664c3ab543acede606d343c257406", + "sha256": "0fz3p41j6d6bwk95v626j7w1z4rvbdxms6a4azy9dfncplnbnih0" }, "stable": { "version": [ @@ -50030,16 +50327,16 @@ }, { "ename": "immortal-scratch", - "commit": "1f9f4a59d88106ddfee740653abd28e305f6dfe0", - "sha256": "0rxhaqivvjij59hhv3mh4wwrc0bl0xv144j1i237xhlvhxk6nnn6", - "fetcher": "bitbucket", + "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203", + "sha256": "00g68abnssf9xw233zs09jyjqbm0720isamc97rfr95d7wvrb2cr", + "fetcher": "github", "repo": "jpkotta/immortal-scratch", "unstable": { "version": [ 20160517, 2118 ], - "commit": "b354aba33d91a16a1878c87a931564505f6a0ee1", + "commit": "faeab0ad6c33c74c0cbd1dfcebffaa0690de40c6", "sha256": "1mx9f8pwnbrm6q9ngdyv64aqkw1izj83m0mf7zqlpww7yfhv1q9b" } }, @@ -50382,26 +50679,26 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20200118, - 1533 + 20200425, + 1648 ], "deps": [ "clojure-mode" ], - "commit": "49390d9dfde1d6354629b7662edd0ee422477f4a", - "sha256": "1jhh4ablxmwy4diai6jhki5ifiw1d0fcza7l9gy8iqqnd1yc2m25" + "commit": "f29861204ddbb032b425c7d693e8c006b7b027c6", + "sha256": "127kl64hqdy04qdbqr1xfzky3d8fzgbmp7z4hv6mjsc0p4s19azw" }, "stable": { "version": [ 2, - 1, + 2, 0 ], "deps": [ "clojure-mode" ], - "commit": "247ca70f8ba5104be292aea20fbde6adb37e359f", - "sha256": "11hyva006bc4hbhzjwb4brilm6fb7qfm5h66nl0gmmyva40y6412" + "commit": "ff72d667c2709166d19ac15a36f7aac3423cefa1", + "sha256": "07l8wkm0j6y2cj7bbb24x4rkjgf4q6ag0c1kcjs0sfmf1kaf14bk" } }, { @@ -50527,9 +50824,9 @@ }, { "ename": "info-buffer", - "commit": "3c44a1d69725b687444329d8af43c9799112b407", - "sha256": "1vkgkwgwym0j5xip7mai11anlpa2h7vd5m9i1xga1b23hcs9r1w4", - "fetcher": "github", + "commit": "6a7caa8c4fea7ef2211f01bc8340c660a6e6c5f3", + "sha256": "1si3sz34bmzcnqm4bc6nq7q2rmsyksh0610bn0r9frf12vakg28p", + "fetcher": "gitlab", "repo": "llvilanova/info-buffer", "unstable": { "version": [ @@ -50724,8 +51021,8 @@ 20191218, 2038 ], - "commit": "ed488fcbc8c015121a4b1acd8d08db229fd6735a", - "sha256": "14y87fvav10wjc88bbi1pwy8lxnqcdk4cahwhd9cg5bhsqwhm32m" + "commit": "8b648afaaab5eaddb7afcd602b8a76cbfb12412b", + "sha256": "0zfv4cnj11i7lagfyqmy4ch01szj450458yqffjn84hfikbf4q78" } }, { @@ -51578,11 +51875,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200319, - 1247 + 20200425, + 1938 ], - "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787", - "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q" + "commit": "47ec37b395cc1b304bbf91e804f138634544a9df", + "sha256": "05k2qjj4z8vljfppkphfhw67wvb5ij4nz4m158v89lx87y0phh74" }, "stable": { "version": [ @@ -51596,26 +51893,22 @@ }, { "ename": "ivy-bibtex", - "commit": "c23c09225c57a9b9abe0a0a770a9184ae2e58f7c", - "sha256": "0qni48s09lgzqr98r49dhrzpfqp9yfwga11h7vhqclscjvlalpc2", + "commit": "873ae2af16e03c8e10494be3f0e7840eb27172a3", + "sha256": "0ri0f8cfzyymx9jrw0bldwzx74bzdd5gc90yv16hv239g65scbvx", "fetcher": "github", "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20191028, - 1313 + 20200415, + 1311 ], "deps": [ - "biblio", + "bibtex-completion", "cl-lib", - "dash", - "f", - "parsebib", - "s", "swiper" ], - "commit": "d4471232be26793fbf56c0ac3690b5f537c378b9", - "sha256": "1bkzhic6qckb267025il1r3xcpz99kisphxiafni1pxvf9jafr0j" + "commit": "1e5b50652d1f5189cfeb6b5ce3c4437e0239d4f5", + "sha256": "05xl3x98w4cr81zp04dcqy5xnims8x3k77qxzddcqcrvi9zjlfc7" }, "stable": { "version": [ @@ -51889,15 +52182,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20191018, - 1251 + 20200421, + 1120 ], "deps": [ "hydra", "ivy" ], - "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787", - "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q" + "commit": "47ec37b395cc1b304bbf91e804f138634544a9df", + "sha256": "05k2qjj4z8vljfppkphfhw67wvb5ij4nz4m158v89lx87y0phh74" }, "stable": { "version": [ @@ -52061,15 +52354,15 @@ "repo": "tumashu/ivy-posframe", "unstable": { "version": [ - 20191226, - 637 + 20200331, + 536 ], "deps": [ "ivy", "posframe" ], - "commit": "6d697ff00ac406b919eba8665b1bc18a2b423cda", - "sha256": "05zhfhml8bd1zi1msy6zjkimirwq59i9fwa0mxy9l88si3dmb2hb" + "commit": "ae9bafe94fe6b77b6fe45766ae6172646f6a5d50", + "sha256": "1j6yns5d7lh2v1nfcznrirl7qicdli9csciqvfgj4gkh72a97pw1" } }, { @@ -52080,27 +52373,27 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20191224, - 220 + 20200415, + 1457 ], "deps": [ "ivy", "prescient" ], - "commit": "a194852e8022762843052e58a9d0fbdaa1df0fe5", - "sha256": "0da4s32fza42vdiqhh7cdim08by5i4909q93ivxkmgrmqfgdvz0p" + "commit": "0f4a89bdec61395138d968a38d375e63ccfbed63", + "sha256": "0nnf4y49pl9lcs90y5z6f02g1xwk1jjrl0qs7gcv6kpn0vn8kn0h" }, "stable": { "version": [ 4, - 0 + 1 ], "deps": [ "ivy", "prescient" ], - "commit": "ad9fbe8a17fe74b27a39bcc034f3da1865663387", - "sha256": "008hxy1vasnyz36wwg44gikpi80ng75hj85nrswk60b7z7cznbmr" + "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0", + "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3" } }, { @@ -52179,8 +52472,8 @@ "ivy", "rtags" ], - "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", - "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" + "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7", + "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3" }, "stable": { "version": [ @@ -52742,11 +53035,11 @@ "repo": "donderom/jazz-theme", "unstable": { "version": [ - 20170411, - 1411 + 20200417, + 2042 ], - "commit": "b1cb78a97cc4050f19d88a89e455c3e52d98240e", - "sha256": "0q9gfa40qh9wypvzg3xrv4kh6l51az9swb39133961dc8zrrrinm" + "commit": "b6694f09e10aa7df14836aac2f6615c32aa572dd", + "sha256": "1mjzfr2iz72n3ds6d0sqhqd2a5kcfn8d2kji9hqmydmplg247apx" } }, { @@ -53127,15 +53420,15 @@ "repo": "nyyManni/jiralib2", "unstable": { "version": [ - 20190927, - 2010 + 20200331, + 1940 ], "deps": [ "dash", "request" ], - "commit": "e913f8e4a994850d2cff18ce2b1f4177cac62c91", - "sha256": "022jndjwj0ml2w829id0nx43p24h6jpmilc12n9hiy4p80vjgy1y" + "commit": "ccf69e417911e091ec4c28d47d178ee63196c626", + "sha256": "170fjz7k9bk17qk7wrd56xw484xp8zckx635360pm0lfg4dvycpc" } }, { @@ -53757,14 +54050,14 @@ "repo": "skeeto/elisp-json-rpc", "unstable": { "version": [ - 20180104, - 1528 + 20200417, + 1629 ], "deps": [ "cl-lib" ], - "commit": "0992ae71964055230aa5d4d934a1b93b5dfd7eb4", - "sha256": "0nfccwxss3dz1ig6i3dig703xpsy90m7i96bm3pysrw2jfp4by9s" + "commit": "81a5a520072e20d18aeab2aac4d66c046b031e56", + "sha256": "13s18mjh6dpdxvva9yx4841rxvayxsvaj3vblxril6zm2wcqw2lm" } }, { @@ -53917,11 +54210,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20200324, - 1652 + 20200331, + 1658 ], - "commit": "1c122f1dff8dd2674245b2ce5e43b62504864bfd", - "sha256": "1ki42xx7vws8hb5vr1rgm2aih4qadf9qva8c4zq1hzmzq5j74jry" + "commit": "88d7d875ef32eb9fb76917c97150654bb91ac96a", + "sha256": "1zsqj31avcil6ml2clfxk7hnmg5fx014xqbbvhm17ii7ggky4qdn" }, "stable": { "version": [ @@ -53985,8 +54278,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20200327, - 602 + 20200423, + 2236 ], "deps": [ "cl-lib", @@ -53997,16 +54290,16 @@ "spinner", "vterm" ], - "commit": "c293f0db0203708e49139cb3b32e5826056ef972", - "sha256": "1fyw36c5f70j53jl03yk79pgr0x4q89mwyb77n9xcbscdhaxv3s2" + "commit": "e14c5590a79ee5529f574f6d4b0701d608e3e47b", + "sha256": "1xckmrdg41ai9qbpy9lxva4b1yq5jji9xff4fz9d4v72nqz7qn0w" }, "stable": { "version": [ 1, 0, 0, - -2, - 6 + -1, + 3 ], "deps": [ "cl-lib", @@ -54017,8 +54310,8 @@ "spinner", "vterm" ], - "commit": "596f59774edf213c4c4885992dda158de145be03", - "sha256": "0x8mlvq264ihhcdbkljhaij6hsvlh8s4fmrd8x970c7i3qi3hh7k" + "commit": "483d088853584a9f1603a062bce5705f0a7d99fe", + "sha256": "0k3lwq6r1y23gmlqx7a70psgzncf4k1zcykc7plzl79xas28rbrz" } }, { @@ -54153,8 +54446,8 @@ "repo": "dzop/emacs-jupyter", "unstable": { "version": [ - 20200329, - 828 + 20200417, + 1907 ], "deps": [ "cl-lib", @@ -54162,14 +54455,14 @@ "websocket", "zmq" ], - "commit": "b691d38483b6540d42d482a32d35eb54178e5658", - "sha256": "1lp6xg71snlsaffl7afrgjcs99l2axc5xrbkrncc50zjhxlimxrr" + "commit": "785edbbff65abb0c929dc2fbd8b8305c77fd529e", + "sha256": "1l1fd062dmig3mgkwixr4ly8x12z9skh5wj18hkyc84n7rwdar47" }, "stable": { "version": [ 0, 8, - 1 + 2 ], "deps": [ "cl-lib", @@ -54177,8 +54470,8 @@ "websocket", "zmq" ], - "commit": "6650dd35887e0e987385a4fb74b0a3c1661e149b", - "sha256": "152g22bm970px2mi3bfr6f59mvvbk2p8prv5vs5b9n0cmviqm50w" + "commit": "403c70c83cb3754c83da0932b0efaf5e72bdca9a", + "sha256": "1sr007wsl2y6wqpzkmv3inbpwhvgdcb2nmqzgfg7w1awapi2r13p" } }, { @@ -54766,11 +55059,11 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20200103, - 1239 + 20200418, + 2028 ], - "commit": "adb55497c0f16e90069d6e5e86b4f9f65f13624b", - "sha256": "1sprdfx0gvyqmq0fkf4bf56q3d8xxig2vxi38nzjx90llzvka35q" + "commit": "a912c4db1b88390f76b14e3b47ded314fdc8f48c", + "sha256": "07gfldj9y4jfvna1rqlr7w6y6daqdsvc1fb2m7acjn37bpmfrc3b" }, "stable": { "version": [ @@ -54863,14 +55156,14 @@ "repo": "tarsius/keymap-utils", "unstable": { "version": [ - 20191222, - 2258 + 20200413, + 1858 ], "deps": [ "cl-lib" ], - "commit": "0b9bb7f4959ca54f0827b202f513ec7508c11e0e", - "sha256": "11y1vdrj2isn00mh428ynzqnfxjsg0138wx0bs619j0pv6d3j09g" + "commit": "195e0ca5b1b9967faf94a3e5a634d8975b796705", + "sha256": "0ckv9mbqb1f2lp17sv3nxjwww4ph9v3bhlxwvchvkkdlbcg87i5n" }, "stable": { "version": [ @@ -55186,8 +55479,8 @@ 20180702, 2029 ], - "commit": "26228b202e821824afd8b2536234b26c23ae1b9d", - "sha256": "1329xyhriha7037lnsg8bf4xqkc20f0h3bv7xifm2i40ib0z3wlx" + "commit": "108a9151eb55b00f246613c511d88b7d58334595", + "sha256": "16wsaz29avmv9p3lfy0wjgxfwpszq8g3v9vl05azqkvjahf0lxib" }, "stable": { "version": [ @@ -55209,15 +55502,15 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20200315, - 332 + 20200426, + 637 ], "deps": [ "cl-lib", "request" ], - "commit": "d5e5780f3c933f873e1a19458c1ea269e9a57afe", - "sha256": "1p7fqw1j1kphvqb09c8s5lyqkxi7fd0gfpvyp0g0v0shdxydb9ix" + "commit": "6c6c44386e00d352d96064cb25b50e960cd1ba22", + "sha256": "16k93w5xylx3v5q1hlzmlmg1ydg88bklgi2idd3h6k3sbi4linvs" }, "stable": { "version": [ @@ -55474,16 +55767,16 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20200316, - 207 + 20200406, + 2112 ], "deps": [ "dash", "s", "transient" ], - "commit": "db3a999c028ffeeeb49936e8b921c364bf8f437e", - "sha256": "1ai33jma22agrxww6dcgsh6dbv5h36gixgs0b6n1q4d5v7k6d9q3" + "commit": "74db5b2e8418d0baeb8d3d0c274dfba3b9f32018", + "sha256": "1v8d8cvbqr12pglnd0lwijklfry5nz2j7nbv447bdkp5cp7y5f01" }, "stable": { "version": [ @@ -55509,8 +55802,8 @@ "evil", "kubel" ], - "commit": "db3a999c028ffeeeb49936e8b921c364bf8f437e", - "sha256": "1ai33jma22agrxww6dcgsh6dbv5h36gixgs0b6n1q4d5v7k6d9q3" + "commit": "74db5b2e8418d0baeb8d3d0c274dfba3b9f32018", + "sha256": "1v8d8cvbqr12pglnd0lwijklfry5nz2j7nbv447bdkp5cp7y5f01" }, "stable": { "version": [ @@ -55741,6 +56034,25 @@ "sha256": "1r8di1cmhcx2vfk3fsydx24spib1fi4wihnxa41favnkjzklz9jv" } }, + { + "ename": "lambdapi-mode", + "commit": "86702d5ad9279f03bdae5facb0b546e133c1fedd", + "sha256": "0ha9k0wc5snb5j0bpzjj91b7kd9ppsk8wbcj454wdkx87x73npdd", + "fetcher": "github", + "repo": "Deducteam/lambdapi", + "unstable": { + "version": [ + 20200423, + 1441 + ], + "deps": [ + "eglot", + "math-symbol-lists" + ], + "commit": "e205bd95602e120186a1e18ca825e6bbc3b6c4d1", + "sha256": "12y297h0hln7smy26nixqbjzy9nk1pwc2a7sab8dlzjkyz37zbfg" + } + }, { "ename": "lammps-mode", "commit": "8f5471a8e17977c17ad84b12a77fe80f37eda25e", @@ -55845,26 +56157,26 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20200321, - 724 + 20200409, + 607 ], "deps": [ "cl-lib" ], - "commit": "756f238b4fda63f6e0980f627869eb3c03d13f66", - "sha256": "18i1l7vpfa0y5zpy9hbcrkp79n30n7pkf0kasq718cj8ggczj120" + "commit": "bf17d80b6c4b58fb66cddc2b2914f57d48468e97", + "sha256": "1p21smbm3z6xfq0zk8pv62wppbbxx8mh994ax8b00kh16j7yhh2c" }, "stable": { "version": [ 0, - 4, - 2 + 5, + 1 ], "deps": [ "cl-lib" ], - "commit": "2c7b8599fc7fb56b0c820a9ae9f08053c71a8738", - "sha256": "10vrx3vfg8glrqngbyhwgkg5maib8ihv03psdd6qjhd0kik83498" + "commit": "bf17d80b6c4b58fb66cddc2b2914f57d48468e97", + "sha256": "1p21smbm3z6xfq0zk8pv62wppbbxx8mh994ax8b00kh16j7yhh2c" } }, { @@ -56197,20 +56509,40 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20200327, - 1411 + 20200422, + 644 ], - "commit": "199045bfe411afc30cb7c7d18b8a6b03edebeae1", - "sha256": "0apaa5w2zfycigdf8d7x3h8aw8m11mz8b6l2d546dlbvxr5yra28" + "commit": "27f21ed46a907a911222a72a31b41e414c956cfb", + "sha256": "041qgyskq39f91wjwr3d4ic5f1q7rvigannyyr9q4a2nbrn2dzhy" }, "stable": { "version": [ - 3, - 6, + 4, + 1, 0 ], - "commit": "c0a0fca2f9c83909c49729af75664411b4affab8", - "sha256": "18vrk19273xlg2nhkf7fvvhspnsfgk4dxa42x2q5599p9z7aph00" + "commit": "0841ab466a1542868b5448bb375ac9f0c33e2b3f", + "sha256": "0lpgkd2hhv98k7bi7zdplhlv0p3gbp4aq2cb0kyiwp2yxlnmkbzv" + } + }, + { + "ename": "leaf-convert", + "commit": "db2fa6cdfe98aea41eeafb59527050edfa9ef6e5", + "sha256": "1hw6imdf8f7939r077zccv0sa23xfcmwpbhjyb49g4nhzs5grpnv", + "fetcher": "github", + "repo": "conao3/leaf-convert.el", + "unstable": { + "version": [ + 20200415, + 1725 + ], + "deps": [ + "leaf", + "leaf-keywords", + "ppp" + ], + "commit": "2a8ec045d5d36e85e7deb2a46aefacaecf4bfafe", + "sha256": "133id4zd9dnx962r71m0irxvqs9dwaqnv5l4b8bjd3gigijah1dp" } }, { @@ -56221,14 +56553,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20200328, - 845 + 20200415, + 419 ], "deps": [ "leaf" ], - "commit": "3164f1f4b98be9efa9e28170cc9b8d14a10b3e56", - "sha256": "165x864rn9ha8dd3k62xgdp97fi961x75p6a7nldl0znzan65691" + "commit": "8c956f9e39cb589544a90861ac05b9b2ee4d320b", + "sha256": "0qy1hmg7ycbx898cx5cckmk5l8bysyvvdc5y2gl3bsxjwlv1wlrg" }, "stable": { "version": [ @@ -56240,6 +56572,56 @@ "sha256": "146h2n71f22gsqgh221ghx56qb9cq9qac3p77gxji535l2s9hbvk" } }, + { + "ename": "leaf-manager", + "commit": "e1d80f4662a0f77360244fc4b34f2076db4fd478", + "sha256": "1pr5yljhif5ffm63g6w6544cy6m15kljbdvxs87ivnisblbl4s21", + "fetcher": "github", + "repo": "conao3/leaf-manager.el", + "unstable": { + "version": [ + 20200414, + 543 + ], + "deps": [ + "leaf", + "leaf-convert", + "ppp" + ], + "commit": "f2ae35e02ebe218daa3076a0e9d83b4feadfbb0a", + "sha256": "09ll1vs9y6qmcl3qxil52mjw5bf7x896wjsij4kf0y5wd2fhra61" + } + }, + { + "ename": "leaf-tree", + "commit": "2e51160b1e5d277e66b9cff493b1f6b3c6f9ee28", + "sha256": "1xnqxwa978wbvx181v48zd37vckrj6p6wa7gas3fj648mwdjnii3", + "fetcher": "github", + "repo": "conao3/leaf-tree.el", + "unstable": { + "version": [ + 20200412, + 2355 + ], + "deps": [ + "imenu-list" + ], + "commit": "22f6c116cf1465c28d4a35d8a4587a8b614be175", + "sha256": "1bgjhrpq6a239v8vfi6i9qcbyrg76mpy4yykkb5da8hlp23idwy7" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "imenu-list" + ], + "commit": "22f6c116cf1465c28d4a35d8a4587a8b614be175", + "sha256": "1bgjhrpq6a239v8vfi6i9qcbyrg76mpy4yykkb5da8hlp23idwy7" + } + }, { "ename": "lean-mode", "commit": "42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde", @@ -56355,11 +56737,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20200328, - 1927 + 20200425, + 1517 ], - "commit": "bfa25a92d0cf63c5316b5aa8d50bd6809297ea9e", - "sha256": "1gx9brcwdmwhk0w2p93szdla5bgn25f1bsi9lna2l8ax1sn3l5kd" + "commit": "021eff5f88bf6392d7b3e511593e07471eb7833d", + "sha256": "0g4fgy39jp072b4ib0yxaxd3ndzxd1gx8inqqn9z9d7lxgc12l1g" }, "stable": { "version": [ @@ -56593,11 +56975,11 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20200122, - 1934 + 20200425, + 756 ], - "commit": "4bf80c2bb1e679b6e42e8d6547d6f33996830f73", - "sha256": "152731dwf0q1i1p5cjd3fwznl100vzsjk45ks1wxw4zv0w59q399" + "commit": "444d36526382466e6bcf11c58066bcef759e4c1f", + "sha256": "1768r5gb8cpz8a03rgswf5mny539w96hjw1rpvfqvj4zbv7bvd7n" } }, { @@ -56951,15 +57333,15 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20200205, - 2244 + 20200405, + 1607 ], "deps": [ "avy", "cl-lib" ], - "commit": "0d9cabcdb783ddc834ede6dcb1bed627c3acd303", - "sha256": "1ybzxc421wyy34w71lgbdfx7vgy9j6va9jjv1mkxa0zxqpdar974" + "commit": "7440704cacb5c0fab35fff8ec59d30fbea17f44a", + "sha256": "0j609j69lxyfvr2g89gdkjrk1vy0c1qq6m0p0ay468bh7l6crs7v" } }, { @@ -57092,6 +57474,35 @@ "sha256": "152vcp3mdlv33jf5va4rinl1d0k960gnfhbrqqrafazgx9j3ya8w" } }, + { + "ename": "lisp-local", + "commit": "2ec3f57a05e1b2e28ce33700d8ea98758b0bb69d", + "sha256": "1kzg2v0x0xf99mwd88bblbjfm9js4f40pibq6297xc9i5wrp3bv4", + "fetcher": "github", + "repo": "lispunion/emacs-lisp-local", + "unstable": { + "version": [ + 20200409, + 1330 + ], + "deps": [ + "cl-lib" + ], + "commit": "ff745a937f79df51cac0209b3cc3c35ce1d1fc61", + "sha256": "0ffwjv5fpzia772iavn9ily5m7l73pxf0amgqizzmbx12rx3kkhg" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "cl-lib" + ], + "commit": "ff745a937f79df51cac0209b3cc3c35ce1d1fc61", + "sha256": "0ffwjv5fpzia772iavn9ily5m7l73pxf0amgqizzmbx12rx3kkhg" + } + }, { "ename": "lispxmp", "commit": "ad10a684b4b2f01bc65883374f36fef156ff55d2", @@ -57115,8 +57526,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20200323, - 1616 + 20200425, + 1041 ], "deps": [ "ace-window", @@ -57125,8 +57536,8 @@ "iedit", "zoutline" ], - "commit": "b07ab5d8374c75bd1401b320fda17486325bc96d", - "sha256": "0gknqazf8pihn903518a5hmy5ggqmmq40rxz4kq2nfblpm6s5zkz" + "commit": "3c3f092824113278c57e93be1a2565f987ca0a4a", + "sha256": "1g0gmdq1n8l33ls4x06594hl8ayw8365ixgxp096d7qv7n5mxzn6" }, "stable": { "version": [ @@ -57521,11 +57932,20 @@ "repo": "lassik/emacs-live-preview", "unstable": { "version": [ - 20190415, - 2214 + 20200419, + 2143 ], - "commit": "bc3f79b58c4e428485b2cf800278004220f7433d", - "sha256": "1xlaq07wsgwzh3c0x50wgpj9i13nyk5ig45w1fx4156kmc69vjk8" + "commit": "7af1c74e0479c5b91d6368a4a3ff1342b83ef477", + "sha256": "0ifk0k6lfjzb0x0mgzh69jx0m166ljdg3ad69p51jw3m85c0wc6b" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "448d6d2b0912a46acd7d9a9b186b53425b1a7626", + "sha256": "1by62z8pch148ar47453bybg7q9drja73rq3pwcn9jb0yb6gn1xl" } }, { @@ -57536,20 +57956,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20200329, - 2216 + 20200401, + 420 ], - "commit": "18587cf78fa22d61a7365238da852be4a55c0656", - "sha256": "0141svf43miy1xyfc4wi3lrv0jyx97qbg9yhnxwlxz5i6gdrnyza" + "commit": "ab15012313217114d3f3940a6578df31ad223010", + "sha256": "1layngy8whcxgrpwhjdy41g194lkzq9z1wgv5rc4cg9smsbd6abi" }, "stable": { "version": [ 4, - 0, - 1 + 1, + 0 ], - "commit": "0cc8f0a31ef815e26eb7da314a516e908ba25838", - "sha256": "13wbsapnq5p75c27smzsgmmgzjbx7x2vbj7b7707bm6cakqjwdzv" + "commit": "0a0d881d8ff30a6007b998e9bb9dddb999cca16e", + "sha256": "1mdnbbd0kr5y4vr2xbay80v4n07gg5jkkn0k3ywypsin7fz5ihhl" } }, { @@ -57790,20 +58210,20 @@ "repo": "aki2o/log4e", "unstable": { "version": [ - 20170401, - 1304 + 20200420, + 745 ], - "commit": "c69424e407be0d9d0e54b427d8b18b1ac5a607e2", - "sha256": "1ng2cgqb83dhxm1hvsfdgzhfl80q9qkf07cr9hp7sxldy36hvxw8" + "commit": "7df0c1ff4656f8f993b87064b1567618eadb5546", + "sha256": "0dbnks76v05allzkhx9zmyqpn6sk5376n8k2rbpnaw6gmz1ib2fv" }, "stable": { "version": [ 0, 3, - 0 + 3 ], - "commit": "6592682ab7de0e3d1915aa4d3c53e083be79fbeb", - "sha256": "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022" + "commit": "7df0c1ff4656f8f993b87064b1567618eadb5546", + "sha256": "0dbnks76v05allzkhx9zmyqpn6sk5376n8k2rbpnaw6gmz1ib2fv" } }, { @@ -57932,27 +58352,28 @@ "repo": "doublep/logview", "unstable": { "version": [ - 20200125, - 1808 + 20200331, + 2111 ], "deps": [ "datetime", "extmap" ], - "commit": "638dbd4833c6387be3849d0097b5b1a14c619afb", - "sha256": "1arzz27vf6r62m7qhfq049n5zw1x2zbbrvmlnvbd9yaanlgrf0hc" + "commit": "c67298a215136617de60c9041904ee6a455dcd4f", + "sha256": "0bjgzh4z4bz4nr97cn9wd92brg7wik37c0vd3kfisdalxq2wrgn5" }, "stable": { "version": [ 0, - 13 + 13, + 1 ], "deps": [ "datetime", "extmap" ], - "commit": "638dbd4833c6387be3849d0097b5b1a14c619afb", - "sha256": "1arzz27vf6r62m7qhfq049n5zw1x2zbbrvmlnvbd9yaanlgrf0hc" + "commit": "c67298a215136617de60c9041904ee6a455dcd4f", + "sha256": "0bjgzh4z4bz4nr97cn9wd92brg7wik37c0vd3kfisdalxq2wrgn5" } }, { @@ -58100,6 +58521,50 @@ "sha256": "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh" } }, + { + "ename": "lsp-dart", + "commit": "acbba6bc6f1bb6e1153f1f75ca1dc025bb5a8993", + "sha256": "0q2x3i5yydnrplfgk8fcngdsxf1g1vz1jzkbwhiqf46wrv5vxwl3", + "fetcher": "github", + "repo": "emacs-lsp/lsp-dart", + "unstable": { + "version": [ + 20200423, + 2120 + ], + "deps": [ + "dap-mode", + "dart-mode", + "dash", + "f", + "ht", + "lsp-mode", + "lsp-treemacs", + "pkg-info" + ], + "commit": "a27d12209570fe10c60e55e0718123fc2e7f7e8f", + "sha256": "192nmx00s4hxylp4lqfycbi2g8aq7bbzmy70c1qxh7k5m24yigxj" + }, + "stable": { + "version": [ + 1, + 6, + 10 + ], + "deps": [ + "dap-mode", + "dart-mode", + "dash", + "f", + "ht", + "lsp-mode", + "lsp-treemacs", + "pkg-info" + ], + "commit": "a27d12209570fe10c60e55e0718123fc2e7f7e8f", + "sha256": "192nmx00s4hxylp4lqfycbi2g8aq7bbzmy70c1qxh7k5m24yigxj" + } + }, { "ename": "lsp-docker", "commit": "f592ec9b1d6a05e1e115d4b313be108c8e47ee67", @@ -58145,15 +58610,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20200309, - 2144 + 20200407, + 2216 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "582fa27c8894db888c92b5e53527b8deec82ea7f", - "sha256": "1jrvd8gnd7hc9xksryb35a2qzwwv7q6ncpcsb2l9ryfl5xd26i0a" + "commit": "f7d1f190ebacc96ddbc722e76730ca2db3c4ce38", + "sha256": "0wadna7y1ydx7d88rj15ylvy7gy2y30pr8wds6z10ds321qihs47" } }, { @@ -58182,16 +58647,16 @@ "repo": "emacs-lsp/lsp-ivy", "unstable": { "version": [ - 20200327, - 1007 + 20200418, + 1500 ], "deps": [ "dash", "ivy", "lsp-mode" ], - "commit": "39b90e7aef755b6e7756f2ae306d66b01cb4d18d", - "sha256": "1nss84rzpa1lwxx9sr28nsq1p6z82ifs7n7dh4zl6xm7rl7cr9pz" + "commit": "81e81ced99829358674c5a6bbe2c3e15cecd4ed8", + "sha256": "011126hz98qzb8zn1628z77j2s5w1hgvmb5saj2fr9wncgv1nax9" } }, { @@ -58202,8 +58667,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20200327, - 2019 + 20200425, + 1842 ], "deps": [ "dash", @@ -58215,8 +58680,8 @@ "request", "treemacs" ], - "commit": "5c6953441916c1e2e76ab0c41384ea6f57a18a5e", - "sha256": "13070b986jg1xd8chbr6am8915zg8wjk8mn9zlmn0d9k45zw1gsv" + "commit": "4f66649c2f02978145bd2e51ff8e6444b8631964", + "sha256": "08y81krxrfy9jm0qwmrszp1cainj37339503fqcnddaxgihvgnx1" }, "stable": { "version": [ @@ -58263,28 +58728,58 @@ "repo": "non-Jedi/lsp-julia", "unstable": { "version": [ - 20191011, - 1005 + 20200408, + 1412 ], "deps": [ "julia-mode", "lsp-mode" ], - "commit": "da66e78eb601b1652c3a9096e0ceea6b852aa6a0", - "sha256": "1xn7470lm322lqkkbg95qmzaadk85z3f2f3cx34iq00cmkkppcng" + "commit": "9f158a290168149fd301a1c1c2016600106ad5be", + "sha256": "077mrvxf8df4dppl3xqa7p3ksm3wcms64l306y7i5x878vyjgibv" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 0 ], "deps": [ "julia-mode", "lsp-mode" ], - "commit": "6b0d1a3f32c5e6c5b4c0993f30303569a9e9e9bd", - "sha256": "11jisy6161j4mpqyi06slfr3l7cmmnp7xc6701hszmvl935znn3l" + "commit": "9f158a290168149fd301a1c1c2016600106ad5be", + "sha256": "077mrvxf8df4dppl3xqa7p3ksm3wcms64l306y7i5x878vyjgibv" + } + }, + { + "ename": "lsp-latex", + "commit": "5e3c176af536155c8110006fd4bc63eeb2b2d12c", + "sha256": "01kn9faak6y1zfd1143yj453hl6rp1xykrg5rp196zf6brywj5a1", + "fetcher": "github", + "repo": "ROCKTAKEY/lsp-latex", + "unstable": { + "version": [ + 20200425, + 920 + ], + "deps": [ + "lsp-mode" + ], + "commit": "6c5b0d926857b16c7cf6eae3111709393845f523", + "sha256": "1qgryycjbvdk2i11qsdzrrlmhsvrpwfn3kw4g73zri4vfwz9cr44" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "lsp-mode" + ], + "commit": "d016440fe364a016935bd90ae07e22d9012bcf8f", + "sha256": "0a6nryx7vshh4k0amlw3w3fn4yr8zlqxq5py8vj3pz4zkcndhxks" } }, { @@ -58295,8 +58790,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20200329, - 1431 + 20200426, + 440 ], "deps": [ "dash", @@ -58307,8 +58802,8 @@ "markdown-mode", "spinner" ], - "commit": "9835e93f5526110bdeb164e42d8da16c1e39feb7", - "sha256": "0vd0vdbhfv31r63cygg40bzfj2v66k3zqd66hmkfzghhjl9d4q9f" + "commit": "9c1ab8adf1a7674e15b643a4dd3781c4bed6537f", + "sha256": "127b2j0gfrkzb4g5p7hfv505afllhspni4w91kwgccf4b1a9di99" }, "stable": { "version": [ @@ -58399,6 +58894,24 @@ "sha256": "0dd4n0c1rbqcy7hl6gb9nqjj7hfv4566d6ipdlnxjma0zjs84sjf" } }, + { + "ename": "lsp-pascal", + "commit": "41e4088e4b0cd99aafac40c83188112a680a65f7", + "sha256": "08zvh9r1plnirdp8qb0p8xfq0y7qx7awq98gn8340f5zbwh9006q", + "fetcher": "github", + "repo": "arjanadriaanse/lsp-pascal", + "unstable": { + "version": [ + 20200422, + 1610 + ], + "deps": [ + "lsp-mode" + ], + "commit": "b132bdf66748e4abe0d4140f6d061b1ccd56082a", + "sha256": "09v79p6wsp775ky1wy5fr0hwh5j33jvdvcarjs20zbdwnrs53am8" + } + }, { "ename": "lsp-pyre", "commit": "5b243c6ab0a441531e02dc8fdd88c023ba505d25", @@ -58425,15 +58938,15 @@ "repo": "emacs-lsp/lsp-python-ms", "unstable": { "version": [ - 20200223, - 2136 + 20200425, + 555 ], "deps": [ "cl-lib", "lsp-mode" ], - "commit": "5d0c799099aa5810858174f390e28fff3894bc06", - "sha256": "002h0i93blsv092pnfmzsfx0pj98r9glki0ki9n7gxg1z3nb0ybp" + "commit": "19feb4aaaa03382e5d9841f237dd1685d8fe2994", + "sha256": "040qahn9h30n44ik0yrcdysx9lhvdnjxh1wj5nzylmzblxz9s2ga" }, "stable": { "version": [ @@ -58494,8 +59007,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20200220, - 534 + 20200414, + 407 ], "deps": [ "dash", @@ -58505,8 +59018,8 @@ "lsp-mode", "treemacs" ], - "commit": "2e3606eebfa8bd909b45b88e59d8eecc6afea4a2", - "sha256": "08xpf677jj1cnfkbpb148h3wld8lvlarp2yq89539nfcmajx53ch" + "commit": "9d1a42b7d7abb112035f05f50ffde9834da034ae", + "sha256": "1kbr2ndbg0lqjcnsyvmpv513kzj3gy0kd0wa18ixh96i92a2znar" } }, { @@ -58517,8 +59030,8 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20200311, - 1837 + 20200402, + 839 ], "deps": [ "dash", @@ -58526,8 +59039,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "134d9b725d21f8889f3dc72dddc418c6c6561f0e", - "sha256": "1ajza32nj4l5m0x9kghlwc2plavd507wajna6cdk5z276lyrn38a" + "commit": "242dfe859c3497c456eaacfd84942e12419529fe", + "sha256": "1sx4nn6mkqhxp67jvh8pp0i4g26rzyvlq2b59r7ipmxh91c2a4fh" }, "stable": { "version": [ @@ -58552,11 +59065,11 @@ "repo": "immerrr/lua-mode", "unstable": { "version": [ - 20191204, - 1434 + 20200405, + 1305 ], - "commit": "1f596a93b3f1caadd7bba01030f8c179b029600b", - "sha256": "0swnan2v2lc7s1jsnmkyzv7gajx08akgm6dvbsgm5hzp0mjbbpy4" + "commit": "658bf8f6c2bdcfe41cd14f5fb651563b41d0fbaa", + "sha256": "1qaqp2s5fnb2zz3bzc1yx79ilqxrf04lmd5gkk56nka4flyslp80" }, "stable": { "version": [ @@ -58607,14 +59120,14 @@ "repo": "sjbach/lusty-emacs", "unstable": { "version": [ - 20200115, - 1413 + 20200415, + 1456 ], "deps": [ "s" ], - "commit": "3f4be19e0c466399c680a355c402b09792123e4d", - "sha256": "1915w43dwvqkklxdh1scy4yxzmalyyrx76iy9wl024svwjq3i0np" + "commit": "1b7053b41083666c6805bcaeb55ece6dcc0d77cb", + "sha256": "1y3nzp6rpg7anv5xscbp4lzmfdvzffcxha9vx3mrclhjg6giz510" }, "stable": { "version": [ @@ -58673,26 +59186,26 @@ "repo": "montag451/lxc-tramp", "unstable": { "version": [ - 20200321, - 1815 + 20200414, + 1445 ], "deps": [ "cl-lib" ], - "commit": "ad03a98386d4cdb0df3eb323ecaab8fe6d0942c6", - "sha256": "1x43na4m7krkhhsvvync9k0rk4lxdakl52n43aafyx43zgv5zk8y" + "commit": "1585e55a5deb89e2f4e30a0ad9e0f121d1e0ebcb", + "sha256": "1zs4wcbxqx8275j2q1118ipqw7532cd6cdy2whw22ck4z5w47vfg" }, "stable": { "version": [ + 1, 0, - 2, 0 ], "deps": [ "cl-lib" ], - "commit": "ad03a98386d4cdb0df3eb323ecaab8fe6d0942c6", - "sha256": "1x43na4m7krkhhsvvync9k0rk4lxdakl52n43aafyx43zgv5zk8y" + "commit": "1585e55a5deb89e2f4e30a0ad9e0f121d1e0ebcb", + "sha256": "1zs4wcbxqx8275j2q1118ipqw7532cd6cdy2whw22ck4z5w47vfg" } }, { @@ -58973,8 +59486,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200318, - 1224 + 20200425, + 2117 ], "deps": [ "async", @@ -58983,8 +59496,8 @@ "transient", "with-editor" ], - "commit": "236c44518d30c43c7035be32f02ba615d148b5ef", - "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6" + "commit": "8de6ecf5c5c840f8a964c3e5bd4d7a1aedf04e10", + "sha256": "0fwaasr7g4qj9l8dxcy1228p2rpb2xy16w2g27gqdzyd6a5sc2jw" }, "stable": { "version": [ @@ -59019,8 +59532,8 @@ "cl-lib", "magit" ], - "commit": "9ffebd50a18adba70a9cfc2710012dfd650c5376", - "sha256": "0sihrmk9snazdj1dana7q89a5qd7xjclhmfqh15gvxchs4a8jwqg" + "commit": "0bc96737634e78ac7c7f8a3f73190531c0890914", + "sha256": "1lm8412n2046fz8n7rfbadyww2074lsxq0w4gm1x1alraz5im5h4" }, "stable": { "version": [ @@ -59311,8 +59824,8 @@ "libgit", "magit" ], - "commit": "236c44518d30c43c7035be32f02ba615d148b5ef", - "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6" + "commit": "8de6ecf5c5c840f8a964c3e5bd4d7a1aedf04e10", + "sha256": "0fwaasr7g4qj9l8dxcy1228p2rpb2xy16w2g27gqdzyd6a5sc2jw" } }, { @@ -59460,14 +59973,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200318, - 1224 + 20200425, + 2044 ], "deps": [ "dash" ], - "commit": "236c44518d30c43c7035be32f02ba615d148b5ef", - "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6" + "commit": "8de6ecf5c5c840f8a964c3e5bd4d7a1aedf04e10", + "sha256": "0fwaasr7g4qj9l8dxcy1228p2rpb2xy16w2g27gqdzyd6a5sc2jw" }, "stable": { "version": [ @@ -60322,14 +60835,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20191230, - 1055 + 20200421, + 2222 ], - "deps": [ - "cl-lib" - ], - "commit": "e9dff50d572caa96b68a7466c18c97a8d6ed651c", - "sha256": "0v7a56fqwaqzqkpip7lpbsf9jnnwfjwd3jf61xnziv6j9sa46p1d" + "commit": "365697302345f8b9dc10bc975477452a282f7ae0", + "sha256": "1afjp0j5498zzbl8ycrz37cqdssfjlxcx5g4addzv0xaicfghgk6" }, "stable": { "version": [ @@ -60909,6 +61419,24 @@ "sha256": "10xxgvzjb7bl3lzgjkdsnnkd9wphkc2pm621agyjlayzcjnldz5p" } }, + { + "ename": "mc-calc", + "commit": "a8cded39a6c14d34f618aba136d48e162a70c433", + "sha256": "1lphlavndz0m3pw2kcrbqkavvcgmzn2p3av0h60ghndz00psqbys", + "fetcher": "github", + "repo": "hatheroldev/mc-calc", + "unstable": { + "version": [ + 20200420, + 1836 + ], + "deps": [ + "multiple-cursors" + ], + "commit": "74a046a5728919a4d1135ca62738326b0dde278c", + "sha256": "0498088pgbpywqdla8mzhpq4izzbdbqwq9cjzg0050y598pinpqq" + } + }, { "ename": "mc-extras", "commit": "12747bb8603ebc09ce0873f3317a99e34d818313", @@ -61208,6 +61736,25 @@ "sha256": "05gfprcrh9p06arsni58nf60inlf1zbd18i678r9xd4q0v35k491" } }, + { + "ename": "meow", + "commit": "b5515ad6f1b8e8296fba5bd91d7adf5e1fc229b4", + "sha256": "1s9wqmxg1g8crhsvwn4fh3hkn7pyfj5x71fal9yl0fk6gx59n1p0", + "fetcher": "github", + "repo": "DogLooksGood/meow", + "unstable": { + "version": [ + 20200425, + 1327 + ], + "deps": [ + "cl-lib", + "dash" + ], + "commit": "f9e4296ed96ca31c8197ba8a5576fc94ee433755", + "sha256": "0dgdf6xlylnnsm7954xa8vf50x4mfcr8gvajrcii2shbcb23b8c8" + } + }, { "ename": "merlin", "commit": "9338298a79b7f2d654df90b0f553aeed1428de13", @@ -61219,17 +61766,17 @@ 20191025, 851 ], - "commit": "37e38e44f57fa2caac5ed8a1268e747a42174c85", - "sha256": "1r73dy1wyrdclcnp9dpk7r463fwkh2ybi31q1mmxym1xwvkg5ahl" + "commit": "21f4ba18acd9ca3dc5c8263acfc46042a6aa557e", + "sha256": "1sp1g70wy8qp34641hlpk5xaf7vv359xgwc7z8cw7yvj39mn98va" }, "stable": { "version": [ 3, 3, - 3 + 4 ], - "commit": "73e9771bcc1c8f8575b505a62c58ad40004cf5f7", - "sha256": "12mh5p87rjwvkf6dqmxka4jbvhcd729972b726im6v0a27ncqh77" + "commit": "21f4ba18acd9ca3dc5c8263acfc46042a6aa557e", + "sha256": "1sp1g70wy8qp34641hlpk5xaf7vv359xgwc7z8cw7yvj39mn98va" } }, { @@ -61269,14 +61816,14 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20200320, - 1357 + 20200420, + 2258 ], "deps": [ "f" ], - "commit": "a5b16bc4308e2a520711c2ef8a964e269115cbf7", - "sha256": "150a69rn0wkfb0bmyx21vywh7vcd5a3yfi7i9jgp8zf8hfclsymg" + "commit": "b8673381ff8bbfbdf3f165ae928e7c775a3117e9", + "sha256": "14w2mwqiksmng8pzm4l0c458q0i2m3p4wcfvvmagyqk6mfl05m4l" } }, { @@ -61397,8 +61944,8 @@ 20191018, 242 ], - "commit": "821ed77f0982dfeb1df50380931d53e6b7b7036f", - "sha256": "16hrnfz4jp5a672rvgk6ky9xfzvgxx73p5l96wh3x9294vyjd4vi" + "commit": "60eae1c8a7f82fbcc2660d785b33601daaa29f4b", + "sha256": "06ia4ba6c1yph259wr4y5sdkl1ry6pzbwhx807ia675rp0clp9hz" }, "stable": { "version": [ @@ -61418,14 +61965,14 @@ "repo": "ianxm/emacs-tracker", "unstable": { "version": [ - 20200126, - 1851 + 20200419, + 1758 ], "deps": [ "seq" ], - "commit": "4da64b60091c3d7b23c7c5fd3dba981122b0e1f7", - "sha256": "1jy07b1am1g4hwiwywmi9iyidv3yp933j2y4f9nmfhpb4yjs193y" + "commit": "287ced1bd51080897b2d6084f72f4a697e9b7e94", + "sha256": "190jpvd1li2185d1m9k2md5x0fz156a7lwwl57n4ir54j4h0s8ri" } }, { @@ -61522,8 +62069,8 @@ 20200104, 108 ], - "commit": "3bce96bbd509ad5ffb35ead52128dec5c1a67abf", - "sha256": "01wx7cvk3bvdvkpldhbj7wvqyrra7ajqjkgnj4knjg8m2wrhilhj" + "commit": "e9af8a2595e336542c9dfc656fe808ddc6937a59", + "sha256": "1s72qvg1jwqk27axiqb2wn7y1q3x0rf2mb20yc9kqva553fk5vzd" }, "stable": { "version": [ @@ -61549,8 +62096,8 @@ "deps": [ "calfw" ], - "commit": "86d3682ff9491893da671237be3cde0b0010ca85", - "sha256": "0md61pfjvx8xakahpig39ldfzvwdjgr19qxr78c7bzl98hbjpgq4" + "commit": "f9f048de9fe85a90d376d828ce3dad2a96c62c40", + "sha256": "1m6w12y9dcz85xm7lc7dhc7vjhw0bhdm0b4rcp1fr2sn9wv7c4wz" }, "stable": { "version": [ @@ -61672,17 +62219,17 @@ }, { "ename": "minesweeper", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "1n6r3a3rl09pv4jvb7ald1gaipqylfchggza973qv9rgh5g90nag", - "fetcher": "bitbucket", - "repo": "zck/minesweeper.el", + "commit": "d3828ad7599d13728b5571b882344c3ada434b85", + "sha256": "061l7xh7vjg5krz5lskj2jvrnsv2qq4bwg0qkkysmy4zp9f3m5iq", + "fetcher": "hg", + "url": "https://hg.sr.ht/~zck/minesweeper", "unstable": { "version": [ - 20150414, - 522 + 20200416, + 2342 ], - "commit": "d29af12fc6115399c11bdf7461a74cb810c97336", - "sha256": "1b2kn4c90hl07lzdg10wamd4lq8f24wmaj4zvr728pwyga99b2av" + "commit": "d4248e3c9b3e9e7277cb9e6d081330611898f334", + "sha256": "0b648nsnwn461r2alg9v220v0c4djyvwn7xgwh8c8sb9pjwbmw90" } }, { @@ -61711,11 +62258,11 @@ "repo": "muffinmad/emacs-mini-frame", "unstable": { "version": [ - 20200327, - 2218 + 20200424, + 852 ], - "commit": "30000e659b0ad2501591343b4818e5877783483b", - "sha256": "07b4903i3h91rjdixqsyhfclwg936n538bpiglay9r2klaa6kjp1" + "commit": "3aa8de59d170d7bdc16e5f829d952d82abd7739c", + "sha256": "02j2w4c4wvqr1csmr94rzhbrwhqfb5wmjngxa9wl58z1plwy4d8m" } }, { @@ -61741,25 +62288,25 @@ "repo": "kiennq/emacs-mini-modeline", "unstable": { "version": [ - 20200319, - 526 + 20200424, + 647 ], "deps": [ "dash" ], - "commit": "efe3f9743004d7989ea3b82d2bc71960e990bdc0", - "sha256": "0wy52ixj16029xk5grh1531afdcmpfi25iacl9bhplsrivzjl7hf" + "commit": "4f1dce78916cccd2e7066345ae2be3394a675c46", + "sha256": "0qbd6jdaqfs43i9cgs4n4d8vkv3nbcxcmwkd9xrj1d03rdmyzxh0" }, "stable": { "version": [ - 20200309, - 413 + 20200408, + 729 ], "deps": [ "dash" ], - "commit": "4d97bf35cf0f9d58b14d13a78172c15463820382", - "sha256": "0cqzqrc8wpxav08fx9n1ljpzf97hj3wdhizywj4avnyxj3g63zwi" + "commit": "b761e41479a2564e801ac6c427956203de3d62ca", + "sha256": "1ngggz4n35bklgya6ymc98w7y2annxcpdkikd5afd5jn8w7x2vxg" } }, { @@ -62031,6 +62578,21 @@ "sha256": "0ai4ff6hinajvnp8r86s5pv0rrv8h68ncdz4k98kka1ws2f79zdf" } }, + { + "ename": "mix", + "commit": "aaa1958ac6a0e59613e1b71e0eddbe4989d93e67", + "sha256": "1wflzfr7jgvd01il9zz96wasdyjxxi5nrzva9hlrkgqhp0h877sk", + "fetcher": "github", + "repo": "ayrat555/mix.el", + "unstable": { + "version": [ + 20200419, + 820 + ], + "commit": "37916fa5f7dfe448585fb83ea6253eb0f84df15f", + "sha256": "09pk4bakqz01ci06c79ywwb8ijdfgw3rxrz0wlaz4zmlbirkzma6" + } + }, { "ename": "mixed-pitch", "commit": "7d3c7af03e0bca3f834c32827cbcca29e29ef4db", @@ -62228,8 +62790,8 @@ "f", "js2-mode" ], - "commit": "33e1b521a8a8d0225df353b51f1e8a4588ee32d0", - "sha256": "1ln6wz452sfxy7ii211ha9p0n3pygxyzyk0raczfla3ln8dh989q" + "commit": "cfd5b1a8a32162575f1c30b82e17b74efb67cf1c", + "sha256": "015pinqd2bxac372dvmcxnc7z9qayq4xpa254sp31bdzn4r5xns4" }, "stable": { "version": [ @@ -62476,11 +63038,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200330, - 706 + 20200425, + 1503 ], - "commit": "cedb331001d0623eb003591b2f650b8e5e4069ed", - "sha256": "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0" + "commit": "0344a1b534468bdf072040d467ac853215d4fa63", + "sha256": "1bpryv6i8vm3g7avhns7nr65d82zq5kahh9kap7zg4w2a4gx1hl7" }, "stable": { "version": [ @@ -62500,11 +63062,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200330, - 706 + 20200425, + 1503 ], - "commit": "cedb331001d0623eb003591b2f650b8e5e4069ed", - "sha256": "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0" + "commit": "0344a1b534468bdf072040d467ac853215d4fa63", + "sha256": "1bpryv6i8vm3g7avhns7nr65d82zq5kahh9kap7zg4w2a4gx1hl7" }, "stable": { "version": [ @@ -62691,11 +63253,11 @@ "repo": "oneKelvinSmith/monokai-emacs", "unstable": { "version": [ - 20200329, - 49 + 20200416, + 2001 ], - "commit": "1b937eab15326b3b2e4183229a01376c30e6781c", - "sha256": "0c2sfzxag01w2n61xy02aw2hwv7k1nm64iwbjyf0rsqcq0m64pz8" + "commit": "4281fc13dadef98942c8d43024de024f2392fec5", + "sha256": "0049ny3m1mgn0b97m0clcmmh2xzn66flbsd8k45dn0qxm5wlaj3n" }, "stable": { "version": [ @@ -63566,14 +64128,14 @@ "repo": "agpchil/mu4e-maildirs-extension", "unstable": { "version": [ - 20200302, - 1228 + 20200410, + 820 ], "deps": [ "dash" ], - "commit": "bd81c3e1c1f690b124937960acd2a819e9a2483e", - "sha256": "0v6aih6gqzg631kpqrqgkj8nw6d7i5ih2qnmraf3i29m5y6gqync" + "commit": "36b1f3a561af173eccc7bebf10ee060af44ed6e7", + "sha256": "1k8xar4yal5nc4ixx78gvs4fvlxpa2c4fzkq3xzh6jwfbrc7g013" }, "stable": { "version": [ @@ -63782,6 +64344,25 @@ "sha256": "1bn6zx931vz2fa72ab999r33bxv8brn3cqmalvq25x7s4z3q1lyi" } }, + { + "ename": "multi-vterm", + "commit": "c87a280364597340baee7711aa33302c0a349fa7", + "sha256": "1dn1m30qmhv4sl84gki8l46rrkabn3ka7nb075q25h1b8lhhijci", + "fetcher": "github", + "repo": "suonlight/multi-vterm", + "unstable": { + "version": [ + 20200329, + 940 + ], + "deps": [ + "projectile", + "vterm" + ], + "commit": "11f1b0cc97a24aba66fb561a0a94e9a66375b30f", + "sha256": "0pzcwn13yj21qcga2agcv8as0jyrmw055fr8nbzvkp1jml4l3vwj" + } + }, { "ename": "multi-web-mode", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", @@ -64580,11 +65161,11 @@ "repo": "CeleritasCelery/emacs-native-shell-complete", "unstable": { "version": [ - 20200321, - 2300 + 20200424, + 1635 ], - "commit": "11803df3706fb23d58e418a14ce981204a64e847", - "sha256": "0maljdxigd4fvrm7pv3ssyywl3c1zhfpqdymq933iig7d2hrwxm1" + "commit": "ccb5b52940a9374fbfe92947f0101e7254ba445d", + "sha256": "0p3qrl59qhczwysydsak66j7ixpykr3397xdvjj3hkmmcrsachic" } }, { @@ -64740,11 +65321,11 @@ "repo": "nickav/naysayer-theme.el", "unstable": { "version": [ - 20200326, - 1937 + 20200405, + 123 ], - "commit": "e4d80cb70324a45102075ea923af454a563e9133", - "sha256": "0kxlbvpszb0lrj5dzfmzc1iaxgvhcjwq4hwykif22mkgdigxppx3" + "commit": "9d0bef898f31368cd30e063d53d443dee29683b0", + "sha256": "1jbp8p58bjc0wxs548niv02q9889blnwwfs64h5sm96nzhyzrkn0" } }, { @@ -64969,6 +65550,26 @@ "sha256": "1xqp7aghc8xd1733azl27mjf57qvm0036qbkqmaks2ip8s8c6arj" } }, + { + "ename": "neuron-mode", + "commit": "6e4b79bc01b9ff2b00a4d0c80614f738a9e76dd6", + "sha256": "15ddpc64432013vn43amx0shnhr32cx1vkvn95chmddlkhx7ln16", + "fetcher": "github", + "repo": "felko/neuron-mode", + "unstable": { + "version": [ + 20200426, + 1310 + ], + "deps": [ + "counsel", + "f", + "markdown-mode" + ], + "commit": "aa97a6fbb5c3b33ad73a1ba31c7e50c8842091a1", + "sha256": "18nr1ayw9j3zfwj79qsqvf5nw36fqpyr2bq3cl93kck1adv949d8" + } + }, { "ename": "never-comment", "commit": "ef3f8e712c10d63fea009951d7916fe376267cbe", @@ -65215,8 +65816,8 @@ 20181024, 1439 ], - "commit": "8900fa55b56ba1e2f83b3f3ba2a1b336c97e5dc3", - "sha256": "0x6l5r5i1q7pbvziynbvb395q8rihkr1zyhp4xzw35xn55qyskiy" + "commit": "112217185e0351f9ad7fa17542862ac3c0922653", + "sha256": "0shby25dqy9hkb3chgshr2c3hqq6k35261sv3lw7zj5lxv9jrrkp" }, "stable": { "version": [ @@ -65498,8 +66099,8 @@ "repo": "dickmao/nndiscourse", "unstable": { "version": [ - 20200315, - 2046 + 20200418, + 2355 ], "deps": [ "anaphora", @@ -65508,8 +66109,8 @@ "json-rpc", "rbenv" ], - "commit": "280ac4943af307e6fe8d43a350c663c18c9c7ea8", - "sha256": "11ncy09y4lbivsp72l1lbg45ahqhgdzn56p9j4dxkczv5pnsg6p1" + "commit": "103eb5c13ad2d154c9386b2aa9dbea532435ee7a", + "sha256": "04nympxjg1dhahk7m71769c5lzsxxsnd9c62lqrkn22gvfzm0wm5" } }, { @@ -65520,8 +66121,8 @@ "repo": "dickmao/nnhackernews", "unstable": { "version": [ - 20200323, - 1803 + 20200407, + 1525 ], "deps": [ "anaphora", @@ -65529,8 +66130,8 @@ "dash-functional", "request" ], - "commit": "ab0db2b7e76efa8efc72c0f587a33da1f0dc9905", - "sha256": "10scn7y0v0hirwlckwxb8cr98qmdl0r6c605qdh8jigmcp4c782j" + "commit": "d5e58b373ab6c5f13174e76f5ae62539dc5cfc95", + "sha256": "0gqqdjmasjs1p6nal9s2yhas1xr2nm99rd3rns2b8cd5j04ccvaz" } }, { @@ -65556,8 +66157,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20200327, - 413 + 20200417, + 1757 ], "deps": [ "anaphora", @@ -65566,8 +66167,8 @@ "request", "virtualenvwrapper" ], - "commit": "ccba00ddd62f06e9f085f7f58532b961369d1677", - "sha256": "0fkcp3masas1sdrhp27c017b4r2gw2gp65lcjkvcfck2k9hnypip" + "commit": "7f6e3bdbfa872af8e92ed339671772b46bc7f7f0", + "sha256": "1dbb4pm2dvyvgw6lxjhhdqplb1b1jbvnywy8d3abr5dpzfqzij8s" } }, { @@ -65593,14 +66194,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20200328, - 1359 + 20200413, + 2118 ], "deps": [ "cl-lib" ], - "commit": "92661bc9b33af1e9d405d23f226c1fc80c0c9c01", - "sha256": "1c1zrfnzr7vh4fsrzyr1ivsf07ydxyr4v1776z2xv9bynvwb6lhz" + "commit": "ea8d8654365eeeea366a3ee0f51689987f2803a8", + "sha256": "02mgcz04xz9wkid3gkykbpjw3vriai7anyq3b61iv3pk9kcdp6x3" }, "stable": { "version": [ @@ -65646,8 +66247,8 @@ "dash", "request" ], - "commit": "532eb14328027ee29e124768feec23a8ef7ee798", - "sha256": "1qc9im01fw7k9907a9d2a87hndyyn3sk1kw31cylsvrzsb7ss9f9" + "commit": "ebc6a4a1cc56c01d2bb882e4a40934a6a1f4e9ca", + "sha256": "04zhhz8v6bx627g1vhvd0s8bl5g3d6a1mfgf7pb13627npsvbrdx" } }, { @@ -65914,11 +66515,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20200323, - 121 + 20200416, + 1058 ], - "commit": "1fcf068e331b9b79e14f79c8b126711fc3d72cbb", - "sha256": "1pf9xds5csw6vwkb4b15isrw29psdifx8gl8y61la7d1k7b6m517" + "commit": "7b756d1e3885b70e81647a85432e0f2d043167c9", + "sha256": "0n0f6wsm6j980vxli6j6slixws45vgdbmw2xvwrs1j1h91vd0pc6" }, "stable": { "version": [ @@ -66068,14 +66669,14 @@ "repo": "shaneikennedy/npm.el", "unstable": { "version": [ - 20200329, - 1904 + 20200406, + 1429 ], "deps": [ "transient" ], - "commit": "2201ab1d9d424146c725d5e9ad24cc8e0219ba95", - "sha256": "18bm31f6zaskyncn97mfwxdih6b31jpm8v858m920i5j45gh78r5" + "commit": "187ddd2732deb49df1e87fbaace153afb8a3e7e1", + "sha256": "0kh8y0izab3rra5vb1229h77ykz704wh28m7vv0bsfn5lg02ridx" } }, { @@ -66562,8 +67163,8 @@ "deps": [ "axiom-environment" ], - "commit": "2c5384b994266008a20558db4ffe0525e66c0f5f", - "sha256": "17f40w9r4whz0v007pp13w060jq87ag42p21hcj93c14py5s4g67" + "commit": "25932da0dc40c6877463cbf019b14ab05a6b0164", + "sha256": "1xbps0k4x982gh1a0pscpx4kayjjyykvm5pyj516wwkya7bac4a6" } }, { @@ -67423,14 +68024,14 @@ "repo": "clemera/objed", "unstable": { "version": [ - 20200312, - 1817 + 20200403, + 1500 ], "deps": [ "cl-lib" ], - "commit": "9bb351313799bf4fb39f1b680cdf0a7ddccccbb4", - "sha256": "0lp7j4s2w3qmk288nnmh92ad58340srxq20nqiybgrijc0kxkx5a" + "commit": "e89d8dae3b2d4331a4455d2a7b203500537d184d", + "sha256": "1xjcbfqxpda73l8imw1pj9my71qqacri269cv7wnzsfrphqh526x" }, "stable": { "version": [ @@ -67641,20 +68242,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20200325, - 946 + 20200413, + 1503 ], - "commit": "5f22947a41780a59dab7252ef1e3d510e6e2b28a", - "sha256": "1y84lidg5jiix7ap46jakqn3y9x1gzdlnv5473r3qv3cxzaf7l2n" + "deps": [ + "org-re-reveal" + ], + "commit": "6db38600d651f4aea77e0d411466be7fb6314f39", + "sha256": "11akmygscph5pq1zc889pmlp8ab91qk29lwrrp3gxmgy2s5x9mgf" }, "stable": { "version": [ 2, - 7, - 2 + 9, + 0 ], - "commit": "5f22947a41780a59dab7252ef1e3d510e6e2b28a", - "sha256": "1y84lidg5jiix7ap46jakqn3y9x1gzdlnv5473r3qv3cxzaf7l2n" + "deps": [ + "org-re-reveal" + ], + "commit": "eec26a088d19cd202417f662bb487b550230d11f", + "sha256": "1vj99sj71qf622gc9fy6kafp4ki7arqljj1dwkl4k2fnf4hv3af7" } }, { @@ -67717,20 +68324,20 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20200320, - 1154 + 20200417, + 607 ], - "commit": "5dc27716c706166e1932f4a0e9f94384b6d17cb0", - "sha256": "0im6ds8mvnwfrh3z0cd05g32w9rklhl56xmhzl9i2180pv6qwil8" + "commit": "fa9757fbaa392be622ddf66c2535dfe4b5cca898", + "sha256": "196g4n2cr1w77k2a6582rc3c8fnnfps83f1kh76k8k3lvkjg8pjb" }, "stable": { "version": [ 1, 9, - 3 + 4 ], - "commit": "67e32a7754cda4c8d94227e80bfa708abb4e8e6d", - "sha256": "0928kn9yfwc2mhmja13y39iswlkk474xnszh9qza206j6r37h6p3" + "commit": "9005661e18d9eaaf1105018d084916e4927cc66b", + "sha256": "0ca80z6drsw9jkwijn6f05y1n7rmcypvh0yvsb77wnqrzd7y4p68" } }, { @@ -68186,8 +68793,8 @@ "request", "s" ], - "commit": "6819b6271960dcdc7c32981dadd48968a3640cef", - "sha256": "12frm9w6xh5rkfyvvvpwhdd55nlgsv8w4f52pch0sl437vidcsqg" + "commit": "4c15049079878fcd386cca5dba20b99296a1de84", + "sha256": "1avci3avwhrw040wwjgcv1hayk893y8iwln10vsjyb5rd78y9gsi" }, "stable": { "version": [ @@ -68222,16 +68829,16 @@ }, { "ename": "openwith", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0l3grbnn349cv26ap2phlmp2h94s68gqznh5zdqwc2cp7lf699sx", - "fetcher": "bitbucket", + "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203", + "sha256": "0swza74ndw0vkr7q513wp12c2yasla7aaqv0z98mzr0ssx12jld8", + "fetcher": "github", "repo": "jpkotta/openwith", "unstable": { "version": [ 20120531, 2136 ], - "commit": "aeb78782ec87680ea9f082a3f20a3675b3770cf9", + "commit": "1dc89670822966fab6e656f6519fdd7f01e8301a", "sha256": "1wl6gnxsyhaad4cl9bxjc0qbc5jzvlwbwjbajs0n1s6qr07d6r01" } }, @@ -68274,6 +68881,21 @@ "sha256": "1dwps9zv1jnc7m75j5cdla14pnv2vnivm5bq0zcvqfsvilvd38ds" } }, + { + "ename": "orderless", + "commit": "3f1f2c378e63c5ce8a8d37735f914ce0663a76d3", + "sha256": "102jfzq2zskaa8jcb4mmmndcdc8221qp0hqlgvwirnzkxms9ij4a", + "fetcher": "github", + "repo": "oantolin/orderless", + "unstable": { + "version": [ + 20200425, + 855 + ], + "commit": "b69b52289fdb0023a3123b1ddec5b490125345a3", + "sha256": "0vxpaqsad3x1lqga1ky7sipm8lk8ps66wpcvz52jdqasxmxzvrjm" + } + }, { "ename": "ordinal", "commit": "ea3dd6fe4cacc229dd1371cb66dd1cfd07321bf4", @@ -68572,14 +69194,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20200328, - 1700 + 20200426, + 1410 ], "deps": [ "org" ], - "commit": "ec4bd9dd290459657426bb06e78f666ac0310420", - "sha256": "18937fm3np1ngxc1rmjsg0mzrf7jr56gd87ygsi84y5cmw4j08zb" + "commit": "ae7fe0f628bd093526786ece6917f7a4310e5e4d", + "sha256": "0szav8idqq2gmckaxqnjgcah978as2nhv43nl9vvvfkc9dc2l5x4" } }, { @@ -68677,14 +69299,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20200220, - 2016 + 20200408, + 1328 ], "deps": [ "org" ], - "commit": "61686fd87892e60268fc43348282abbfd879e5c9", - "sha256": "0n493p9dqx9bb6jcrb34s1rk8afwpz1fdgwrm64g7a0y2mbfga74" + "commit": "67f50aa2a2839ffdb1c1a5e2f135e69f868e4b26", + "sha256": "041z6f5fyzc46grwqllz81hixkdqdic3a6zird7i0yy7cr2hqhcf" } }, { @@ -68760,11 +69382,11 @@ "repo": "justintaft/org-clock-split", "unstable": { "version": [ - 20200315, - 1716 + 20200331, + 526 ], - "commit": "322379f1bf08c74c034c5c86d8a3045675ee64ac", - "sha256": "0nigylzzxwm4wn8zp5vyrj4y41czcpkvglvy3p4dqn35agklz5mw" + "commit": "39e1d2912a7a7223e2356a5fc4dff03507ae084d", + "sha256": "0yvpmv0v56rsn43ffmwfhw8jjvfklw703qpmkx6d6paljjgy9k8l" } }, { @@ -68822,11 +69444,11 @@ "repo": "thisirs/org-context", "unstable": { "version": [ - 20200217, - 1006 + 20200418, + 1540 ], - "commit": "f354108ecd3d33cadee05a4aec95d2df4bc61ae9", - "sha256": "1zlqciqadhwkhmzlag7w0i83pn9gg0gikfcrv2qlr9nsn5rzzvj4" + "commit": "bbef096dc20b206b792b0ef310f2eed7c70ca3a0", + "sha256": "05s73wn2q3a0mfc14qlgcb1bas9addby0m43id2v8ljvxyigicr8" } }, { @@ -68852,16 +69474,16 @@ "url": "https://git.spwhitton.name/org-d20", "unstable": { "version": [ - 20190628, - 1356 + 20200416, + 2010 ], "deps": [ "dash", "s", "seq" ], - "commit": "0ca1b0a8d9ab0a7d687a9f2edb6eae2e57851129", - "sha256": "0wg95wirq964klpihhgv2flnkyjwwpdqiafn2b2l1785906csrcg" + "commit": "7ede5726d640c4f81146585f6eb907f51a0f6a19", + "sha256": "1p4irzcsq2sxmvpyrkrqs9ylp153mzwr31hvsnfh1f2nlghpicfk" }, "stable": { "version": [ @@ -68945,14 +69567,14 @@ "repo": "abo-abo/org-download", "unstable": { "version": [ - 20200311, - 1049 + 20200410, + 1444 ], "deps": [ "async" ], - "commit": "b96fd7ba02cbdae95cc37970ebcfae8afa8b25d2", - "sha256": "1fx621ll5kjw10n2xhba7h39m1cqvink61kyhb228p6h8cl63kss" + "commit": "46417e2bd30c9bcd1e8a1f4c554ad44543e869e6", + "sha256": "1jzmyr6v33x7012ljbc45w2ww3lb96i4nh1ydxzdjwnbvpj2j17s" }, "stable": { "version": [ @@ -69003,16 +69625,16 @@ "repo": "phillord/org-drill", "unstable": { "version": [ - 20200216, - 1336 + 20200412, + 1812 ], "deps": [ "org", "persist", "seq" ], - "commit": "4c114489e682e514e79701045d541ab6f3dc3fb4", - "sha256": "13y302lyscdqrba1sfx60yf5ji2xi7fbsvjsjbw7hiz63kg6rccy" + "commit": "35c1ce349949cc213f3076799211210f49431850", + "sha256": "06hc98z4sml7jrwm5zvbsw5x6q5jpa335almzkh6h85g1p8syfsn" }, "stable": { "version": [ @@ -69256,16 +69878,17 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20191018, - 921 + 20200424, + 1929 ], "deps": [ "alert", + "persist", "request", "request-deferred" ], - "commit": "6821e349673e9ba8d7ae7b84789f931889273dc0", - "sha256": "12alwnk50gsiz5b9mw8qvn317f7phb5vh2x7yvi9m72zdrdaf8pz" + "commit": "1667aba7c0a33e3c23c3a47fc04e89670684eddc", + "sha256": "1zzibnvsdq3iv874x6g6zrjb17mb036dln68mn4a1xlcwvv1king" }, "stable": { "version": [ @@ -69365,20 +69988,20 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20200323, - 1404 + 20200413, + 1609 ], - "commit": "601435b3aeff1b2c00f62deb39adf9b351e9b567", - "sha256": "0v6r78zcvzhj2wgaz22ddpbhjpggiii5j54hl12m02rpbqv0m524" + "commit": "f95dbec874f39aac3c8391a6e0b9796b981386f3", + "sha256": "1dylivz459a4d66rak9sipynyby01plhgjj2vvp9fqvia65yb2a4" }, "stable": { "version": [ 6, 1, - 2 + 3 ], - "commit": "601435b3aeff1b2c00f62deb39adf9b351e9b567", - "sha256": "0v6r78zcvzhj2wgaz22ddpbhjpggiii5j54hl12m02rpbqv0m524" + "commit": "f95dbec874f39aac3c8391a6e0b9796b981386f3", + "sha256": "1dylivz459a4d66rak9sipynyby01plhgjj2vvp9fqvia65yb2a4" } }, { @@ -69444,11 +70067,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20200311, - 710 + 20200424, + 1917 ], - "commit": "664c08e12cde19ce7dca645ba9accecda7266c32", - "sha256": "02gla6cs8w08jg8czl5855vxvs1jyxq839rh9f95d40x4jgc1rwy" + "deps": [ + "org" + ], + "commit": "8bf06b28d6f14f52d4968123e2b4b91930c8f947", + "sha256": "0k70k07c4lq20rqljmfkx1pfp8gq4qr0y46n8mh1smzxdznk9nlb" }, "stable": { "version": [ @@ -69603,29 +70229,29 @@ "repo": "alphapapa/org-make-toc", "unstable": { "version": [ - 20200110, - 1804 + 20200409, + 1436 ], "deps": [ "dash", "org", "s" ], - "commit": "be86a4e026befd9d10af42a22b2483c7969ccee1", - "sha256": "0348iq3bc3rxs5bqdvskyly4agqxiapamqkfm0323620kxl70agw" + "commit": "26fbd6a7e1e7f8e473fe3a5f74faec715c3a05aa", + "sha256": "08gkzl0cbgkyg31sxafqmq6v1hjgr2q62vnvncrdnhs3ly54inf8" }, "stable": { "version": [ 0, - 4 + 5 ], "deps": [ "dash", "org", "s" ], - "commit": "be86a4e026befd9d10af42a22b2483c7969ccee1", - "sha256": "0348iq3bc3rxs5bqdvskyly4agqxiapamqkfm0323620kxl70agw" + "commit": "43d4a2490a048b01ca5a6f44c5b4f24a458dfc95", + "sha256": "180ji6nnj6qj0rs1rdp1zlcrfsqf7ikb44ym8icbp5d6al2s4hnr" } }, { @@ -69636,26 +70262,26 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20200323, - 130 + 20200416, + 1048 ], "deps": [ "cl-lib" ], - "commit": "778f818ad3d101f27786556c2a7a9995d5da47c6", - "sha256": "0w3yyqn225c5y0if5pjvvszpasrvh3rh4f0bqjabrvqvrhf1q8ny" + "commit": "9f8444603806e6baa94b2b67a23aab0ea52fef97", + "sha256": "143qj0llargjm375q39lchxz1ws4vsh50f3ar66cclrjvxrfaqdg" }, "stable": { "version": [ 0, 1, - 6 + 7 ], "deps": [ "cl-lib" ], - "commit": "f8eac8ccdec2ebf1dec87d4f5f01b4b53f86c67c", - "sha256": "0gjdhhri2fm93phvv3fnw6iz5agpafryacj521j80jf1dmj2bj5h" + "commit": "9f8444603806e6baa94b2b67a23aab0ea52fef97", + "sha256": "143qj0llargjm375q39lchxz1ws4vsh50f3ar66cclrjvxrfaqdg" } }, { @@ -69727,14 +70353,50 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20200303, - 1716 + 20200422, + 1615 ], "deps": [ "htmlize" ], - "commit": "2f521a89b106750ebafa94503cdeb043a02c5ab5", - "sha256": "1wr8qdkf75swf4jfqbv0r2hw7d5bw73nyyv7xa0msbc1hyw33b6l" + "commit": "d41426854e6804d752b25346cf6ae79b0612784c", + "sha256": "0f3lvcgx60j2m97mxgzbxaw9ki37g3yxr6arv54b87572a7wdj8m" + } + }, + { + "ename": "org-multi-wiki", + "commit": "8138002578ef14e30561cac159e9a66406a4201a", + "sha256": "0wbybr9vf4hcwyi9rab8sm1xwxqmy7mbjv1jmm78j51kjh0cpgkj", + "fetcher": "github", + "repo": "akirak/org-multi-wiki", + "unstable": { + "version": [ + 20200419, + 1833 + ], + "deps": [ + "dash", + "org", + "org-ql", + "s" + ], + "commit": "aef5975ac18d7cb101c0fb688333cc241782a8a0", + "sha256": "1m3p839wkrvf7n2467czj03rljv43bk32p7vlzdp5zby22bn7nag" + }, + "stable": { + "version": [ + 0, + 4, + 0 + ], + "deps": [ + "dash", + "org", + "org-ql", + "s" + ], + "commit": "80791ea872939df0578dc3a2992a2f7fd5618971", + "sha256": "0avg5xwnb3c9ylj9dqdcqmh8kykl98jsr6cl3rrivkj7l47i1rl0" } }, { @@ -69819,6 +70481,27 @@ "sha256": "1vwfpdi7hfkxx4vi0cwg7rvqby3i0mymzdkyzrqzv30dazmcjpag" } }, + { + "ename": "org-noter-pdftools", + "commit": "caa6bf82ea660f8e1d68e45cc99c6f6427cf1327", + "sha256": "0k11njy2l8pxwpmxspy6qwvp1041p99xp9ha6pjxp3m3f7rik32h", + "fetcher": "github", + "repo": "fuxialexander/org-pdftools", + "unstable": { + "version": [ + 20200418, + 929 + ], + "deps": [ + "org", + "org-noter", + "org-pdftools", + "pdf-tools" + ], + "commit": "8cc15bb8014ed1f047eecc0abd8bf447f86c0505", + "sha256": "173118fplpz575dcbncrjjpid2ni0acsi9130r210vl6hal7yz08" + } + }, { "ename": "org-octopress", "commit": "fba6c3c645ba903f636814b5a2bb1baca0b5283b", @@ -69943,21 +70626,21 @@ }, { "ename": "org-parser", - "commit": "28d55005cbce276cda21021a8d9368568cb4bcc6", - "sha256": "06yb78mf486b986dhvqg3avflfyi271vykyars465qpk0v8ahq8h", - "fetcher": "bitbucket", - "repo": "zck/org-parser.el", + "commit": "d3828ad7599d13728b5571b882344c3ada434b85", + "sha256": "1galc2w2n2qnwxknym4wid1ldinf8fyf8vvh4ihnckcbh081nrhb", + "fetcher": "hg", + "url": "https://hg.sr.ht/~zck/org-parser", "unstable": { "version": [ - 20190207, - 521 + 20200417, + 301 ], "deps": [ "dash", "ht" ], - "commit": "8610aef8dc878fc001975780bcbcbab30dc929b7", - "sha256": "0vqh37y2b0dc8p9c04ici1h9n9ghd1jizcr1c2zvp75cyqsz09wv" + "commit": "fd4cb7035ff649378cc968b1ec2c386b5c565706", + "sha256": "1hnd4zhhwrd6gr1skvc64a3z9k3nmhwgcyy1cp2jfyhk0iwsrqfm" } }, { @@ -70001,16 +70684,16 @@ "repo": "fuxialexander/org-pdftools", "unstable": { "version": [ - 20200329, - 1507 + 20200422, + 1350 ], "deps": [ "org", "org-noter", "pdf-tools" ], - "commit": "96fe7275c75842732c3fd1527619088f66b6a80a", - "sha256": "1ri58hyksp4fhmm6323ndc1h3ljkxjgbzcp588h76fkpk19lzhq1" + "commit": "8cc15bb8014ed1f047eecc0abd8bf447f86c0505", + "sha256": "173118fplpz575dcbncrjjpid2ni0acsi9130r210vl6hal7yz08" } }, { @@ -70293,8 +70976,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20200315, - 2004 + 20200407, + 1706 ], "deps": [ "dash", @@ -70309,8 +70992,8 @@ "transient", "ts" ], - "commit": "ab5e9aa9116010e5da1995bf19ff26f55b93c214", - "sha256": "0h90vagb91zskvmy06yq0b1vjbkqry0fkxiagg4d076rbx3ryc0n" + "commit": "f4d7399e677904cdc7e220440610704e4bd668bc", + "sha256": "0vfnxmk6k9f4zqbcg4gsg2ga4xr2gqx81sq2hcimx49wvyxh2bwn" }, "stable": { "version": [ @@ -70409,15 +71092,15 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20200206, - 712 + 20200413, + 856 ], "deps": [ "htmlize", "org" ], - "commit": "e4460a98b6bfa01720c287a171252f49c1949801", - "sha256": "0hhwc6yfy69qwiyxca8r12rdxvrj44vzdsnvdk0yc9szsfnmn4hz" + "commit": "61549f4c00284a30e34caa3d76001b233ea5d2ad", + "sha256": "00r324nnci2l0jwx4jhzcrbyai5wmj5cjrav4253c23aqdn5ny96" }, "stable": { "version": [ @@ -70541,8 +71224,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20200309, - 1231 + 20200421, + 1354 ], "deps": [ "dash", @@ -70556,8 +71239,8 @@ "pdf-tools", "s" ], - "commit": "e3eb9215a540ba62a0b0253d003c704b7740deeb", - "sha256": "152wzlavx5b4ap9wdl3dql5idvsjl5zq6zjwcilp9pni6dn34w12" + "commit": "1eb4ddda003b04b49a9a00828347a46f2863ac9e", + "sha256": "19vvcipfhir39qd3qwirrrr6221k8kjviifva0qm6aqxv7hlfaqm" }, "stable": { "version": [ @@ -70681,8 +71364,8 @@ "repo": "jethrokuan/org-roam", "unstable": { "version": [ - 20200329, - 1330 + 20200426, + 1107 ], "deps": [ "dash", @@ -70692,13 +71375,13 @@ "org", "s" ], - "commit": "b86d2c8637f5eafd587c4cf4fe85e7d0380844f4", - "sha256": "04i8i3dixf50vqp8jrwcbf4c8d7m47g9lyzj76h49jd8bv2fqang" + "commit": "41423005010f2f78c3e9301b97f1b0db83fd29b5", + "sha256": "1w8xv4wiskibwla7ga5bcjqpvzgmcxm52zazqpjp210vp22v545z" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ @@ -70709,8 +71392,46 @@ "org", "s" ], - "commit": "1433dbc31602c412914c71ecc81aa5dcf6b03daf", - "sha256": "08pfa63k194dpk0y2gfa0nzn5lig81q0l9axkq5j4ibj6ifaap4a" + "commit": "27a63b59b176f9d2048de69eb0f525f3c7be8f5f", + "sha256": "18ljww204kf1pbgrrnx7bn6177lw1bs3npywbx2k1b5j35c3j8xv" + } + }, + { + "ename": "org-roam-bibtex", + "commit": "cc4e4ea60d2363eb691cb87ca3105bd25fc405ed", + "sha256": "1q9l49q478zlmcz0wi239qsz2pvmqxyb9qac2k42p19zqnfgkmsg", + "fetcher": "github", + "repo": "zaeph/org-roam-bibtex", + "unstable": { + "version": [ + 20200425, + 1114 + ], + "deps": [ + "bibtex-completion", + "f", + "org", + "org-roam", + "s" + ], + "commit": "6bbdebb39d7edf9b369c16311afa18cf00cecffc", + "sha256": "0fp9cmgn9g4hnqsj9bn5885him0wxbs3qwvnw9anrwyybg6sv2i6" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "bibtex-completion", + "f", + "org", + "org-roam", + "s" + ], + "commit": "9c224890ef9b8fb38b48d48d6f029be00f1c2166", + "sha256": "14f3d1yiidglwbygb5swk44fvky7cla3r11i4zx56hrf8lxjzhp6" } }, { @@ -70731,6 +71452,46 @@ "sha256": "1hn8y9933x5x6lxpijcqx97p3hln69ahabqdsl2bmzda3mxm4bn2" } }, + { + "ename": "org-runbook", + "commit": "1ddf4d4e4bd22cc85150c8cbf635ace1f54d64fc", + "sha256": "0dih8kv6fhqbfmw2x8ndl6gygssl3g0jr5qkbgbf4wkl5xjls3cg", + "fetcher": "github", + "repo": "tyler-dodge/org-runbook", + "unstable": { + "version": [ + 20200412, + 403 + ], + "deps": [ + "dash", + "f", + "ht", + "mustache", + "s", + "seq" + ], + "commit": "8bec754c3007238d4e1c7296454815bf7000b31d", + "sha256": "10bfc8pr576ia16w5mwkksg9yn0jhcsbrkzw9yrjkvq2yzqsgpc0" + }, + "stable": { + "version": [ + 1, + 0, + 6 + ], + "deps": [ + "dash", + "f", + "ht", + "mustache", + "s", + "seq" + ], + "commit": "53e8876a1587190ec4d103f9e94380f34797ce49", + "sha256": "1cyb956s3vshh2i4gd37m1cjxwq5s0xj55pwysgganwgxxw22c8n" + } + }, { "ename": "org-scrum", "commit": "8315b6834d76180fd050b0d5cc2239d604fe2f3b", @@ -70937,11 +71698,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20200324, - 747 + 20200415, + 623 ], - "commit": "635ec9901be9d03402dd3d4b11e71f07bf1cf6f9", - "sha256": "1fc0r53209igflfxm2dncpmdh8zncr40y1ylj1j2pcyrdlghqpvw" + "commit": "ce92384b364de6421ab67e6399ae56b8ea51df49", + "sha256": "09i23m9knhr8px1f71wx4csddmrzgy9k4s9a2mq4la1wmj1jy627" }, "stable": { "version": [ @@ -71028,26 +71789,26 @@ "repo": "integral-dw/org-superstar-mode", "unstable": { "version": [ - 20200311, - 1848 + 20200416, + 2354 ], "deps": [ "org" ], - "commit": "715a9681d31968807df349280f96932f1a986f37", - "sha256": "0klq0khb59hmkwhay0dln5zhii8mbk3d7rn7rddixrrh5x5ghrlv" + "commit": "09ddc28383d363a4b353348a433e24535b4af0e3", + "sha256": "14w06v76xi4f6hpq6xzicrjjv0b802g5zc9as4mpimfy5gx2xpm0" }, "stable": { "version": [ 1, - 0, - 0 + 2, + 1 ], "deps": [ "org" ], - "commit": "2f9f9d6b21cb54c2ce6af15ab0e3c73e2b962d78", - "sha256": "0q6180qwjpha10zsiw0ni6lanyjwlj8141a6qivfcs8nwczz7nvz" + "commit": "09ddc28383d363a4b353348a433e24535b4af0e3", + "sha256": "14w06v76xi4f6hpq6xzicrjjv0b802g5zc9as4mpimfy5gx2xpm0" } }, { @@ -71247,8 +72008,8 @@ "alert", "cl-lib" ], - "commit": "baa1ce6333157fed3b3799a80e6cf8c73c9e2c18", - "sha256": "04adkz950vvwyzy3da468nnqsknpr5kw5369w2yqhnph16cwwfxb" + "commit": "1e81ea29af1ccc7b4ddb42fe4e3fbfc0adf891b0", + "sha256": "0cqk9q26qby2y1l6x39jfrdrw9x9419mlx2zhndmlb6gv3lv35f9" }, "stable": { "version": [ @@ -71360,15 +72121,15 @@ "repo": "jplindstrom/emacs-org-transform-tree-table", "unstable": { "version": [ - 20150110, - 1433 + 20200413, + 1959 ], "deps": [ "dash", "s" ], - "commit": "0a9bf07f01bc5fc3b349aff64e83999a8de83b52", - "sha256": "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3" + "commit": "d84e7fb87bf2d5fc2be252500de0cddf20facf4f", + "sha256": "16zi7rg3hdfspifr46gbvpnr1rr144a777whr1w3gp6m46xmgzhs" }, "stable": { "version": [ @@ -71428,6 +72189,25 @@ "sha256": "1jsc39xmli54mcqcdddzyaphmhlamwq167vfr2g133c3p0wx8swh" } }, + { + "ename": "org-treeusage", + "commit": "8868893e4109db9b348a62bc012c89648384994e", + "sha256": "1vxal0a4k348sqpivvahjlchk7w5a02dkqvxpqgjs1rlbs7vfv90", + "fetcher": "github", + "repo": "mtekman/org-treeusage.el", + "unstable": { + "version": [ + 20200418, + 1904 + ], + "deps": [ + "dash", + "org" + ], + "commit": "fe4323bc500e2d949848c75e8f59340971b35562", + "sha256": "0v9zd2lnzvdxz3wqvw0j3bzd7228x6k8dyr7pzmimkl4l26cybqm" + } + }, { "ename": "org-trello", "commit": "188ed8dc1ce2704838f7a2883c41243598150a46", @@ -71446,8 +72226,8 @@ "request-deferred", "s" ], - "commit": "e8e88239b5130307368f554b96fbf05ff4c207b5", - "sha256": "0kzvyv8rs0fsfbqsvgdjxlfa0qyi7wsdnfjw7c0hbwi25al39zm7" + "commit": "cd7bf366d40bb4af4a1a9801446dc98f713eac8a", + "sha256": "08pgn3llbk0sz5v50jqa7mvdv6dw507kgkrkk0ciii1jalg4786a" }, "stable": { "version": [ @@ -71602,19 +72382,20 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20200207, - 2036 + 20200416, + 813 ], - "commit": "813c2e7af2ec1dacf037b1f971f070a4f784d2a5", - "sha256": "12dagcvcba3j74grijgibpskr3qc373m25xkp2p86ap81bg58zn8" + "commit": "344d92ee5c117077317616e33d5945703059ac00", + "sha256": "1hzvv23bx4mscl3sw6nr8gggch8rdlyg33fhdv89xpgr700dx1nx" }, "stable": { "version": [ 2, - 0 + 1, + 6 ], - "commit": "813c2e7af2ec1dacf037b1f971f070a4f784d2a5", - "sha256": "12dagcvcba3j74grijgibpskr3qc373m25xkp2p86ap81bg58zn8" + "commit": "d6fff111930befa52a5cce128c986b0162ddf8c4", + "sha256": "1s9rqjn6c52kvz4v1ma6icdykvkvrvbyllpy5i1mg0pb4acbbwym" } }, { @@ -71656,8 +72437,8 @@ "metaweblog", "xml-rpc" ], - "commit": "821ed77f0982dfeb1df50380931d53e6b7b7036f", - "sha256": "16hrnfz4jp5a672rvgk6ky9xfzvgxx73p5l96wh3x9294vyjd4vi" + "commit": "60eae1c8a7f82fbcc2660d785b33601daaa29f4b", + "sha256": "06ia4ba6c1yph259wr4y5sdkl1ry6pzbwhx807ia675rp0clp9hz" }, "stable": { "version": [ @@ -71683,11 +72464,11 @@ "repo": "tumashu/org2ctex", "unstable": { "version": [ - 20191024, - 610 + 20200331, + 550 ], - "commit": "d4af170f5190dad3aa31ab1cf4c6f087d56ab111", - "sha256": "0m28mxsq1d5ggr8phfn94pb38lj8x3sxykh7hfqbwhphaza3by5q" + "commit": "2e40aa5e78b0562516f46f689e7b74cdf451cc2a", + "sha256": "06ip9663xvygpr484r09v7c55nn0pxmr30455iqpmxi32dwx974g" } }, { @@ -71816,11 +72597,11 @@ "repo": "kostafey/organic-green-theme", "unstable": { "version": [ - 20200301, - 1916 + 20200418, + 2058 ], - "commit": "9374259e1b22d68f30a1f5376052ab09dbad606d", - "sha256": "13jpfn4sjsw0lssrq0n75085j2g41ppmwky5mq0nyv8j0c0mmqpk" + "commit": "5218473fb500e58ccad3f73cfc4245f161869f89", + "sha256": "07l10mjgz0il5z7qpn2bw7621m5frgcmsb2pl9pyhfrjykvf8mih" } }, { @@ -71897,16 +72678,15 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20191205, - 2300 + 20200417, + 1720 ], "deps": [ - "dash", "magit", "org" ], - "commit": "e7cddf39e301c87c36c7de13e429dee74874d5c8", - "sha256": "00s3a8i221didw8phlbvdvihj9pxkq9k9j9vh1g1mzd7cz58dm07" + "commit": "e147f055772cc934fe1f1d8619059badeb647c93", + "sha256": "1q3v22drqbjzzr6d0zdwczz1rq37iyh78k2nk1wirbs5z4ixfyx8" }, "stable": { "version": [ @@ -71931,15 +72711,15 @@ "repo": "tarsius/orglink", "unstable": { "version": [ - 20190919, - 1859 + 20200413, + 2124 ], "deps": [ "dash", "org" ], - "commit": "988ad54db45708b0fe835829d512eb6d5f6cf161", - "sha256": "1mswfbwz7fm9lriab365g7hq8hn85gxcsg8y41by9j0n8hb3hj5q" + "commit": "a5f5da06174d22dc21bbac167a8c2361fa84bf2b", + "sha256": "0sxali4vnqzk6mj0m7d82yr2ixvxxj5lzmxffyznpa7j6yndi2mm" }, "stable": { "version": [ @@ -71963,15 +72743,15 @@ "repo": "yoshinari-nomura/orglue", "unstable": { "version": [ - 20171220, - 1226 + 20200411, + 311 ], "deps": [ "epic", "org" ], - "commit": "ae2a45c19b52e45db7891093a3ff17ba2e51c507", - "sha256": "0h3b37wz4hlk022c0sq7c9p5z3v4n6cljhy8g1qjhnxac8y7mkr0" + "commit": "9d5a8e24be9acb8c55bb4d6aa8b98e30e2677401", + "sha256": "1n2l9acc54sbpbv5d1h2ib9cn7nbidmkvhhlwihqzpvvh7bhjfj7" } }, { @@ -72002,11 +72782,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20190812, - 604 + 20200423, + 2123 ], - "commit": "1a13f7f70357f369e16bfa3038a9fb760cbffb46", - "sha256": "11qygmgvjqc53gy5f3pz0hh5zsam1li8vbyr42wflfkv6cwxypdb" + "commit": "b4d8ee2b8e0062eaa15eac6805374c02b776bb88", + "sha256": "1p187hfll4jz44g7xxdhnnm0qjcf4gdxbrywdqxpdqvqs74pa18l" } }, { @@ -72017,11 +72797,11 @@ "repo": "tbanel/orgtblasciiplot", "unstable": { "version": [ - 20151215, - 2151 + 20200411, + 711 ], - "commit": "cd91f6ae26a7402e192a1f4fd6248f5797edf19e", - "sha256": "1vbnp37xz0nrpyi0hah345928zsb1xw915mdb0wybq1fzn93mp1z" + "commit": "59618630205fc8c0fcc74fb34c4581d9712a5181", + "sha256": "1qx6la70cdxr556d2kna4ra76kdliaqkwm97jahd20nhs2izvpl1" } }, { @@ -72032,14 +72812,14 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20150121, - 2246 + 20200423, + 2129 ], "deps": [ "cl-lib" ], - "commit": "ccf5e0d96e053dc289da39a048715fcf36835ff2", - "sha256": "06nc82wiha11i79izqil53dkd95fl55nb5m739gyyzvx3sksb0dg" + "commit": "9a197de6c3036fbdb6309cbfd35ec31a69b3ebe7", + "sha256": "0fhq36g5k4nib5ykb92j12l3fnqj09xh2jai92l8c5nslgm00slr" } }, { @@ -72074,16 +72854,16 @@ "repo": "gregsexton/origami.el", "unstable": { "version": [ - 20180101, - 1553 + 20200331, + 1019 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "1f38085c8f9af7842765ed63f7d6dfe4dab59366", - "sha256": "0ha1qsz2p36pqa0sa2sp83lspbgx5lr7930qxnwd585liajzdd9x" + "commit": "e558710a975e8511b9386edc81cd6bdd0a5bda74", + "sha256": "0ycjbsn03cjzx6adabcvi1j7f92yhx3xjzj3xc68m1hw9r2f2gzf" } }, { @@ -72367,11 +73147,11 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20200103, - 1239 + 20200416, + 2211 ], - "commit": "d6247aaec44f60a9bd161c1d56960f80ab314a49", - "sha256": "0mscnbbv6cap818zhzz3ig6ychrw0zw84zyl2g1rksir0qj4hznf" + "commit": "d431b13e3d47cf2564a04a096d2162ca38593050", + "sha256": "05szncxfm7595ah63k1z3zmivk2z1lv28jcwb1fylx0s93f51z0c" }, "stable": { "version": [ @@ -72391,11 +73171,11 @@ "repo": "abingham/outline-toc.el", "unstable": { "version": [ - 20170730, - 1130 + 20200401, + 1208 ], - "commit": "31f04bea19cfcfb01a94d1fd2b72391cb02b7463", - "sha256": "1pqz2ynw51n3f7d9hknz80d42017lccsggkg13zqmn51wkjpc48j" + "commit": "81d373633b40628cc3a6b6fb534fd7730076bcdb", + "sha256": "1ad6bxa5x95n6i1197p13qy5fgzn1pslwbzqsf4rfy9bvr49g6q3" } }, { @@ -72538,11 +73318,11 @@ "repo": "myTerminal/overcast-theme", "unstable": { "version": [ - 20190326, - 1646 + 20200425, + 1601 ], - "commit": "afb8098ad2234a65ec614f4028f7cf2555134f46", - "sha256": "1fp8awdhpr92fygp6pbx9bdnkc1amngbwsr6c2haj7xb8717zckj" + "commit": "e02b835a08919ead079d7221d513348ac02ba92e", + "sha256": "0fy8739fbhmixgjxgd1j5v2rjkwhsqac5kczx3mdjlfd2w55k3h7" }, "stable": { "version": [ @@ -72605,6 +73385,21 @@ "sha256": "0qcinx4gpfzngirwfis7byrdbgbwk3pak7f8mx5fsbcdnybkk8sj" } }, + { + "ename": "owcmd", + "commit": "13e6df2397380eba31ecbf4a7c1214dedaf9cfad", + "sha256": "0lg6mk5bmfkiifzxz4ijr10nibr5zcbfxzy9cvg6bnzxns6nhgq5", + "fetcher": "github", + "repo": "fishyfriend/owcmd", + "unstable": { + "version": [ + 20200424, + 2314 + ], + "commit": "af0f79c16f573f4dbaafe77a430d7621857e706b", + "sha256": "0mjg5563bka3cc6rysw7fhhh51w4fpysa9ni9v5iv89d8i7mz0yd" + } + }, { "ename": "owdriver", "commit": "f3f9c1bb19345c6027a945e7f265632da1a391cb", @@ -72613,30 +73408,30 @@ "repo": "aki2o/owdriver", "unstable": { "version": [ - 20200326, - 1608 + 20200410, + 1901 ], "deps": [ "log4e", "smartrep", "yaxception" ], - "commit": "a243051365eb7ac0d1845c8b468b90510998f66e", - "sha256": "05a3s01y3sls6as28wvd1y5pmasqlz9k597yba10c0spxvlaijcn" + "commit": "3c52a7b11c8275fdb2e4cf98f68f2a48ad09a3ae", + "sha256": "1lxvcbpzpzs3vkgg4pif3k89ddmj5mamk2q18wc3gx0czs6v301d" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 0 ], "deps": [ "log4e", "smartrep", "yaxception" ], - "commit": "a243051365eb7ac0d1845c8b468b90510998f66e", - "sha256": "05a3s01y3sls6as28wvd1y5pmasqlz9k597yba10c0spxvlaijcn" + "commit": "3c52a7b11c8275fdb2e4cf98f68f2a48ad09a3ae", + "sha256": "1lxvcbpzpzs3vkgg4pif3k89ddmj5mamk2q18wc3gx0czs6v301d" } }, { @@ -72798,14 +73593,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20200305, - 1413 + 20200420, + 324 ], "deps": [ "org" ], - "commit": "1c1e3ec46785d93f4de2e71fc32604bd7c0fed40", - "sha256": "1cgwpj9x10z6y9ykbma39xakzisly5jhp5pkdiwrc5zq5psr2ddx" + "commit": "5106b430a139bb9e37beda177a082dfe36b407f5", + "sha256": "1x5hmvxy9dl88ix4ir1jshjavc99l8884if8c0v9gkjqb31ka9n7" }, "stable": { "version": [ @@ -73417,14 +74212,14 @@ "repo": "UndeadKernel/pacfiles-mode", "unstable": { "version": [ - 20181028, - 1744 + 20200418, + 1806 ], "deps": [ "cl-lib" ], - "commit": "ff58f387e0f85ca20c4c9f119bf13303bf8b5a76", - "sha256": "1my9qhnla61wgrhf0izjx0kyjrxwyz3cfh3xp80mmnxhxrrf21kl" + "commit": "222ae3f540cddee306067c83451cfece1112c09e", + "sha256": "1ps6blv2jhm4i2gr1fbsr1lii9cpr99prhwnxvhxxxy08c9b6mrx" }, "stable": { "version": [ @@ -73544,15 +74339,15 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20200313, - 2338 + 20200419, + 406 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "0e27abf2e65340dc1523b27b923650b863472a5a", - "sha256": "1vrnriijm4c8129ndcimcai2x1mfybp2arkb1x3jpb9ak83ck9px" + "commit": "fb4662a755572c5add43869cdb6dcc577ca83a7f", + "sha256": "1flapr3aq38212m7w9ib56vqmaixz7ggmqd6hjhzphf6q1r5cv3l" }, "stable": { "version": [ @@ -73581,8 +74376,8 @@ "deps": [ "package-lint" ], - "commit": "0e27abf2e65340dc1523b27b923650b863472a5a", - "sha256": "1vrnriijm4c8129ndcimcai2x1mfybp2arkb1x3jpb9ak83ck9px" + "commit": "fb4662a755572c5add43869cdb6dcc577ca83a7f", + "sha256": "1flapr3aq38212m7w9ib56vqmaixz7ggmqd6hjhzphf6q1r5cv3l" }, "stable": { "version": [ @@ -73855,16 +74650,16 @@ "repo": "abo-abo/pamparam", "unstable": { "version": [ - 20200309, - 1703 + 20200410, + 1155 ], "deps": [ "hydra", "lispy", "worf" ], - "commit": "ed730f17074cb12a8fb9a0daa852d1abbfb34372", - "sha256": "0shzsgs5ds4lzw1fv13vdphbhxyqad5s7jwk5zqa5wg42sidxq3r" + "commit": "f9d83bbf5eb883bce6873dd6fd97484b6805215c", + "sha256": "0av69k6psrpmyadm2r0frwdbqyvpa4flzkrmi88w0vx3g0cxiv2k" } }, { @@ -73875,11 +74670,11 @@ "repo": "sebasmonia/panda", "unstable": { "version": [ - 20200317, - 1932 + 20200424, + 2206 ], - "commit": "2a17e3e5c57132777cfef9704565f6bfa129dbe2", - "sha256": "02aysxdb660dh19l07g6h2qvckrrd4aj79lryd6h7j3in1s0sn05" + "commit": "bdd9f80283d8ae4a69f8789e5f18b1560b94fe43", + "sha256": "1ld4igmmjk7p7dxm0mnfks3k0cqpqjxrvlmjdi0m7w11ba8dsah9" } }, { @@ -74063,14 +74858,14 @@ "repo": "ajgrf/parchment", "unstable": { "version": [ - 20200322, - 1714 + 20200424, + 1524 ], "deps": [ "autothemer" ], - "commit": "bf158a064e4a00a47d24ed0c1725204ce6675064", - "sha256": "1vqvfxrwrlmnmp0bidagphajwlxs6kf480xajkpz590m0zf1xfp3" + "commit": "766efdbd444cbefd9d01e7c6f55956d4c9a8db6c", + "sha256": "1jz9vf8wfjnnbbsnxzcpfvj19556w1z9887xvvwn6rsiqqlxgray" }, "stable": { "version": [ @@ -74408,15 +75203,15 @@ "repo": "clojure-emacs/parseedn", "unstable": { "version": [ - 20191113, - 831 + 20200419, + 1124 ], "deps": [ "a", "parseclj" ], - "commit": "f42ff988338484815ccd925c8f83a32c5d52319b", - "sha256": "0cx1zf82mjwlnj6znas8b94ws1f3n2h0imyybi9qirvsp90qd4sl" + "commit": "92bf875962e62f8c6370b56991d546f122536c6b", + "sha256": "0xli6cf0fzydnd683v3hk5kfsbxwh83s916fd64j8ak0wzjnlsfr" }, "stable": { "version": [ @@ -74556,8 +75351,8 @@ "s", "with-editor" ], - "commit": "98193d3bbb3538eda457d0db4ccccbcc4b04ce3d", - "sha256": "133b2m49jd2bw0k5f77y8gc2w53vhp3rym5mzqx7mlfgssgd795k" + "commit": "07b169ec32ad6961ed8625a0b932a663abcb01d2", + "sha256": "1dl3bck16zwhpspjrms11dknqgadnmpjqhcplkvv3v4f7vbnij6v" }, "stable": { "version": [ @@ -75049,6 +75844,21 @@ "sha256": "03k3xhrim4s3yvbnl8g8ci5g7chlffycdw7d6a1pz3077mxf1f1z" } }, + { + "ename": "pdb-capf", + "commit": "f0b7e12b9f49dc4ed1cc5a6893accc882896f334", + "sha256": "0656a2s8r8dg11in8r5xx984lcxd5g5l3x6vnha50s0c4nx93x3y", + "fetcher": "github", + "repo": "muffinmad/emacs-pdb-capf", + "unstable": { + "version": [ + 20200419, + 1237 + ], + "commit": "2f4099aa1330f87df4e9cd526de057ee9b71de6c", + "sha256": "0fdzhsz3784lf50mdabz9h2b6992cab2nnn4xv7rx2a8hsyyq1mq" + } + }, { "ename": "pdb-mode", "commit": "6aee132aa24322fe1ac88ae17ee6e77ae1ec8d11", @@ -75275,24 +76085,6 @@ "sha256": "02k379nig43j85wfm327pw6sh61kxrs1gwz0vgcbx9san4dp83bk" } }, - { - "ename": "perl6-mode", - "commit": "4e912dccdee12f745272d26ea10d5f106a27cabc", - "sha256": "0r5q2nggb9kbjcdfv81d7sm41jqz040j9z52fnck4b9mlz2dy6d0", - "fetcher": "github", - "repo": "perl6/perl6-mode", - "unstable": { - "version": [ - 20180619, - 1159 - ], - "deps": [ - "pkg-info" - ], - "commit": "88de065795d6863b23b6042576b9e90f8cbf8798", - "sha256": "0m8kc8j1rwy30439k4l5f351jkfjjp38mjm891ax8ghp9zk5pr7h" - } - }, { "ename": "perlbrew", "commit": "24bd9c2cd848f5003a244a7127e8fc5ef46bdca4", @@ -75497,25 +76289,25 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20200326, - 2358 + 20200418, + 1815 ], "deps": [ "cl-lib" ], - "commit": "2ac6aff0569923993a251beddb3046ec44841408", - "sha256": "1z05vk85zbq4pj1xs69p5x3hwdshl829y28d5j2ckivl313p4had" + "commit": "c3075b52db1f973202303fa306c56a24d9d47fc9", + "sha256": "0mcsrkga5y8sl05mv3n4lmjpgn9mcpy01w0qz55a6jv301rda3p0" }, "stable": { "version": [ 2, - 6 + 7 ], "deps": [ "cl-lib" ], - "commit": "2ac6aff0569923993a251beddb3046ec44841408", - "sha256": "1z05vk85zbq4pj1xs69p5x3hwdshl829y28d5j2ckivl313p4had" + "commit": "c3075b52db1f973202303fa306c56a24d9d47fc9", + "sha256": "0mcsrkga5y8sl05mv3n4lmjpgn9mcpy01w0qz55a6jv301rda3p0" } }, { @@ -75567,19 +76359,19 @@ "repo": "Alexander-Miller/pfuture", "unstable": { "version": [ - 20200113, - 620 + 20200425, + 1357 ], - "commit": "fbecd1562b34fcd15563b7cc00d98e5af0d7e43d", - "sha256": "1imqavzc0isba3yh128jzsy27x2983sjiqkf6q2xw43mbjknl8dy" + "commit": "d7926de3ba0105a36cfd00811fd6278aea903eef", + "sha256": "1chpin5277vbl2xvsl04pzzk7a9dbcvclibm2496gz6yvd19pwsf" }, "stable": { "version": [ 1, - 8 + 9 ], - "commit": "fbecd1562b34fcd15563b7cc00d98e5af0d7e43d", - "sha256": "1imqavzc0isba3yh128jzsy27x2983sjiqkf6q2xw43mbjknl8dy" + "commit": "d7926de3ba0105a36cfd00811fd6278aea903eef", + "sha256": "1chpin5277vbl2xvsl04pzzk7a9dbcvclibm2496gz6yvd19pwsf" } }, { @@ -75979,11 +76771,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20200323, - 1215 + 20200415, + 1405 ], - "commit": "b5d99881002e3c62ebe874ad9f48474afc16c62d", - "sha256": "0pq7nccmrbvrf7120d48aqymdwh5jgjvzwi2820hdw8j6b7prm4h" + "commit": "4d0b4a04401a2b9f9ff834f6ed58bc7cc5b878c0", + "sha256": "0lgw1lghib0vv4byrhjimldxyqyav4qypprk9ppvwjbad1j0hfkn" }, "stable": { "version": [ @@ -76071,8 +76863,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20200324, - 1347 + 20200405, + 1544 ], "deps": [ "async", @@ -76081,8 +76873,8 @@ "f", "php-runtime" ], - "commit": "31fe2ea4dbd5c2f23efd6a4ec2ec881a4ced6b05", - "sha256": "0j52n0vs85q7zz5xfqw4rgrjjpr7mzfiqbzk7vwkcdmpnax608w5" + "commit": "860d7e8784b261ee71deba354d01c3038cd777ab", + "sha256": "1d3fijh11g70xhx3a47l75mrp64bvkk7hh9lg83nl30qhn2vrbn3" }, "stable": { "version": [ @@ -76136,20 +76928,26 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20200122, - 1256 + 20200411, + 531 ], - "commit": "a1c30ca634107551c20c846b5316ca5697adb06d", - "sha256": "0b7rnzk1zkrzh978bmh2dsy78f0sb4ia1w06khyqiby52m27q9k1" + "deps": [ + "php-mode" + ], + "commit": "2f715a186c5fe6576de83d4c0b64a37e2bfce101", + "sha256": "03ix2s068pzmybj0fcb08dlfgdqw0pmqhbdf4id2077f67bfad0w" }, "stable": { "version": [ 0, - 3, - 3 + 5, + 0 ], - "commit": "535e172e1c561bc7b8c706b4e03bbf71689bd83a", - "sha256": "1hn1rdgymv81rm8nkibnc5jazgjrx3sz4w1lin85rgypzbfaf6wk" + "deps": [ + "php-mode" + ], + "commit": "bf9e82a63f2ccb12af02c9e79a83e7989eeb7cb1", + "sha256": "15kv5xv6lcfgf048wr2zsnpvrplbxypy3wq56zvrzbq18hwprqg1" } }, { @@ -76351,25 +77149,25 @@ "repo": "davep/pinboard.el", "unstable": { "version": [ - 20191203, - 1015 + 20200402, + 919 ], "deps": [ "cl-lib" ], - "commit": "9351a2320f1e75896f56032959c7bcbf9d9aa560", - "sha256": "080fzpr7is05cb8fj0rzhfc8pmb1rwfmkqnydj36d56da1ndrfmw" + "commit": "7c57f20667ead2bb27ab1d0a03307c28ea728bd9", + "sha256": "0d9z1hr2082sbg4dlmarksh598xd92w7c09xmdjyn1yqm39gsljw" }, "stable": { "version": [ 1, - 2 + 3 ], "deps": [ "cl-lib" ], - "commit": "e14dd43cf74f254a898ae1c698a97d58734fc1a8", - "sha256": "0ljxvp9yppnmy1lnnipqqbk09bmay523haa8h0gnfnrl02jwgs91" + "commit": "7c57f20667ead2bb27ab1d0a03307c28ea728bd9", + "sha256": "0d9z1hr2082sbg4dlmarksh598xd92w7c09xmdjyn1yqm39gsljw" } }, { @@ -76673,11 +77471,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20181216, - 1331 + 20200425, + 616 ], - "commit": "e30e37730b5f30bc0dd5b9328fbf4cb3e6f46fdd", - "sha256": "1ijx067hlbr4yz9b9h58pwlqd4rgjgm27f5s1f9f3rwb249s36s1" + "commit": "bc22301198b3f581d89352510e847454fb1cb9ff", + "sha256": "11il65myybgfj30psicfgqpjwwpa6hwapf55d497x8kbixx2kpg1" }, "stable": { "version": [ @@ -76983,11 +77781,11 @@ "repo": "flexibeast/plisp-mode", "unstable": { "version": [ - 20190914, - 513 + 20200403, + 613 ], - "commit": "02738af25707e39d8a608b09a24173bb05f5be9f", - "sha256": "133wm5fd91z9k3zpflb455nglpgy1dqyz3mz2s694xyppw4rvkia" + "commit": "03dcd523295a0dec76356d23043428d850b03b70", + "sha256": "0g9bwd137z543pbdq4j74j0ql8j2657yxh4kb809jps9kxq8dc0k" } }, { @@ -77718,11 +78516,11 @@ "repo": "polymode/polymode", "unstable": { "version": [ - 20200316, - 1314 + 20200411, + 915 ], - "commit": "44265e35161d77f6eaa09388ea2256b89bd5dcc8", - "sha256": "18ssl2h861dm2jkd3df6wkfr48p8zk337dbvpq5522kia7fq1lbn" + "commit": "2a61fb6d3e805bc0e4ca7b6510510a955c6bfb6a", + "sha256": "0cphikjz9hwij1k41radyar6nh7md8v98qwn2j9lzcbyz69hrvaq" }, "stable": { "version": [ @@ -77801,14 +78599,14 @@ "repo": "ponylang/pony-snippets", "unstable": { "version": [ - 20160205, - 411 + 20200418, + 354 ], "deps": [ "yasnippet" ], - "commit": "b921bd943b528f04d4293625b28fd2d4a013a1bf", - "sha256": "183vml7090w1fx99rz9d8qjfbf089wqilyflk0512xz8al3gcd8q" + "commit": "115a0d5066f89554bee9cb1045bcda5a18ebd441", + "sha256": "1g11w52bf724zwwsvrcylk3ndjci2cnbzing77c91psz6d7zjkvw" }, "stable": { "version": [ @@ -77861,28 +78659,28 @@ "repo": "aki2o/emacs-pophint", "unstable": { "version": [ - 20200322, - 737 + 20200420, + 1429 ], "deps": [ "log4e", "yaxception" ], - "commit": "2c43423c87c6892b0fd16e3749e021a3743ee708", - "sha256": "0ila3vqv5wkna11qmm221iv1nzafnvffda19mqmv8fpl2iv1197s" + "commit": "5e13da4578ae7ba00e6f7bae31eb546d713cc19d", + "sha256": "01bwfswzzrjxrjaqysaqnav7h3swwyigxw7nj0cgrm3w8cp1y2a8" }, "stable": { "version": [ 1, - 1, + 3, 0 ], "deps": [ "log4e", "yaxception" ], - "commit": "2c43423c87c6892b0fd16e3749e021a3743ee708", - "sha256": "0ila3vqv5wkna11qmm221iv1nzafnvffda19mqmv8fpl2iv1197s" + "commit": "5e13da4578ae7ba00e6f7bae31eb546d713cc19d", + "sha256": "01bwfswzzrjxrjaqysaqnav7h3swwyigxw7nj0cgrm3w8cp1y2a8" } }, { @@ -78096,30 +78894,30 @@ "repo": "jcaw/porthole", "unstable": { "version": [ - 20190721, - 1428 + 20200404, + 1454 ], "deps": [ - "elnode", "f", - "json-rpc-server" + "json-rpc-server", + "web-server" ], - "commit": "0e73b8e527cfc9ecba2fa4f88382f588fb4a300d", - "sha256": "06nf12cvxk2dxqljrga59vp8wkvsif1mm3ahvy1nbjsq6s8zryq4" + "commit": "9e68b419acf9245208f8094e10041b7f04511473", + "sha256": "0kaf00924jg50l2zdhyf1lxsh44nfp4zbc23wxbir45xdx9rzl3z" }, "stable": { "version": [ 0, - 2, - 5 + 3, + 0 ], "deps": [ - "elnode", "f", - "json-rpc-server" + "json-rpc-server", + "web-server" ], - "commit": "481a3a247586417b7643d393113ff8faf95b327e", - "sha256": "1gdywyb1vq7i983d4bdhwdkk0vk0x09rms83xyk4j75qlqb05vp1" + "commit": "9e68b419acf9245208f8094e10041b7f04511473", + "sha256": "0kaf00924jg50l2zdhyf1lxsh44nfp4zbc23wxbir45xdx9rzl3z" } }, { @@ -78154,20 +78952,20 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20200319, - 907 + 20200426, + 819 ], - "commit": "c15800a8388696474fe9f8466fce1b40735b9304", - "sha256": "14xjly5cqziqb0gnklsgg28vimdrpq8273z2inf1c0jnak8x2vzn" + "commit": "093b29a53cbeda6d637ccc9ef4dfc47123e79b9e", + "sha256": "0wca1w667h930dyi3hm1kqiqapggnwbgqjbxiwpgj7l773s7xdbw" }, "stable": { "version": [ 0, - 6, + 7, 0 ], - "commit": "9638b9d9cf8b9727a13c86f70b5d33bf938497a5", - "sha256": "12r1as9lqqc6anckq455dqv8dbqahnbdzj437i11053wv33cv5vd" + "commit": "83b4d39fdda34355c01aecc22677f7376ae0f013", + "sha256": "0cjrl4xgs70hbw1a1mqkdmpcmrxaakw8csrz365c31vj14nii0ax" } }, { @@ -78372,11 +79170,14 @@ "repo": "conao3/ppp.el", "unstable": { "version": [ - 20200318, - 806 + 20200418, + 1551 ], - "commit": "bfb9ddfbc124b8b97d7a12610947b76794c0fd06", - "sha256": "1632y0vaxv043w4js5jpd9zr36bzy9pwxnhmlh44hmkvgfw07qvn" + "deps": [ + "leaf" + ], + "commit": "27683aa4a0df67b4539bcaa2e82d865023cf1fae", + "sha256": "0azqpmlz6r2amklzrgi0wgmy89fbkz0kkpikgf5gccfmks5pij6y" }, "stable": { "version": [ @@ -78434,19 +79235,19 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20191224, - 220 + 20200412, + 1607 ], - "commit": "a194852e8022762843052e58a9d0fbdaa1df0fe5", - "sha256": "0da4s32fza42vdiqhh7cdim08by5i4909q93ivxkmgrmqfgdvz0p" + "commit": "0f4a89bdec61395138d968a38d375e63ccfbed63", + "sha256": "0nnf4y49pl9lcs90y5z6f02g1xwk1jjrl0qs7gcv6kpn0vn8kn0h" }, "stable": { "version": [ 4, - 0 + 1 ], - "commit": "ad9fbe8a17fe74b27a39bcc034f3da1865663387", - "sha256": "008hxy1vasnyz36wwg44gikpi80ng75hj85nrswk60b7z7cznbmr" + "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0", + "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3" } }, { @@ -78622,25 +79423,26 @@ "repo": "alphapapa/prism.el", "unstable": { "version": [ - 20200315, - 1926 + 20200407, + 1148 ], "deps": [ "dash" ], - "commit": "636059b6ca21d7dd2d46776d799f94b476c62ee2", - "sha256": "014zvdqizjqp1cxs8a45nj2nfpvjsfmls41780pjdvzvrvyq16p0" + "commit": "b618f2cea2dbf7c13d8b4fec1760c346eb9ab036", + "sha256": "1fn6514ii2z1xbjzmp0h1mhxl1yaqqk4n6zgswhxdywni34cb6hs" }, "stable": { "version": [ 0, + 2, 2 ], "deps": [ "dash" ], - "commit": "636059b6ca21d7dd2d46776d799f94b476c62ee2", - "sha256": "014zvdqizjqp1cxs8a45nj2nfpvjsfmls41780pjdvzvrvyq16p0" + "commit": "b618f2cea2dbf7c13d8b4fec1760c346eb9ab036", + "sha256": "1fn6514ii2z1xbjzmp0h1mhxl1yaqqk4n6zgswhxdywni34cb6hs" } }, { @@ -79041,8 +79843,8 @@ "deps": [ "pkg-info" ], - "commit": "56e18fcefa2f286edfec98853189985823d0e53c", - "sha256": "0iq93ghwj96xxfsa5s90g36ngwpa92bj91zvkkk40zn9faqkdllc" + "commit": "2aa3a663fc9a9a75c3bf73699e40ecc0c3567268", + "sha256": "1cw4bgj9iglcs71zrbx8rjk19dfvnws795qbm52hm7zs95lfprxn" }, "stable": { "version": [ @@ -79156,8 +79958,8 @@ "repo": "asok/projectile-rails", "unstable": { "version": [ - 20200203, - 1226 + 20200417, + 1711 ], "deps": [ "f", @@ -79166,8 +79968,8 @@ "projectile", "rake" ], - "commit": "0398d940a201128946f619de842b0d1f9f0fffbd", - "sha256": "0cfrm56bxdwb96xqpdih6hqh61gvc1wal4yp7d7c414j8h0s7d02" + "commit": "11980b2bcb99208888856a9b8666ff329b6f0142", + "sha256": "0crb08byq1i9wcjmcl645wc03p1jadm4f9nd138rii69nzancwfl" }, "stable": { "version": [ @@ -79233,8 +80035,8 @@ "projectile", "sift" ], - "commit": "33b2c9ff964fe53bb55b37429faaa4e903bead7a", - "sha256": "0cb8rcxl0jwpbgz9kk136l2ranficv8lk85fhvly1lpslbjljds9" + "commit": "cdddba2d183146c340915003f1b5d09d13712c22", + "sha256": "0ln87nhq2vhsb0ywn7rp0b3hzms5z7l6cv6dng08yly12r2957if" }, "stable": { "version": [ @@ -79407,11 +80209,11 @@ "repo": "chuntaro/emacs-promise", "unstable": { "version": [ - 20200320, - 341 + 20200425, + 617 ], - "commit": "02c470bd6c7bf4ea4244d304f57997bad37c9bb7", - "sha256": "1sjwwram45pb9bjap6h24m6734qr5yhnai2lqbdvxd0nplfv91ng" + "commit": "2a8e71420e8c9d2d4ce951d4342762aeedaae654", + "sha256": "1drz8qbcw5qjh5v0vkvflni14g58nmkmyn11ksjd49ck296mfsp7" }, "stable": { "version": [ @@ -79487,11 +80289,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20200326, - 1804 + 20200416, + 1351 ], - "commit": "9196749d55413224355409d55003f7f8c8ba0f79", - "sha256": "17ak2nbgiqwldk6y4cg4qq49hnvzw32jm4m3dqag2smvkl6rjw19" + "commit": "e901c0bb73e0e66c95879bbb3738ac79e91ffeaa", + "sha256": "1j6dwcpplh98wf3mncidc8gn96pv58g71igim28gkqx21g8p2i40" }, "stable": { "version": [ @@ -79594,8 +80396,8 @@ 20170526, 1650 ], - "commit": "dec4939439d9ca2adf2bb14edccf876c2587faf2", - "sha256": "0kxrgv1pb38lsgpgilaqjlvw6inmlbs8rdrm2bfilzcwwrr92bi9" + "commit": "dddeed298bf84505f4d123a068f911025b351661", + "sha256": "10a70drfyanrjpx157aip402vd56ynm85ryzripd3w0symn9k1c3" }, "stable": { "version": [ @@ -79806,8 +80608,8 @@ "repo": "fvdbeek/emacs-pubmed", "unstable": { "version": [ - 20200315, - 1938 + 20200426, + 1239 ], "deps": [ "deferred", @@ -79815,14 +80617,14 @@ "s", "unidecode" ], - "commit": "cc5d258ac83650ad6e8043c8c01d9162c2460308", - "sha256": "13n7i80734848by8f0b3z0mqv0rh9x42hglkc8abhmilc0sg4i0y" + "commit": "e619042f3c0383c7d4e1762fb46ff680e90906d6", + "sha256": "1igvmwxfpa19aws7h066hk9axwgl3swp8lmn218c1hmq2j2jkwgz" }, "stable": { "version": [ 0, 4, - 2 + 3 ], "deps": [ "deferred", @@ -79830,8 +80632,8 @@ "s", "unidecode" ], - "commit": "f6e13137ad7731c8b0eb1720aed48d1a1edf4719", - "sha256": "1nanaj0liilnplh1njbmch7qsa2h7izkc51bpd4hxw6k4bslplqc" + "commit": "e619042f3c0383c7d4e1762fb46ff680e90906d6", + "sha256": "1igvmwxfpa19aws7h066hk9axwgl3swp8lmn218c1hmq2j2jkwgz" } }, { @@ -79872,11 +80674,11 @@ "repo": "flexibeast/pulseaudio-control", "unstable": { "version": [ - 20190828, - 1136 + 20200406, + 752 ], - "commit": "1b844a9b21d549bfe767990b4c611de3bc4e2241", - "sha256": "0fz2ynxxgq3j7hvfmqq24gvbfpc08apz6zw9cjav08r5z04n1xr3" + "commit": "a931533140547510decdc368f39b2d2b97ca725f", + "sha256": "1jvjn9jszjjapi167an49jxcvr88cvgjwykglhp4b8lwhbjfqw76" } }, { @@ -79956,26 +80758,25 @@ "repo": "voxpupuli/puppet-mode", "unstable": { "version": [ - 20180813, - 1947 + 20200419, + 1236 ], "deps": [ "pkg-info" ], - "commit": "7dee1b5a5debac6e56f9107492a413b6c0edb94d", - "sha256": "01isn90h50p5c6cgzwhb1jq8yacj0fxw9ppfqrnynckg6ydpvg74" + "commit": "0197b405c79a5d0718979f31df760bb3bfca38de", + "sha256": "0k1r0r1cvk6z3lj5shgd8ly78sfl8bbkmld6x5cvw481ynyb7rgy" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ - "cl-lib", "pkg-info" ], - "commit": "d943149691abd7b66c85d58aee9657bfcf822c02", - "sha256": "0xr3s56p6fbm6wgw17galsl3kqvv8c7l1l1qvbhbay39yzs4ff14" + "commit": "73ea35bc7a3ad663c5b73f65cb6377eb0ae11d6f", + "sha256": "0c5q8qmbligzjsn05di4wh6ggpd3944j4yqb78vzd441b8ssq70i" } }, { @@ -80418,8 +81219,8 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20200326, - 719 + 20200426, + 505 ], "deps": [ "async", @@ -80427,21 +81228,22 @@ "pyim-basedict", "xr" ], - "commit": "84af8e80a4ac8fa19e7b01a3f9984280e7d501b4", - "sha256": "0351mvnnm0xzmlm71byxlbn8dp7qnpw8d12ghwdmd53q87pfgz9s" + "commit": "b934273bb33d6be6aea6e20e68930bc5aaf4a48a", + "sha256": "01ykgpzkv06gxiaqj4z1qwf00pwdfm0zxzbsy4xr8ciyhhxbc9pj" }, "stable": { "version": [ 1, - 8 + 9 ], "deps": [ "async", "popup", - "pyim-basedict" + "pyim-basedict", + "xr" ], - "commit": "8648d467d79b3bf1c3a99623f9329939cacc40da", - "sha256": "16rma4cv7xgky0g3x4an27v30jdi6i1sqw43cl99zhkqvp43l3f9" + "commit": "8fe9897f57e410a7637692d98c40876cb3bd6c2d", + "sha256": "1n9syy39rnma0giz2g1dhdfjj4nn5bls2qzswy48snfl5z5mfm5j" } }, { @@ -80494,14 +81296,14 @@ "repo": "tumashu/pyim-wbdict", "unstable": { "version": [ - 20190201, - 2300 + 20200331, + 542 ], "deps": [ "pyim" ], - "commit": "9799b689643052078f53d69342a82315251490f4", - "sha256": "1rqlckmlmwmnqvk8bbcyvwr54p6x9b1fph5f17anzlvwffdjsw5c" + "commit": "daa223e2603a5ef3e6c8e33575d8f4e4604a8d3c", + "sha256": "0inl29fa2l5grn6z2wszj43bv17yf7n9x8l77zk2xp8q3gkswd86" }, "stable": { "version": [ @@ -80573,8 +81375,8 @@ 20170402, 1255 ], - "commit": "53e5406b9279008f3ae8b5f045e5cd5773771d70", - "sha256": "0c6d0pmbinj65kacnqzbsa6acb3as8blrl5f202s8bbb9zd62vam" + "commit": "be5a61b13e48a129613e0c659bfd28bf9824f53c", + "sha256": "124pf14z2yc56bvn0vvg0irzl39q3bbng4zp75qjzgb7d387n4hb" } }, { @@ -80758,8 +81560,8 @@ 20190716, 921 ], - "commit": "0d2f783f5a868ded8a37aa5881f8952aa36b053f", - "sha256": "1cqcxdg4bv8ybw5ds5av4id39fyk711bfadc779ilj5dn0mcd4h7" + "commit": "ec253711f2bdcb3848046bb68f6405a7bf9eb0fb", + "sha256": "0m27h2ycjz212r012wh4wsahidclmb74gk9g3v6ym9a2120bk0dh" } }, { @@ -80815,11 +81617,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20200224, - 1148 + 20200417, + 648 ], - "commit": "5bf2c0dafb086684124c3997a618d40ac8db0fb0", - "sha256": "1hz9j8k4bybvi3kgq51rqi0rwy3d7c5wqvx2kkljh6734m9x8xp2" + "commit": "9c336295c830f684dbf043fbbde432c54a2b4678", + "sha256": "0h02d02wv5hkz3lnjr9zxr8dwd4b1v2r6wf808g0x6xqnm01wspm" }, "stable": { "version": [ @@ -81139,11 +81941,11 @@ "repo": "lbolla/emacs-quasi-monochrome", "unstable": { "version": [ - 20181213, - 827 + 20200415, + 705 ], - "commit": "68060dbbc0bbfe4924387392874186c5a29bb434", - "sha256": "0zp2xr0bjfqrpb0bqczzick1vvbjmipjavrdi70kw6a9caynvq22" + "commit": "b38d71860fdea945e10e8a766ac9dfa1410ade67", + "sha256": "0jcwfmamvpd22r5sbicbf9442b22lvldfrqldysm4l9yyxs11jy3" }, "stable": { "version": [ @@ -81437,15 +82239,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20200329, - 1841 + 20200420, + 1412 ], "deps": [ "faceup", "pos-tip" ], - "commit": "c8ac9971814ca9df8ec406f3b76c9ba4878a5d57", - "sha256": "0jnw9plmw3r2c12kcy4435v2kf0vmmla9ljb670zhcg690a5cjqh" + "commit": "2827e95c5a2605cc25a549b260763922ecd68983", + "sha256": "0f6k9nlg8kz739pla0hkyp010cgdw9jd0qcii1d6dd1w3a84xk3v" } }, { @@ -81608,6 +82410,24 @@ "sha256": "1dk2clsnmjy3bfv6laxf8sslvdajjbwpk83ss8v9xm55dcxjvd7n" } }, + { + "ename": "raku-mode", + "commit": "e9831cc66d9a9e6b6441e6a75d54ce57146571fd", + "sha256": "08c9mgvmcnhn2q1ldqsaabj623b9kxd7blgfjabbwrl7bqkqpwzp", + "fetcher": "github", + "repo": "Raku/raku-mode", + "unstable": { + "version": [ + 20200426, + 1156 + ], + "deps": [ + "pkg-info" + ], + "commit": "e4d8b0230a503f315087443e24708a78ad8665d9", + "sha256": "1864kwd5ixghsr219jlqmgg5gpv802q8xfsk8i8yi5dcy1jn1ckr" + } + }, { "ename": "rally-mode", "commit": "0914825c6d5ad26d2a8035fc33ad98df42df3c53", @@ -82045,11 +82865,11 @@ "repo": "ChillarAnand/real-auto-save", "unstable": { "version": [ - 20190224, - 1446 + 20200418, + 405 ], - "commit": "824ad04121493723b08838c8b96559947dca7ed9", - "sha256": "1szpjv04rp9x9ph44a5s56a2y96z5x474bccsjnmn6yhingh5qik" + "commit": "d55c63106f6000c065f9c256fc4491ea07b2745e", + "sha256": "0b4drlzc384rp43m5454g86d866hx1lj4qdi3mlaz835nl8m86ki" }, "stable": { "version": [ @@ -82068,16 +82888,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20191123, - 1341 + 20200418, + 1721 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "94f283593304c2f673cb4940900197d9cb099faa", - "sha256": "00dzw6nqqsgdlcvpnq1zc2568l5hz7vynqx6vkvvbj3jafc6nwj7" + "commit": "e03446f54c7ee0b4ed3ec7300597046cf1de2bb8", + "sha256": "160pv9jx66ygl3z1g8yrw7f786403lbb182nz972yl4nyjchbdw7" }, "stable": { "version": [ @@ -82325,11 +83145,11 @@ "repo": "xendk/reaper", "unstable": { "version": [ - 20200120, - 2006 + 20200420, + 1703 ], - "commit": "6602e74d6190d2e8dd61358bebb513c3ae8b89fb", - "sha256": "1pywz6xm3wjkbcj5zr7w5xh5wfggvivnw94mmsm6lybnv2zgjg1d" + "commit": "c594d2fb9a027f360e98539a1debf5db639846b7", + "sha256": "0md3aqzy8rgvpafh6f8f2dwwrc43q317bk7p1whghfvji52aindv" }, "stable": { "version": [ @@ -82352,8 +83172,8 @@ 20190710, 1037 ], - "commit": "5e6205cfede8c10c6821dfd9f9757a9d8035ec04", - "sha256": "0w25z5v551w7fcjwk73dwxhp4lydjrn4rc99swd1ffxyzp5cap56" + "commit": "7cf6fbf4e8e86ebb76d118b2703e20b968e030d4", + "sha256": "0b8p7lh0ifrw9rqvv15q3ib206d1wfv3xafpqwc70zzwaxswvk06" }, "stable": { "version": [ @@ -82453,7 +83273,7 @@ 20180205, 556 ], - "commit": "6cb762efbd0aa323f96c687b6bebc9bf00a3ceb3", + "commit": "84bbac534cb114d8d11b86790435b65d36e99e68", "sha256": "0lnnh28qax4qk9n9sng7sgb0w0mnjc8abnch3bd0ba9g5x28z8bx" } }, @@ -82769,11 +83589,11 @@ "repo": "purcell/reformatter.el", "unstable": { "version": [ - 20200327, - 2358 + 20200426, + 818 ], - "commit": "e8f70b20caf6672353a2b0ee3161d4791c412696", - "sha256": "19mji7frfvj925nx2m2cdvsx0lf69dzdl5wbdppyra9717rsspbq" + "commit": "dc6278a6b1e3565604346ac41a6ffc3cbab04031", + "sha256": "147qrqs3ndc4xfbb9wiymjsskccp54qpj8bn3i19n9zwm4kmgdzr" }, "stable": { "version": [ @@ -82930,6 +83750,24 @@ "sha256": "18mskl1w5n2cksjds27d1gcrwb065vp9n6hnw9402j3n6z0w8srv" } }, + { + "ename": "rego-mode", + "commit": "fbc0b93675f6baab6ab023b596e65658c9e2a534", + "sha256": "0qdmn6kh4bh514qh0ii881c03p3hcdp1qlmdwpp5nlzxlkxbgp07", + "fetcher": "github", + "repo": "psibi/rego-mode", + "unstable": { + "version": [ + 20200413, + 450 + ], + "deps": [ + "reformatter" + ], + "commit": "41c99057d0406c7fb3895a03da777af3961a648d", + "sha256": "1dw6f60ysyvxgm5gpir37ay8z9csykxj0r7v9h6z38cswicg27sj" + } + }, { "ename": "related", "commit": "555932a7b9cf11b50a61c2a9dd2636fd6844fac8", @@ -83568,8 +84406,8 @@ 20200324, 1113 ], - "commit": "030e89a38df6d194546b0629f90c9e1898370eb7", - "sha256": "1mfjwxf1l0py2ididzdv86r118ws9iscdv23a0kgf2cjd6ydpbjc" + "commit": "a2a75a929fc022e752759ed2a38accc639128dbe", + "sha256": "0s6jmxq9sqi6pm2kdrdik30nyz136kk2gqzdibb0wcvpfylhwawn" } }, { @@ -83822,8 +84660,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20200329, - 1205 + 20200415, + 1454 ], "deps": [ "cl-lib", @@ -83831,8 +84669,8 @@ "popup", "posframe" ], - "commit": "f78719e5d8c8d2ec6da0f66e0b1e7d660d3a5a89", - "sha256": "0pcncx1w7y8rnsg23lf055cc38xrwhx26yhrqwzdf996cad54y6w" + "commit": "9afeb4aa45771ef20c83d1208744d954273cbaf3", + "sha256": "00lnsxi2j1kvd28vq10ixj16qfkn22bw2m02zrs022d9jwcsza5r" } }, { @@ -84265,8 +85103,8 @@ 20200221, 36 ], - "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", - "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" + "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7", + "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3" }, "stable": { "version": [ @@ -84291,8 +85129,8 @@ "deps": [ "rtags" ], - "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", - "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" + "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7", + "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3" }, "stable": { "version": [ @@ -84763,11 +85601,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20200322, - 1749 + 20200414, + 2105 ], - "commit": "2df6cf72163db57fd0c79fefd0e79f38f29f7d93", - "sha256": "1f8fbzkc6ifx91kcf5blx22bh3713qmm5kj95i06k8cn10nlx11f" + "commit": "a364b24af412659cc1074f533752356d1858b893", + "sha256": "1yj3b5li2flgxc3frmb7zjc92nhdq526jj6105zrsnj7ndxqycp4" }, "stable": { "version": [ @@ -84879,8 +85717,8 @@ 20180406, 808 ], - "commit": "03410e6a7a2b11e47e1fea3b7d9899c7df26435e", - "sha256": "074ny8y68fhnknkjxvrijrk534xzdiwip8wkifxfbwv3va315x83" + "commit": "43ba8b563bee3426cead0e6d4ddc09398e1a349d", + "sha256": "0bqdlcg5pah9a50dww8n5n0lzc8bzmpc230fdkinw8zrxph13p12" }, "stable": { "version": [ @@ -85270,8 +86108,8 @@ 20190413, 1246 ], - "commit": "cc2dfa14eb3922d93c15f30734e8211c77ceada1", - "sha256": "11n26dksppjylg5jafxf4j859n6c1062v85qci8fx762wicz0bkf" + "commit": "f13d03efece7c1f31e9c3fe2e99b71a33cc43e1c", + "sha256": "04b63yww5yz4jn18mzpv53yzs6g6kmxs61m2ycnf59cb6ax2ajbd" } }, { @@ -85465,14 +86303,14 @@ "repo": "technomancy/scpaste", "unstable": { "version": [ - 20190228, - 2151 + 20200415, + 40 ], "deps": [ "htmlize" ], - "commit": "568faaa70fa0413e2d165ad232cd4c6ec2815197", - "sha256": "160m4w0i9cj4zxmmsknmnvycscj9y8da39y1362kv7dpmwnxsxcp" + "commit": "ca95a8dd088e848bd1cab6be207c6a98343ee176", + "sha256": "01v199xkadcbdr627skhisixdqj0hbbyv912xgyypm1rxdjfhhx9" }, "stable": { "version": [ @@ -85633,11 +86471,11 @@ "repo": "ideasman42/emacs-scroll-on-drag", "unstable": { "version": [ - 20200328, - 116 + 20200411, + 1050 ], - "commit": "2d79a6d9c2497f701335fd66154a67cd51073c9f", - "sha256": "0m2605k8i2z44mqw5ibviwsbn3j8g8hs4q9cih5ip14lik6hhrdz" + "commit": "42d96a60a207cd73e7a58111358deb05f084c59e", + "sha256": "00l2n5kx5p18qdlfh2y355w34yp2fy401canrglz6dq1f7615lnz" } }, { @@ -85980,6 +86818,60 @@ "sha256": "1kkxm8ysjcx0vs6lic0lcncr2kcmjmh2n5y8j9303lhzzhh73psg" } }, + { + "ename": "selectrum", + "commit": "4273a6e55cf797d1fab1825618aab7e9b6c01886", + "sha256": "012jmgr7w6x0gy8ygpzyyk23adyzmr7cknz2w51zjapcilkf6ghv", + "fetcher": "github", + "repo": "raxod502/selectrum", + "unstable": { + "version": [ + 20200425, + 1449 + ], + "commit": "dc1c8e8704f5eb73c540f2b4ca3eed213d2c3246", + "sha256": "0acifs68m6y5zfwadvvvlg7s4zhgazmrg6al7piy1nycq7dmng6b" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "5995a4ba07a7b1b5f661ff050d93ad702f9014a4", + "sha256": "105zl102dwbzvk50xh6b824nq6p24kxhky18ghdnk5yi5sv620lm" + } + }, + { + "ename": "selectrum-prescient", + "commit": "5724ebca5ab5a1c3087cc13ae0693548666ed62b", + "sha256": "1zr83pq39i56v5bx78cp5cg2lrwz01975ng4h1ziv6nrh9p7vvr0", + "fetcher": "github", + "repo": "raxod502/prescient.el", + "unstable": { + "version": [ + 20200404, + 1550 + ], + "deps": [ + "prescient", + "selectrum" + ], + "commit": "0f4a89bdec61395138d968a38d375e63ccfbed63", + "sha256": "0nnf4y49pl9lcs90y5z6f02g1xwk1jjrl0qs7gcv6kpn0vn8kn0h" + }, + "stable": { + "version": [ + 4, + 1 + ], + "deps": [ + "prescient", + "selectrum" + ], + "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0", + "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3" + } + }, { "ename": "semaphore", "commit": "1cffd8c7720e5a262b8635a5fd1ca36766f4c824", @@ -86022,14 +86914,14 @@ "repo": "wanderlust/semi", "unstable": { "version": [ - 20190708, - 1302 + 20200413, + 839 ], "deps": [ "flim" ], - "commit": "16228dc2d147d6ba8762c10fb25c54a3757ee9b0", - "sha256": "1hccmz9g1rl3qz77214ybnai143zay48kai214gk43dw05bcfavc" + "commit": "1d6e21e9ee42c2c5bf1a4422d2fe7af20aa7ff1e", + "sha256": "0pkqh95i6pj7iwghapa8hld78h1q5n50f1lah2l1k2hz4lm6r8zz" } }, { @@ -86040,16 +86932,16 @@ "repo": "conao3/seml-mode.el", "unstable": { "version": [ - 20200323, - 220 + 20200419, + 1022 ], "deps": [ "htmlize", "impatient-mode", "web-mode" ], - "commit": "32f0dbf5a9b39535bc079c9c70456479d0dd3fb2", - "sha256": "1284fdraamjsbaslyk8k75a3m1rfa1i8pwrh56k3vsmfmd8a0cib" + "commit": "4ca9d275948898602640a46573cb95d7eef913e5", + "sha256": "1wl5qsph19i0ll2ppn9va4563m4bfz1zpv99d7xd7w65x6cp29ci" }, "stable": { "version": [ @@ -86140,15 +87032,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20200325, - 1711 + 20200407, + 728 ], "deps": [ "dash", "edit-indirect" ], - "commit": "2ee55780eeced9b0bb086a9d731526ee1a9c3658", - "sha256": "08xxl3z7abqk0m4lwflp0cnz7pcy66f6hps8dmxfas2hgl0qyz7i" + "commit": "e9a7b4402859d73f052330106d29ad14c3d9b6f3", + "sha256": "0d9w8n497j6q879rd9mqrmzvk3ssm95ayqbyfb5x0r3pnywdjp1b" } }, { @@ -86806,6 +87698,35 @@ "sha256": "10dq3qj1q8i6f604zws97xrvjxwrdcjj3ygh6xpna00cvf40llc2" } }, + { + "ename": "shfmt", + "commit": "a20dde08de1a7cd70739a791e1ae321e8f152685", + "sha256": "1k4rr658473vd6xad2z40dl7f26sb1zv9nc1938cg61pqi10bjan", + "fetcher": "github", + "repo": "purcell/emacs-shfmt", + "unstable": { + "version": [ + 20200421, + 103 + ], + "deps": [ + "reformatter" + ], + "commit": "342c55fab27f1e62472eebbb53cfc73b0d422a34", + "sha256": "0hmxa856hlai9ydarfsn5s9i8cnfrydgpa7mkh4a36klhdj21gfh" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "reformatter" + ], + "commit": "cd94266badc71c1e981e904e10f28c6a80237a2f", + "sha256": "09w50l938phcpxvbg4ahyxl43k995ywavwac364nmcnvmip021qy" + } + }, { "ename": "shift-number", "commit": "b06be6b25078ddfabc1ef1145c817552f679c41c", @@ -86856,11 +87777,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20190930, - 730 + 20200406, + 2209 ], - "commit": "cbb15424431cd5f579b12307b8fa03122d525006", - "sha256": "1wwk5q3viw32pwmf4bjhbywkj0d1prwnldgdjfjzmr3rnvfw7w9h" + "commit": "e522a44b151d69d4a176e8809225598ab540fc4d", + "sha256": "1alishzz4j1hbfyfi09rkhffx6gv16yxln7q8jx25shb9rssivyz" } }, { @@ -87156,20 +88077,20 @@ "repo": "riscy/shx-for-emacs", "unstable": { "version": [ - 20200308, - 2356 + 20200410, + 639 ], - "commit": "0fec00c1eef75feeae0f71591762ba6a80bc2725", - "sha256": "0zl5lcy80m1pzwl4239lhcf0zb6px5jwbgjib136zh94l5k35wdb" + "commit": "e5b4bae0a1a9bb8a762da40397a04efdd0b2b397", + "sha256": "0p9b621rgy34r1hl9xfzxh4xpx9gpsr3n330ypfxhlr0s5754j73" }, "stable": { "version": [ 1, - 3, - 1 + 4, + 0 ], - "commit": "e90dccf40320ee0df306cab3f94fdb79504698b5", - "sha256": "0g4w5w53pknphxr7i7kwksq1789qi8rk8yk9gp4s788iq1f0i6vr" + "commit": "e5b4bae0a1a9bb8a762da40397a04efdd0b2b397", + "sha256": "0p9b621rgy34r1hl9xfzxh4xpx9gpsr3n330ypfxhlr0s5754j73" } }, { @@ -87195,11 +88116,11 @@ "repo": "webframp/sicp-info", "unstable": { "version": [ - 20180823, - 1222 + 20200421, + 242 ], - "commit": "26bc593aeae01da34ad92363b5bbd6aedab66da2", - "sha256": "0qvgdrzdp92mskqfh0x5garq0zcr8r7n834jlx5ky8q00xvb1a06" + "commit": "3efcd37eb7888845c5f3292beeb18219f9993e92", + "sha256": "1qlgg7r9v62mcw07svdkzrf5ccm6n9vg64h4p704rfzkxys1cwfs" } }, { @@ -87234,11 +88155,11 @@ "repo": "nlamirault/sift.el", "unstable": { "version": [ - 20190521, - 823 + 20200421, + 1423 ], - "commit": "33b2c9ff964fe53bb55b37429faaa4e903bead7a", - "sha256": "0cb8rcxl0jwpbgz9kk136l2ranficv8lk85fhvly1lpslbjljds9" + "commit": "cdddba2d183146c340915003f1b5d09d13712c22", + "sha256": "0ln87nhq2vhsb0ywn7rp0b3hzms5z7l6cv6dng08yly12r2957if" }, "stable": { "version": [ @@ -87383,6 +88304,29 @@ "sha256": "0dpn92rg813c4pq7a1vzj3znyxzp2lmvxqz6pzcqi0l2xn5r3wvb" } }, + { + "ename": "simple-modeline", + "commit": "054a7c164fae0c76ad2b3c6891d37a03f3e08823", + "sha256": "0c2wvwxwaa62r4vrw9g1lcgr8cv57mlfpsszynkn00cb7fhlhdmk", + "fetcher": "github", + "repo": "gexplorer/simple-modeline", + "unstable": { + "version": [ + 20200419, + 900 + ], + "commit": "e7e39660dadcef88e7e877ad1f24625873e90e51", + "sha256": "0s8979jd3x6yarq4ifn5wgn08s8z2kblzaagh4zywkhaj1i7mb4m" + }, + "stable": { + "version": [ + 1, + 1 + ], + "commit": "e7e39660dadcef88e7e877ad1f24625873e90e51", + "sha256": "0s8979jd3x6yarq4ifn5wgn08s8z2kblzaagh4zywkhaj1i7mb4m" + } + }, { "ename": "simple-mpc", "commit": "62d762308c1ec0c1d8f7b4755b7deb285cbac018", @@ -87721,8 +88665,8 @@ "repo": "yuya373/emacs-slack", "unstable": { "version": [ - 20200320, - 457 + 20200402, + 1656 ], "deps": [ "alert", @@ -87732,8 +88676,8 @@ "request", "websocket" ], - "commit": "03345aabe728da3f5238954eaa0ddbce604807d5", - "sha256": "0kyd959a9113vd7d4prgfga7sj6y6n8zrw6nkqxsfkm5sfpv31iv" + "commit": "d53a57a18fb7034182c3d02503f937761e6a2a64", + "sha256": "1xcfgyw9cky6msai2ap9fgcdasvmvn3k73rjmvnwcj4axh6vjvyx" } }, { @@ -87794,15 +88738,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20200326, - 1453 + 20200414, + 1444 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "faa0c6a0b7c77f6a2db8d3244f24563106857944", - "sha256": "1dgmakfazz3p6s64qmy03schapxi1010sa8g7p1paqkpawr9d5qp" + "commit": "221518f0d3d224403743e6690f6bb66c42d9dec9", + "sha256": "0wbxv461lq7760gsqjw5djhjkzmwxz563l97csn2637gb1wkn461" }, "stable": { "version": [ @@ -87825,27 +88769,27 @@ "repo": "anwyn/slime-company", "unstable": { "version": [ - 20200304, - 1107 + 20200424, + 1045 ], "deps": [ "company", "slime" ], - "commit": "e9153e42ec8f2089ea129ce24488dd3b5e0b9e47", - "sha256": "1dz8q9fjiip2xnw64cim0p5adbpc4lbljdiqjc5dq7bhwpff07jl" + "commit": "cec203c45ebd678b05341d1cdbe420ad07a1b8e0", + "sha256": "0dwj6kv8laivhisd9jrzdn1lxynqqxmimvyz3z0zz6qf0ijsl0wm" }, "stable": { "version": [ 1, - 1 + 3 ], "deps": [ "company", "slime" ], - "commit": "6c244690c80387a32b0cb984843e00c8b75ad6bb", - "sha256": "1hl1hqkc1pxga9k2k8k15d7dip7sfsmwf4wm4sh346m6nj606q8g" + "commit": "cec203c45ebd678b05341d1cdbe420ad07a1b8e0", + "sha256": "0dwj6kv8laivhisd9jrzdn1lxynqqxmimvyz3z0zz6qf0ijsl0wm" } }, { @@ -88280,6 +89224,24 @@ "sha256": "0q5hxg265ad9gpclv2kzikg6jvbf3zzb1mrykxn0n7mnvdfdlhsi" } }, + { + "ename": "smart-input-source", + "commit": "82ef5414e63fe94905f042534d8bde88fb5461c6", + "sha256": "1dx3cvbm9hrdfrj4ggf0hbmfag2hybdlrqgpzy48fc07dscv0acd", + "fetcher": "github", + "repo": "laishulu/emacs-smart-input-source", + "unstable": { + "version": [ + 20200423, + 1529 + ], + "deps": [ + "names" + ], + "commit": "048a6c729f5336fe800e97f995a387e11d386980", + "sha256": "19s8q8fb2kmmfllg50622hzp3jb19h9z9ik45k4v7aapdc7iw5yg" + } + }, { "ename": "smart-jump", "commit": "52f29e14e61b28cd1637ca5d6bd878d91a71251f", @@ -88467,17 +89429,17 @@ }, { "ename": "smart-tab", - "commit": "091dcc3775ec2137cb61d66df4e72aca4900897a", - "sha256": "0qi8jph2c9fdsv2mqgxd7wb3q4dax3g5x2hc53kbgkjxylagjvp5", - "fetcher": "github", - "repo": "genehack/smart-tab", + "commit": "ef37935f5f8ed12323374179a0673b5a4af57cdb", + "sha256": "1dm67sc1vylpf73m723hfjfqmm2yxrdckrgp6a3nq2586hkkid4l", + "fetcher": "git", + "url": "https://git.genehack.net/genehack/smart-tab.git", "unstable": { "version": [ - 20190916, - 137 + 20200416, + 2228 ], - "commit": "0f6963ce4de403fa43f3db68b31ce059f6251c3a", - "sha256": "16rh9wwjnqjk7hf7npfvwf28wmhd7bwnsnfgh592gv70xkcwywaa" + "commit": "67bf4f93f8afca61a3dc4f6c7a34b0b8ca9ede21", + "sha256": "1ws49lbafch1rb6g0j9k5h30c9shk3vvqhbjkf4qvhaqii94lgml" } }, { @@ -88647,11 +89609,11 @@ "repo": "aaptel/smblog-mode", "unstable": { "version": [ - 20190920, - 1823 + 20200424, + 938 ], - "commit": "fe866afbe19f804f80c37e077192576e4b0aad1a", - "sha256": "19zynq5izaafkj97a1f7dz8fljdr0mxsal8xcfa938clxihydaaz" + "commit": "fc949cff7051b31f0dbc7169774144533a27b92f", + "sha256": "07ks6d3gs264wv15lxa88pfi6i851h1wd9cacxs81wc7ijqc5sia" } }, { @@ -88872,15 +89834,15 @@ "repo": "kyleam/snakemake-mode", "unstable": { "version": [ - 20200222, - 1710 + 20200417, + 2230 ], "deps": [ "cl-lib", "magit-popup" ], - "commit": "701f970bfb48d2f7abb241b9f69127ff5b667c76", - "sha256": "0di8wqwj0l2vx29kkpy2h1yxrxgcq51y2lss5lmqp6kmw3avkvi2" + "commit": "03562dcd82964d53eff7314b844c2897d1d9af55", + "sha256": "1cj8628l196da5j54wl8wq7znvha44z1f6w9qqg37yw0pjynbvxz" }, "stable": { "version": [ @@ -89120,14 +90082,14 @@ "repo": "hlissner/emacs-solaire-mode", "unstable": { "version": [ - 20200120, - 455 + 20200423, + 742 ], "deps": [ "cl-lib" ], - "commit": "4ac324ccb0b751be80ce64449553462eafab4f32", - "sha256": "1klyzqrlsgx8q89zx1kn5z6wnpv1dmvbglldpv1y74hxhzi6ryps" + "commit": "adc8c0c60d914f6395eba0bee78feedda128b30b", + "sha256": "0kj6lhx57gl3809q4bmgv7cac8wk61g1sdyr4c2a0y9jkzf21x67" }, "stable": { "version": [ @@ -89150,14 +90112,14 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20200329, - 1048 + 20200411, + 1026 ], "deps": [ "dash" ], - "commit": "8cd79c8afd7563a69764c4174098d2b8e7fd0c96", - "sha256": "1x1cbyd7kr1izcbbffq1amxgg1gqfwaa5y4m17ffmdrhal37mdzb" + "commit": "c8f09494330900081ed5a4f020c972a37fd7b02e", + "sha256": "0z5srqz4g81bsyw74q04fwz30qvi4i08s7fszmwnwyr5xrf5dx42" }, "stable": { "version": [ @@ -89188,8 +90150,8 @@ "flycheck", "solidity-mode" ], - "commit": "b190993dcb8376e80fb1d9b71f3ed6170bd2a341", - "sha256": "0s5xk38k3mc1d40dszlcgfpn5rvb7nsnnpmgr3c0bwqa4xh6yqrg" + "commit": "022b3159832384a7dcdc2168809e698600826047", + "sha256": "144w84abffbrbb4wflgipndaasx82axf36xm373ybdih4131mi69" }, "stable": { "version": [ @@ -89213,11 +90175,11 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20200124, - 827 + 20200418, + 921 ], - "commit": "b190993dcb8376e80fb1d9b71f3ed6170bd2a341", - "sha256": "0s5xk38k3mc1d40dszlcgfpn5rvb7nsnnpmgr3c0bwqa4xh6yqrg" + "commit": "022b3159832384a7dcdc2168809e698600826047", + "sha256": "144w84abffbrbb4wflgipndaasx82axf36xm373ybdih4131mi69" }, "stable": { "version": [ @@ -89245,8 +90207,8 @@ "dash", "request" ], - "commit": "b143b5c6161e3760f42a7a5405f5f7e97079e09a", - "sha256": "01ak3sr2hp2mmn81j1qdgyvrm9np979fpg2ngbnijnb8ai3gn30f" + "commit": "9fdb75e150e78170b3ca7863a8a0638c6ecc0fc0", + "sha256": "0qvr4cga8k4bn0jbfp626cjkxgvqkac902v7hxakj7l47arxcd5z" } }, { @@ -89285,6 +90247,48 @@ "sha256": "10gh1hvxq9gm29r6qzlnva7vjidd7n4kih4z2ihyvbvy9za20xqw" } }, + { + "ename": "sorcery-theme", + "commit": "cdb6f1cfbf3bbeb1eeb6440fb216e8e3b523bb0f", + "sha256": "1qsavwbqidva4m0mdw393qbwlibhkkywnxj9mshfmkwaq050ivb2", + "fetcher": "github", + "repo": "vxid/emacs-theme-sorcery", + "unstable": { + "version": [ + 20200413, + 2242 + ], + "deps": [ + "autothemer" + ], + "commit": "fb041d0d8d4ae2840ddcfb1bd56fefe687da8c52", + "sha256": "1j54m18xsn44m5xshmk2pfxn795svjn0zv77qwfxn1d2p5j0r6ni" + } + }, + { + "ename": "soria-theme", + "commit": "9196110908f0d2130f7963499a94853b5192ac8c", + "sha256": "1fmys72s4n334m60ywpmbxjbvjwp7qn14pasmnlkv3l1bw6jygsm", + "fetcher": "github", + "repo": "mssola/soria", + "unstable": { + "version": [ + 20200424, + 1530 + ], + "commit": "fcc14cc99f0d26abf91af682b5fdedf5a8a37003", + "sha256": "0mrh147q9zzs9nkc714iyly5aydx3svma0ix8sgrk7rqacfd56hv" + }, + "stable": { + "version": [ + 0, + 3, + 2 + ], + "commit": "5edb9379cd21411fb182239ed9ac19be4a278f32", + "sha256": "103837zizm5iqv3sskxgkhjij2icjx9sjvjhq2l9zi66rlh9gca7" + } + }, { "ename": "sort-words", "commit": "0a4bd566392d7cebe8a891d787439512e8d34cf9", @@ -89551,6 +90555,21 @@ "sha256": "1aqkkbf0xw4kqsy1jjn4xhs5vk2vcsqzs7f4p2sf1plnzsqxflw8" } }, + { + "ename": "space-theming", + "commit": "5529fcf16b877b01ee0aff710ebfb0ad5da8dba1", + "sha256": "0khjdmqv1q2pdas0xjfqs68xjg2nqms6g21bplg54ynsqcp7asv9", + "fetcher": "github", + "repo": "p3r7/space-theming", + "unstable": { + "version": [ + 20200415, + 810 + ], + "commit": "0a41a892180451d51095516e8ee2c9042be009c1", + "sha256": "02d07fs72fqg12lm7wxlmds1xyqf92ay0h9ghpkavwn6mphslpvc" + } + }, { "ename": "spacebar", "commit": "e4d1808eabdb9081441e01526efe81782ae0122f", @@ -89863,6 +90882,21 @@ "sha256": "0mhzjia900irv0ndiw6w2vzin1gvyaf48pghi16r562ci4lr963w" } }, + { + "ename": "spell-fu", + "commit": "abaa6522f18ca1f47788ebb3281fbfcdade2b7c7", + "sha256": "0c2yi5lz2ww7mm9ih3m374w65n73z4knhnbrvdyzd7ja3xb3l17n", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-spell-fu", + "unstable": { + "version": [ + 20200426, + 600 + ], + "commit": "e62cfc4f08fc4743d6961fe3402adbf2260d7e70", + "sha256": "1w6jsn3p6956vk5pzwlbc211sswqai8ary8ad3fbhbjwxl5z3gsc" + } + }, { "ename": "sphinx-doc", "commit": "a3b80d346ad4fb415970beddb5f02ae795fbf1b4", @@ -90371,11 +91405,11 @@ "repo": "srcery-colors/srcery-emacs", "unstable": { "version": [ - 20200313, - 1310 + 20200422, + 1941 ], - "commit": "465a458e8c1629baa980988d43e441c4fdb92151", - "sha256": "04bncx9y1jqc6pzzl5c7dgdvzq012ymsp6ilkifg19xnz3bdmhm6" + "commit": "9630e465cc5166f723b7c5378e326561cf2a1738", + "sha256": "0ppaicggrrd3wrbjddw75mnsfli9a8db6bg21m1k7bafjkgraxfn" }, "stable": { "version": [ @@ -90418,14 +91452,14 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20200326, - 752 + 20200422, + 1730 ], "deps": [ "cl-lib" ], - "commit": "fa0c9e1fae26780dcce266df8ad8bf5efc971c30", - "sha256": "1azdc14y2jsmqcphk16qbxaj2fc7ajddwjjhc73xbhbn67knk1af" + "commit": "d55b4047fcfd3528fa9487d206773f45c7c2d038", + "sha256": "0c83wachsrrz0mnsb2lci6mr62ma40w05lxz7y8vrfyqppkcfa6a" }, "stable": { "version": [ @@ -90509,24 +91543,25 @@ "unstable": { "version": [ 20200329, - 1535 + 1558 ], "deps": [ "dash" ], - "commit": "67975f7773bfa0140d9dc09bd67df7f5489aa6ea", - "sha256": "0vwa1szfy45xpqqv44kyasjv2x0y2n3v680wlb1v3w2mxwwg8vda" + "commit": "a5377e4317365a3d5442e06d5c255d4a7c7618db", + "sha256": "1i3zmsn0w2k7p2hlzssibckm32kf05l56mkhg96x4sf06g3pwq1d" }, "stable": { "version": [ 0, - 4 + 4, + 1 ], "deps": [ "dash" ], - "commit": "d9dbedd773ad3a831e02e162c47936d6814a850a", - "sha256": "0895n7bss4wdydic1gflr03f2cwdyqywl16gvb599lpn288jhwvz" + "commit": "a5377e4317365a3d5442e06d5c255d4a7c7618db", + "sha256": "1i3zmsn0w2k7p2hlzssibckm32kf05l56mkhg96x4sf06g3pwq1d" } }, { @@ -90816,8 +91851,8 @@ 20171130, 1559 ], - "commit": "af37d392baa6f2e7445e9f714da743fd10153adf", - "sha256": "0bc34ri3d90fcjsin5nvli3ncqrh8x9iw8rhzdrwsbr9ildmr1ib" + "commit": "209d2233843778ebee12d103c41b226fa27ff266", + "sha256": "19rm3zznj0j8q5gsqpk6hy5l3gii4pmp5s2npl1zsiy6bb7p59c4" }, "stable": { "version": [ @@ -91050,20 +92085,21 @@ "repo": "stepnem/stripes-el", "unstable": { "version": [ - 20200322, - 2350 + 20200330, + 2022 ], - "commit": "8b0010acb9f92c7ab2fb8396aaf354fccedea7c5", - "sha256": "0q2zw9nvs9c27c7mcj9psqwf1r7p6k86y63d6q38hps22l063c9x" + "commit": "7b1d501f44b697a0514ef6759fd126d65867f18d", + "sha256": "0mx7l751jiijrjnbn3y6awasjy2c7k4ndgjq5c455vzxrlcbwr25" }, "stable": { "version": [ 0, 3, + 1, 1 ], - "commit": "8b0010acb9f92c7ab2fb8396aaf354fccedea7c5", - "sha256": "0q2zw9nvs9c27c7mcj9psqwf1r7p6k86y63d6q38hps22l063c9x" + "commit": "7b1d501f44b697a0514ef6759fd126d65867f18d", + "sha256": "0mx7l751jiijrjnbn3y6awasjy2c7k4ndgjq5c455vzxrlcbwr25" } }, { @@ -91543,8 +92579,8 @@ 20200327, 406 ], - "commit": "17a53e5f8dd45c6bca44659a80a79ca30d161635", - "sha256": "1hrrcg42b1fnf8y0mz3fli6mp7aha7w0rv7nhrsrvhrilnq97wzl" + "commit": "48a26af6a3395a8bf3f09747d0a205c6dbc79313", + "sha256": "12gg55jdb6b5jk0xizx2cqc795bgll2kap3jp08s1vr16zkdaryn" } }, { @@ -91733,26 +92769,26 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20191130, - 544 + 20200418, + 617 ], "deps": [ "seq" ], - "commit": "1268425311ab20f1618df4e52cb1b79e28b553df", - "sha256": "1ghm5spzxxdvwn1lk3xci62hiv12x4hzjk5xh9q522a833nl04i4" + "commit": "2ab9ea1784a12a482ed9e3fb284b7a7658f40fff", + "sha256": "0wml7f8k3gqlxm0yg744271mqh087prlsfmbiv7fvkrcs55q0592" }, "stable": { "version": [ 8, 0, - 1 + 2 ], "deps": [ "seq" ], - "commit": "86f8f62294aa5a6d44fa872278d75a4a41f403d4", - "sha256": "0sszk2nwp6h9qk7vgh5n05pzh264br3x3r1hyj97gwf8jdqzkr74" + "commit": "2ab9ea1784a12a482ed9e3fb284b7a7658f40fff", + "sha256": "0wml7f8k3gqlxm0yg744271mqh087prlsfmbiv7fvkrcs55q0592" } }, { @@ -91823,8 +92859,8 @@ "deps": [ "ivy" ], - "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787", - "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q" + "commit": "47ec37b395cc1b304bbf91e804f138634544a9df", + "sha256": "05k2qjj4z8vljfppkphfhw67wvb5ij4nz4m158v89lx87y0phh74" }, "stable": { "version": [ @@ -92081,7 +93117,7 @@ "deps": [ "f" ], - "commit": "9bd33e73ecb2a0e3e3757c55c05f46b6937227e0", + "commit": "cd344b6c2cb6a8fcf061af2c85441644a4e7a006", "sha256": "193lq58mhkq0rrinkaxiyhkk60qf7q0gx03na2968zcrahrd8w75" }, "stable": { @@ -92101,8 +93137,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20200225, - 1928 + 20200425, + 1911 ], "deps": [ "cider", @@ -92119,13 +93155,13 @@ "slime", "smartparens" ], - "commit": "c8bdd672ec7fc50f72599081b87ef48bcec45c9c", - "sha256": "04s0nacv9qy5a95hsblz2an6ipzxmqi98pz71vyc0nghzp6j24zd" + "commit": "3dba2ae3f65bd1c40e3756e05a57ced039a15a7f", + "sha256": "1j2ycsi2ipbyaknscy0vgr1ybyvzl7j1q0gvazkl5rpihshz2shl" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ @@ -92143,8 +93179,8 @@ "slime", "smartparens" ], - "commit": "c8bdd672ec7fc50f72599081b87ef48bcec45c9c", - "sha256": "04s0nacv9qy5a95hsblz2an6ipzxmqi98pz71vyc0nghzp6j24zd" + "commit": "62bd31d8647b88ec179fb8ff89f583b55a0421cc", + "sha256": "1c2y65hcd0nydhkh7a903flq061x8hld272n00xn4dd0b8kvjp29" } }, { @@ -92203,35 +93239,6 @@ "sha256": "006siydqxqds0qqds0zxn821dk4pw14wyymyp03n594wgqzw7m8q" } }, - { - "ename": "syndicate", - "commit": "626bda1691d9c7a97fcf549f7a3f0d41d832cfde", - "sha256": "06nmldcw5dy2shhpk6nyix7gs57gsr5s9ksj57xgg8y2j3j0da95", - "fetcher": "github", - "repo": "KNX32542/syndicate", - "unstable": { - "version": [ - 20160603, - 1523 - ], - "deps": [ - "evil" - ], - "commit": "90cee202a06f5bab48268ebf9f62c43334b69f50", - "sha256": "1w0na1p9drdmbci7adj20amrabcpny9fb2v4bd967ils4f2wly75" - }, - "stable": { - "version": [ - 1, - 0 - ], - "deps": [ - "evil" - ], - "commit": "b839aaba0c8583a3254476b53976e3caac4f89a9", - "sha256": "01bymbsvbisnpb2wpqxhrvqx6cj57nh4xvpsbsr5rr1h4pm5jkzl" - } - }, { "ename": "synonymous", "commit": "ecf2c44c63e9f41f1733849bdef0d0c301485580", @@ -92307,14 +93314,14 @@ "repo": "emacs-berlin/syntactic-close", "unstable": { "version": [ - 20191119, - 1007 + 20200408, + 1148 ], "deps": [ "cl-lib" ], - "commit": "5760319d8fdb3672dd0e95880c30e9c4d92ab239", - "sha256": "0rkqflaz0npclnjsy2r6apkjrzlw5zrpa6j87sbjpnnh0jgcsmsq" + "commit": "c21ffdf6a2f8c2a83d3efc729852cd2b09fe03a6", + "sha256": "1m6y7njkn5vibgnr3pnh6nci75j2ksr93ajp01jwpxxxc0wmipa8" } }, { @@ -92343,9 +93350,9 @@ }, { "ename": "syntax-subword", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm", - "fetcher": "bitbucket", + "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203", + "sha256": "1nfbpckxfy95m7bnj08bnpf8zyxc0dyap5hq1plxl3lxb3c4fvr4", + "fetcher": "github", "repo": "jpkotta/syntax-subword", "unstable": { "version": [ @@ -92354,6 +93361,14 @@ ], "commit": "ad0db0fcb464652a1d3408f525dee9293ce2b70c", "sha256": "1wcgr6scvwwfmhhjbpq3riq0gmp4g08ffbl91fpgp72j8zrc1c6x" + }, + "stable": { + "version": [ + 0, + 2 + ], + "commit": "01b27feac37eb60cf73ff80374004d9e847e637d", + "sha256": "12jk28jbkq1pcpgsbknk8xzzghjh2dhwb54kag2hynldn4qgfkrz" } }, { @@ -92715,11 +93730,11 @@ "repo": "tmalsburg/tango-plus-theme", "unstable": { "version": [ - 20170214, - 1708 + 20200423, + 804 ], - "commit": "8ba8901397e3e9f1d53110487bfa0effc65015e7", - "sha256": "025dca4yqpai45s74nk41y075v8pv59fdna11c0qqz3ihyrdhbrq" + "commit": "1e9484bb392bb0aad2be159505c502320f8d0a5c", + "sha256": "1819s9c0nm4pkgcpxqnr20075krq30qn6hpg4zl54cnrxbfbiq9f" } }, { @@ -92769,11 +93784,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20200321, - 2124 + 20200416, + 2114 ], - "commit": "9ca1afb561433ff6d2e8527e3d8d9152de5912f7", - "sha256": "0a3hlwzq9ckf7jcxq6drrgl1g8hi5ad0f6lgm3nawbsqmrb6r28y" + "commit": "eedf6a465b8ccc865c108a6f2715769300f5a499", + "sha256": "1p7wlv5i46f3d9kn3yiw6rga8mkln9m5xknzimzym2pyaclva41m" }, "stable": { "version": [ @@ -92817,20 +93832,20 @@ "deps": [ "cider" ], - "commit": "6c2631e3fd68e70110aa0cc5b83b7511eab363e2", - "sha256": "1sgnzgy0b61hxkj2fzkgnlrrpgsc5v1prns9hv1za4mv60xs8f15" + "commit": "8dfb4f92db2d8598ba809636a82d210c378b4845", + "sha256": "1sdi1rr9xq7spps5hagzs8irfljxmbd5y3hh4jiyvn54cwicg3g8" }, "stable": { "version": [ 2, 0, - 2 + 3 ], "deps": [ "cider" ], - "commit": "d4ce3b51e97fd7e9f5a650796dee9ba4079f9df0", - "sha256": "1vday9jnmzspnfy3ppladj0z5by4yysfwp1dnqv7n3ayyza5r8w0" + "commit": "ce85fd9bcd008031a605ea8913577f452b49e352", + "sha256": "06dm6gdh10jbmyjr0y96s06qi3k12phq522pviis68qm7v2ryr47" } }, { @@ -92969,14 +93984,14 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20200329, - 1557 + 20200423, + 1038 ], "deps": [ "visual-fill-column" ], - "commit": "0da852c0b72ad3473432f9e846ce1371d7c8cd61", - "sha256": "0n4jvl6c68wkddvsjfyw82rxy5h7ikc6qrjd35h2v864080gmbjp" + "commit": "50ef9bf06cc162b39cf3553b89b02faf5bc87835", + "sha256": "1h5100vmgwy52zp7ryarj4xw3gb9paj1qpm39mc9h62s6n1zysw7" }, "stable": { "version": [ @@ -93022,16 +94037,16 @@ "repo": "dbordak/telephone-line", "unstable": { "version": [ - 20191120, - 27 + 20200412, + 1614 ], "deps": [ "cl-generic", "cl-lib", "seq" ], - "commit": "bfe7b189d708d9cbc69ef2eaf5542108edc4257d", - "sha256": "0dkscbjms2557fzd7gawgsic6gfzypyn973skiyhy0y8zimmr406" + "commit": "65198f72f3b1ae618507aa28094f05d6de4846a9", + "sha256": "177v612ii8nj9nsmfxlf17gr3wair4whzggi3pshch7ghbxdqv5q" }, "stable": { "version": [ @@ -93665,14 +94680,14 @@ "repo": "TobiasZawada/texfrag", "unstable": { "version": [ - 20200104, - 41 + 20200424, + 205 ], "deps": [ "auctex" ], - "commit": "2a5561b4534a3b78718e2c5fe30550c89341874e", - "sha256": "1i583i2h9f5bsg663yl9xriv1lc5gb5w4ql6b5r9dwv33lg7l6mx" + "commit": "48118c4e38836117efb4eede927ab85d9a0d2013", + "sha256": "1dpvf9limh9b0sg0x41gyw9w5nf5nvkd7zzlyysswhinm6jba4iz" }, "stable": { "version": [ @@ -93836,26 +94851,26 @@ "repo": "myTerminal/theme-looper", "unstable": { "version": [ - 20200326, - 1651 + 20200410, + 1757 ], "deps": [ "cl-lib" ], - "commit": "7077ca11508c6a00d98d592dee967e92185480ff", - "sha256": "02kiaqlrb677773809sfkajz31p9fsr72k4k0g5297wlibr9ymjr" + "commit": "0e314ad21193441a26ce1839737e7a054e6a1a1b", + "sha256": "1v4rv2w8jdjzikwfjxsxqrbfwh6nm88v9x74pdhc3mq36qwl487g" }, "stable": { "version": [ 2, - 5, + 6, 0 ], "deps": [ "cl-lib" ], - "commit": "7077ca11508c6a00d98d592dee967e92185480ff", - "sha256": "02kiaqlrb677773809sfkajz31p9fsr72k4k0g5297wlibr9ymjr" + "commit": "0e314ad21193441a26ce1839737e7a054e6a1a1b", + "sha256": "1v4rv2w8jdjzikwfjxsxqrbfwh6nm88v9x74pdhc3mq36qwl487g" } }, { @@ -93979,18 +94994,18 @@ 20200212, 1903 ], - "commit": "9889eb8b3a3a773e8f06df327a76e408f9214cd4", - "sha256": "1vhfkfsrnhdzsk1353xl383nsb7x6a01v7r79lxdcrkj5yxppz0d" + "commit": "598704d0259d992af190a4388140b8aec07f40ef", + "sha256": "168sl4jbcyqms1cvg8x91kclim27v9zbfrw3cn2fmwmd2g29c31j" }, "stable": { "version": [ 2020, - 3, - 23, + 4, + 20, 0 ], - "commit": "186d782f02d80c7d8e93be352c2011ed4097c228", - "sha256": "1wj4ng9ymi0hszl3kmdg7rqrff4zk0zipbbn1jcxcii2swrkw12g" + "commit": "23496d2d53ecc70a2353c1a84699ac579e21e0a1", + "sha256": "0yvpnyzklsjppfhd9spgrf9gh3f36zvs3rz7fyc7bl3n68s3z7wq" } }, { @@ -94046,20 +95061,20 @@ "deps": [ "haskell-mode" ], - "commit": "5d4bce7a9af5e39e6df0d2577962579e31964b65", - "sha256": "0hnqcfvc8gca98wyzcrjldn9kcxdc4m8aa9cdr1884kp4kf5dmvj" + "commit": "3735a13c9bbe4fbb788d9dbc363701081253bafa", + "sha256": "0nm02pzhvg6lb3j4m8g4jfgkirv8pb6881bk2r74hijxvjamma0b" }, "stable": { "version": [ 1, 4, - 8 + 9 ], "deps": [ "haskell-mode" ], - "commit": "b28951be9abee7dc234c318849169bb578db3c49", - "sha256": "0absv56yqrqf3mzgs064q88lh6k28a7knzqrgdmf4100gf32np4j" + "commit": "252e3be53eb1bf6bfcd1b3c52af982506c84a89e", + "sha256": "19chvk24csg5w38q6yh1wky4nk4z8361p1q5q118427njqkl5ql3" } }, { @@ -94376,14 +95391,14 @@ "repo": "kuanyui/tldr.el", "unstable": { "version": [ - 20200302, - 1744 + 20200330, + 1025 ], "deps": [ "request" ], - "commit": "7203d1be3dcbf12131846ffe06601933fa874d74", - "sha256": "1bw6la463l2yfm7rp76ga4makfy4kpxgwi7ni5gxk31w11g26ryk" + "commit": "269bda7001613c0b70c0662d2a74d200765c1dcb", + "sha256": "0z8hkp15sdb0x0g67v6xa8ds28awz4i2vcbryj5zfpl15d0fiqc2" } }, { @@ -94409,15 +95424,15 @@ "repo": "laishulu/emacs-tmux-pane", "unstable": { "version": [ - 20200330, - 456 + 20200419, + 1331 ], "deps": [ "names", "s" ], - "commit": "942270359587d54f4fd6e37e8d35da38373447c5", - "sha256": "1x5b0680vxvjqcj5r3674n7gnp4994js13707pikl362bhv398kw" + "commit": "6e8d0584b0bbd412c5d29c87add7364299b3d2a0", + "sha256": "054qncg530paiv1vs27hs94m2y2fzvr4iind1rr16m8v8qf7zia6" } }, { @@ -94646,14 +95661,14 @@ "repo": "xuchunyang/tongbu.el", "unstable": { "version": [ - 20200321, - 1817 + 20200414, + 507 ], "deps": [ "web-server" ], - "commit": "cf3b3ee1468c3dcd1721a5e6802821c8f52f34ce", - "sha256": "0s4h711rwkpf1dbqbak4akbm95y8crd0niisx19jmk9lms5kj5n5" + "commit": "6f6e5c5446f0c5735357ab520b249ab97295653e", + "sha256": "05pg1qddsl0m4r73smrxpcvyiwa18d9jl6i8nfanlydwmmjqblb9" } }, { @@ -94963,8 +95978,8 @@ 20200226, 1612 ], - "commit": "a269614c69ad8b2703e6e5093d0017d6afad6cca", - "sha256": "0w50sh55c04gacx2pp19rvi0fwj9h19c9gzd8dpa82zjiidfxckr" + "commit": "afa0c2f98453b9ffd9d8160831debc7e36cdb87b", + "sha256": "0jkyrwxmfarbjqidvgxh0x4al9xh1wyd6r1rwvkbwxscz5111h3z" }, "stable": { "version": [ @@ -94976,6 +95991,24 @@ "sha256": "0w50sh55c04gacx2pp19rvi0fwj9h19c9gzd8dpa82zjiidfxckr" } }, + { + "ename": "transient-dwim", + "commit": "0ad7091aa6129c09e457c71274a42344acd6b823", + "sha256": "1q32if4i913vjbcpcdrfznjiih4c30ipnadn84zkr72wn5ndzlpq", + "fetcher": "github", + "repo": "conao3/transient-dwim.el", + "unstable": { + "version": [ + 20200411, + 2015 + ], + "deps": [ + "transient" + ], + "commit": "00d111e41e433736422e388e593b5c0df7d21bf9", + "sha256": "1gx3v5axvwah1yb0wba2l60dy72lcw7jw86cfjlg3m9a8xd090v7" + } + }, { "ename": "transmission", "commit": "9ed7e414687c0bd82b140a1bd8044084d094d18f", @@ -95164,8 +96197,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200328, - 1143 + 20200426, + 1031 ], "deps": [ "ace-window", @@ -95177,13 +96210,13 @@ "pfuture", "s" ], - "commit": "4c1add44cc0c5a710c22788663353c9c24909149", - "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" + "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48", + "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9" }, "stable": { "version": [ 2, - 6 + 8 ], "deps": [ "ace-window", @@ -95195,8 +96228,8 @@ "pfuture", "s" ], - "commit": "e01ad21ea3cc0eba8cd460737116b51be32ffb45", - "sha256": "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1" + "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", + "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" } }, { @@ -95214,20 +96247,20 @@ "evil", "treemacs" ], - "commit": "4c1add44cc0c5a710c22788663353c9c24909149", - "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" + "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48", + "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9" }, "stable": { "version": [ 2, - 6 + 8 ], "deps": [ "evil", "treemacs" ], - "commit": "e01ad21ea3cc0eba8cd460737116b51be32ffb45", - "sha256": "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1" + "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", + "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" } }, { @@ -95238,27 +96271,27 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200205, - 548 + 20200421, + 1426 ], "deps": [ "cl-lib", "treemacs" ], - "commit": "4c1add44cc0c5a710c22788663353c9c24909149", - "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" + "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48", + "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9" }, "stable": { "version": [ 2, - 6 + 8 ], "deps": [ "cl-lib", "treemacs" ], - "commit": "e01ad21ea3cc0eba8cd460737116b51be32ffb45", - "sha256": "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1" + "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", + "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" } }, { @@ -95269,29 +96302,29 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200302, - 553 + 20200421, + 1426 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "4c1add44cc0c5a710c22788663353c9c24909149", - "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" + "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48", + "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9" }, "stable": { "version": [ 2, - 6 + 8 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "e01ad21ea3cc0eba8cd460737116b51be32ffb45", - "sha256": "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1" + "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", + "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" } }, { @@ -95302,16 +96335,29 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200309, - 2057 + 20200421, + 1426 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "4c1add44cc0c5a710c22788663353c9c24909149", - "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" + "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48", + "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9" + }, + "stable": { + "version": [ + 2, + 8 + ], + "deps": [ + "dash", + "persp-mode", + "treemacs" + ], + "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", + "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" } }, { @@ -95329,20 +96375,20 @@ "projectile", "treemacs" ], - "commit": "4c1add44cc0c5a710c22788663353c9c24909149", - "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" + "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48", + "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9" }, "stable": { "version": [ 2, - 6 + 8 ], "deps": [ "projectile", "treemacs" ], - "commit": "e01ad21ea3cc0eba8cd460737116b51be32ffb45", - "sha256": "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1" + "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", + "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" } }, { @@ -96197,11 +97243,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20200305, - 28 + 20200413, + 159 ], - "commit": "aae7ec9784e8fab9b33adf25eac25e745653f19f", - "sha256": "02xlfjl9z822qixk9gxwv18n8ykdq793fd0qm9g0qsz0sn57mr8n" + "commit": "0ce9ac36144e80316fff50bfe1bc5dd7e5e7ded6", + "sha256": "1mqm2z8bp5dx9f9xq6bpgvk8xmzmh71bgxbff6kcliv0jy3jlakb" } }, { @@ -96212,11 +97258,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20200221, - 1152 + 20200408, + 11 ], - "commit": "35d4cf3771d905d647a35df050abfd9015833aad", - "sha256": "0846whh01bzxhl98wlywd11ki6wk2iyzzxvc5gnlj85cdasjrz10" + "commit": "b808ef0cdcdd2eef221c67eda567eed7fcb3d4af", + "sha256": "107dgdw1jh8mipgwal1g86nfckrpz2l53a1sqcg90nb0n8fkvy2q" } }, { @@ -96646,6 +97692,29 @@ "sha256": "0fgipv93x47cvyww07cqx8xa95jz36y6fy5rmaq40jnnmdkgq862" } }, + { + "ename": "unobtrusive-magit-theme", + "commit": "6dd57561738c2dc3ed6dc03f57d2487ce949f035", + "sha256": "05djixlq49dn1m64xs8b6w4kg650wrr8rs2pb72p1kfvp2a53g7w", + "fetcher": "github", + "repo": "tee3/unobtrusive-magit-theme", + "unstable": { + "version": [ + 20200411, + 1349 + ], + "commit": "aede357009655d19d4468320b2b61b0f26a47593", + "sha256": "1af8c7q3vxj23l2ah5waj9hn5pfp66834b4akm76jc5wqf0sr9j1" + }, + "stable": { + "version": [ + 0, + 4 + ], + "commit": "aede357009655d19d4468320b2b61b0f26a47593", + "sha256": "1af8c7q3vxj23l2ah5waj9hn5pfp66834b4akm76jc5wqf0sr9j1" + } + }, { "ename": "untitled-new-buffer", "commit": "de62e48115e1e5f9506e6d47a3b23c0420c1205b", @@ -96963,30 +98032,6 @@ "sha256": "0xg98ngrdlfjcb902qaljwhh9jszkafc2vm1x8627lnw1k7i6b3q" } }, - { - "ename": "usql", - "commit": "c8f6b968312a09d062fcc8f942d29c93df2a5a3c", - "sha256": "10ks164kcly5gkb2qmn700a51kph2sry4a64jwn60p5xl7w7af84", - "fetcher": "github", - "repo": "nickbarnwell/usql.el", - "unstable": { - "version": [ - 20180305, - 2323 - ], - "commit": "bfaf428b366a9a185eef84f0d645a98dc918fe3d", - "sha256": "00b1g30l86abg65wc9f4vcn4ccqa2zmn2mi33vdjrq3phw17d2ks" - }, - "stable": { - "version": [ - 0, - 0, - 3 - ], - "commit": "bfaf428b366a9a185eef84f0d645a98dc918fe3d", - "sha256": "00b1g30l86abg65wc9f4vcn4ccqa2zmn2mi33vdjrq3phw17d2ks" - } - }, { "ename": "utop", "commit": "30489fe52b4031184e54f994770aa3291257bc9d", @@ -96998,17 +98043,17 @@ 20190715, 1836 ], - "commit": "30c77ce4d7996822721e97ac8042d5bc0d415584", - "sha256": "03947csh8nzqqa58z2hq5i87kqf7z65f7b19nyvy0can2flznl7q" + "commit": "471cb311159773bbb280d0f1a4b47c54456c67a9", + "sha256": "09hxi1v5wvb952rwfmj48n6ndxkqn8ciaqj1cd9xgkw62h54agq9" }, "stable": { "version": [ 2, - 4, - 3 + 5, + 0 ], - "commit": "ba35712f1bd1c489a54088a4fd807f8484c1d98a", - "sha256": "1bl4943qpi3qy152dbdm5glhx19zsiylmn4rcxi8l66g58hikyjp" + "commit": "471cb311159773bbb280d0f1a4b47c54456c67a9", + "sha256": "09hxi1v5wvb952rwfmj48n6ndxkqn8ciaqj1cd9xgkw62h54agq9" } }, { @@ -97619,11 +98664,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20200326, - 2322 + 20200404, + 951 ], - "commit": "2c4252b2b57f65ebd9fd2c7a7771b4d0354f1d4c", - "sha256": "0g0hi1bhrx8bj0wbxwaimfpvl491sd079551199hcyhq607pcpp2" + "commit": "82cf1bde07b0c96b25d1dd16268663d8931fbb60", + "sha256": "18pjsjxrf844y3aw0fvj451cz08kw2j3idmhh3l15aj3jdwzjfbq" }, "stable": { "version": [ @@ -97722,14 +98767,14 @@ "repo": "baron42bba/vertica-snippets", "unstable": { "version": [ - 20191213, - 1109 + 20200423, + 1200 ], "deps": [ "yasnippet" ], - "commit": "2d1c45c63392ed869625bd062c19422600c9f555", - "sha256": "1gn57jfmma5h90m3b7l698rncmbygd2dbp48vvx1d1z9ks2rm8gg" + "commit": "6ced718d9120878878700592fab430a8542b748f", + "sha256": "1x04wrf3h6f4wsh4n2cl3n4byj9pxni918ri49hqxzm8h8hivigc" } }, { @@ -97778,22 +98823,22 @@ }, { "ename": "vhdl-tools", - "commit": "69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf", - "sha256": "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw", - "fetcher": "github", - "repo": "csantosb/vhdl-tools", + "commit": "b1a3336bff4d677b3bc7fbb8ef230ffc7b78e268", + "sha256": "0xdq9sicwpv3qzy833fqhvi4yllqmqgd4p9lbgq7dn1g8qz2gakn", + "fetcher": "gitlab", + "repo": "emacs-elisp/vhdl-tools", "unstable": { "version": [ - 20200128, - 957 + 20200330, + 1819 ], "deps": [ "ggtags", "helm-rg", "outshine" ], - "commit": "3dbfe8160e22053f0a9bee70ba6f8e1e3967bc46", - "sha256": "1pr7skldslq35ry17yyslfrl2d84msxyh0q77a3djv7ssqlpd270" + "commit": "11645a398a11cdc4b84838294521ecfb229d7856", + "sha256": "00wqvszxsfyxx7pn9w5jn5brw2lx7d577zbc7sc4jz5nlk0csxd4" }, "stable": { "version": [ @@ -97985,8 +99030,8 @@ "adaptive-wrap", "visual-fill-column" ], - "commit": "91fb699ead3f86663e56b48a10adeb5723ca7b84", - "sha256": "0rfrgjflgn0c9xj7f4fwdzyclp2p9fbfir19iwy77z7jnkjk78dv" + "commit": "291f6178a5423f01f2f69d6bc48603d4f605b61a", + "sha256": "15kg23xkcc060y8a5f9657gk3bvkax23myhajaa0b2i1qcd6p43i" } }, { @@ -98360,11 +99405,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20200327, - 1447 + 20200418, + 1610 ], - "commit": "996c535b9cc6aa70c3595413582d97abfab16edd", - "sha256": "0f84376rc9gm54llfln1528p82svczfrz9p48d1vh9pmf5ba09vw" + "commit": "0b04d31e2f0daf45452da2c5e214d2b42cd46a46", + "sha256": "1bdbr1hpzipxk41wx4qyvr2rkk4q4j8qnc09gd51wak7n4w3xz48" } }, { @@ -98375,14 +99420,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20200228, - 628 + 20200402, + 1516 ], "deps": [ "vterm" ], - "commit": "24d68a0ab920875d0834598688128e692fe9a5b2", - "sha256": "0bzxd5xzpajvg7mv7ggplcba7plchhlrl1m14dnx3nrx6q0936cr" + "commit": "15901e1e1eebd957ef18d38c920f944558ebd4fb", + "sha256": "1dcr242i9r7r4mr43qfv5ij254dnhf04gfi71y507zfpdr17zdix" } }, { @@ -98451,8 +99496,8 @@ "repo": "mihaiolteanu/vuiet", "unstable": { "version": [ - 20200326, - 1738 + 20200424, + 1400 ], "deps": [ "bind-key", @@ -98461,8 +99506,23 @@ "s", "versuri" ], - "commit": "c917155a0c72d9fceb9f7c39efcc97320f9e9028", - "sha256": "14djavnczks11lvmldwf0j8nnj4jd0jmz30l6r4hv12f3zjwyk7a" + "commit": "5da06a8acebcaf84a3581610ff24aae1b46f786b", + "sha256": "16yfnqpdzi3bih16d7dzbqmd30m7w8rkjylnsg9m951vc0lysk3p" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "bind-key", + "lastfm", + "mpv", + "s", + "versuri" + ], + "commit": "4e15dacd6445d490fefc47070f8e5b98db5e0dc6", + "sha256": "18qcw9mh57jrd6qrgcma82q28d1dab2dy6v8pi08kadcy4w95y10" } }, { @@ -98513,8 +99573,8 @@ 20200325, 2226 ], - "commit": "cbb15424431cd5f579b12307b8fa03122d525006", - "sha256": "1wwk5q3viw32pwmf4bjhbywkj0d1prwnldgdjfjzmr3rnvfw7w9h" + "commit": "e522a44b151d69d4a176e8809225598ab540fc4d", + "sha256": "1alishzz4j1hbfyfi09rkhffx6gv16yxln7q8jx25shb9rssivyz" } }, { @@ -98636,15 +99696,15 @@ "repo": "abrochard/walkman", "unstable": { "version": [ - 20200319, - 1739 + 20200418, + 1554 ], "deps": [ "org", "transient" ], - "commit": "da90c9dcd501c1bb88c6bde055911c34bf4202a7", - "sha256": "04gzb1v6wva24xbl8r8rr1ys2zmz03ccl0517d3pkgbd9v1wha2f" + "commit": "07a7710084c328dc238626f8b6e7d019380502de", + "sha256": "13g8wgcv3qydx6vhznx1iypmlrzl3cm02prrkqp70gjvgblk06nm" } }, { @@ -98655,11 +99715,11 @@ "repo": "farlado/emacs-wallpaper", "unstable": { "version": [ - 20200321, - 1220 + 20200408, + 1353 ], - "commit": "762354e958dbe298de06d119493d1aee8ffd0112", - "sha256": "1vcpfamawaja9q2n5qqkfn1bn2psi3ymcniw9g66k3whkqsh0kji" + "commit": "9fb5be9c2f7279f7ef2860eefd416359b9026ba3", + "sha256": "18vm8g4iwf2a9l40bg7cvpdziv10mv24x61z86xwjmnqbr7sxd8q" } }, { @@ -98988,11 +100048,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20200301, - 1948 + 20200424, + 1153 ], - "commit": "b0bb4ab82ba64b6fa789212f03ad808bdaf77d68", - "sha256": "0v79xm0w8fr342jp27jlkph3av3kbzwdyip6djwykid4j6bcnv2i" + "commit": "6774c596a9b3988989d3bc96b6194e6f0df1d1b6", + "sha256": "1kv06qjcjxy5jw68za5bkmj4kwzc1snlxd7nahcy29rjkiczlh9c" }, "stable": { "version": [ @@ -99081,11 +100141,11 @@ "repo": "eschulte/emacs-web-server", "unstable": { "version": [ - 20200312, - 1154 + 20200330, + 1407 ], - "commit": "b49ba259cc7e490e8acdecd28e66063f5ad1325e", - "sha256": "0b5mhgzbf1xy07g1yl0nb45hr0n18h6zxvw07zvahj2x1px9s6yc" + "commit": "9edf4b5e3c6cea1738acf08241919e00437ec530", + "sha256": "1cf2g67q064pnji0hbg0x5ziqmxwim127sd4q849cifxj7a4rqaw" } }, { @@ -99132,28 +100192,28 @@ "repo": "etu/webpaste.el", "unstable": { "version": [ - 20200227, - 912 + 20200416, + 1007 ], "deps": [ "cl-lib", "request" ], - "commit": "ef33b0f298bf36cfb84b37af4870706fc376b0c3", - "sha256": "0v2yw3jbwlamkycgfmd5abxr764zyzcggyzn2ybzlkffxaxaz6dw" + "commit": "7a3060266459566e450c5cafc00bc90c6508eae5", + "sha256": "064lihjd6bddvlick8md1anhinkc88asvliw0z34c8bckxc3hqpr" }, "stable": { "version": [ 3, - 0, - 2 + 1, + 0 ], "deps": [ "cl-lib", "request" ], - "commit": "1a6c0e967f0340d825df33f4fab339eb904f5f5f", - "sha256": "15b97rszszgcivrsdx7368nxdb8lsag6wvmcvvm977splh9yjpwi" + "commit": "7a3060266459566e450c5cafc00bc90c6508eae5", + "sha256": "064lihjd6bddvlick8md1anhinkc88asvliw0z34c8bckxc3hqpr" } }, { @@ -99164,14 +100224,14 @@ "repo": "ahyatt/emacs-websocket", "unstable": { "version": [ - 20200321, - 102 + 20200419, + 2124 ], "deps": [ "cl-lib" ], - "commit": "31e122a9d7a1ae092e8f970df718fb8256e16574", - "sha256": "1yjdrpn2dwaarmcymf1i8lj72jyvrpp3jqwr3rv59bg8fldin0rs" + "commit": "078f83902c0846c00ed8e3b6c5add7ff9b98d8f9", + "sha256": "11nacz0vvhaa8582r0ylx5w886y2qysbvrh9s064g979vjyfh9rg" }, "stable": { "version": [ @@ -99609,11 +100669,11 @@ "repo": "lassik/emacs-whois", "unstable": { "version": [ - 20200326, - 1909 + 20200409, + 1538 ], - "commit": "2186a52db77badd809c99d5c21502878298d78f6", - "sha256": "1dnr7navhjzca2hapwx41xdx4i5fgjyjnw2ms5na6n572xp8kgnj" + "commit": "907abd9538c4a1e088853b816af883e5040fc430", + "sha256": "1qfkppciijyyg76idqqzjy351rki8y4pffwicprnrhv1qixfhdvv" }, "stable": { "version": [ @@ -99703,8 +100763,8 @@ "makey", "s" ], - "commit": "0379c80a0c2df77cd18e95741caf6fc8acd90a41", - "sha256": "1lkmr9024x8nv9chl21qp9dnl64qlp0lrfy592pzidpr3997xkjf" + "commit": "79098cd4cdfa144807cb710af4589c13a7033842", + "sha256": "04gfhjpn4q8d4y6177gdffwjbqq627083pff2ckw79pbvlj9f2mm" } }, { @@ -99944,6 +101004,21 @@ "sha256": "1dpy8hkjn87wbdkzyabhay4jx4dgc0ab2flyf0rjq1qaazk393sc" } }, + { + "ename": "winds", + "commit": "43a07dc1e9af8f832330131764147907826e06e5", + "sha256": "1a5kw44pyilgaydyp87his41b2hw0xijp6sggl7bd60jwgspa0wy", + "fetcher": "github", + "repo": "Javyre/winds.el", + "unstable": { + "version": [ + 20200425, + 1643 + ], + "commit": "a998e9397836f441d51f3c8d001dd407258a0ff5", + "sha256": "1qgkm1fl21r56gbsvwmld8mdf970zwjsj68qdpsa9m0j4kbw9m9c" + } + }, { "ename": "windsize", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -100203,14 +101278,26 @@ "repo": "p3r7/with-shell-interpreter", "unstable": { "version": [ - 20200319, - 1351 + 20200419, + 850 ], "deps": [ "cl-lib" ], - "commit": "e806b1e5537ba2f23b507a3cc28aa7c3cacd2315", - "sha256": "1qklc135ydslcxjhlgbmagib3j184gm72paky6glzdjh2yf8mm50" + "commit": "ffd9c6a3a058fe072458f90e117590988042c662", + "sha256": "194k0j6mg8dh5z5ia204glicbmy2laxyny7snbvf7b6xd9ajmj3w" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "cl-lib" + ], + "commit": "92549f9f80067ce32248ad2c05649673d2084fcf", + "sha256": "1dip0d5llr6sjisww283051s21ir8d5nzjdh22k3fjnz68mqq63s" } }, { @@ -100635,14 +101722,14 @@ "repo": "joostkremers/writeroom-mode", "unstable": { "version": [ - 20200303, - 2331 + 20200409, + 1927 ], "deps": [ "visual-fill-column" ], - "commit": "20c761b80031f2b44b9d9fb476e044e477359016", - "sha256": "1kx2xhvi579vhajvgl4spf9jd597fqa2bjh16yqfx2nikissvkhy" + "commit": "9b6e55fe49ab7760a826179df4f1c3b6c9a759df", + "sha256": "0kf88big78lnc2gxn00sykwi1ky4hacr7al2ihgwpznq9vbrj3p1" }, "stable": { "version": [ @@ -100741,20 +101828,20 @@ "repo": "redguardtoo/wucuo", "unstable": { "version": [ - 20200116, - 1447 + 20200421, + 441 ], - "commit": "92e562077cc21dbe285ad2fa7b171c8aae7b556f", - "sha256": "0wbmprg7nbwwpxffknkrg662v0dzdvlipz9f104bhaxvfcmy36ij" + "commit": "2b7632813fdbbfe5abddf7ce425dea607c9946cc", + "sha256": "1h3d7qqajwl9zm5j77y5s3s9sq0hpdakbapsd34xg2x87v0p1320" }, "stable": { "version": [ 0, - 0, - 7 + 1, + 0 ], - "commit": "92e562077cc21dbe285ad2fa7b171c8aae7b556f", - "sha256": "0wbmprg7nbwwpxffknkrg662v0dzdvlipz9f104bhaxvfcmy36ij" + "commit": "2b7632813fdbbfe5abddf7ce425dea607c9946cc", + "sha256": "1h3d7qqajwl9zm5j77y5s3s9sq0hpdakbapsd34xg2x87v0p1320" } }, { @@ -100910,11 +101997,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20200330, - 557 + 20200424, + 2358 ], - "commit": "d75567f7f6b85830b97b18ab1b5d8e70acaa05bf", - "sha256": "1lmca03y7h584agid7fr5g2w3s9psk55n0qlrcfgg10d67nq6l75" + "commit": "b0d87ab312a51ab8484deb8994e4effb3112d516", + "sha256": "1ivlcxm423syd35njrpnswdra3f30fqsfr6qdffiy6vajy0ykda7" } }, { @@ -100940,11 +102027,11 @@ "repo": "xahlee/lookup-word-on-internet", "unstable": { "version": [ - 20200225, - 31 + 20200420, + 1528 ], - "commit": "5ddd01520ca49d459f67567901fc08c84aa553bd", - "sha256": "07fx4vypgim39rw022v5m7gfp68095s393j8s28k2j038jqgzdp5" + "commit": "c97a43dc0cebbfc519d0cce5b547dcc5e22b2085", + "sha256": "1qkazkisgw5c9xzxqm6xzm124r1v4d4dcyazvw66nz5j2zl1i5qd" } }, { @@ -101393,14 +102480,11 @@ "repo": "atomontage/xterm-color", "unstable": { "version": [ - 20200103, - 1327 + 20200424, + 2025 ], - "deps": [ - "cl-lib" - ], - "commit": "4b21b619841c93c4700039a93eb1881beee9248c", - "sha256": "1v4i74xdp26k9r1nvbdz625l62acvfb2kkp1nvld05p6xkh0q68z" + "commit": "c389016e029c279c81fe4c0e1d757949b5ef36c0", + "sha256": "16lpjbb49f465h36x22ch84133d0ihbqpfhjh46sncpj22ddj8pl" }, "stable": { "version": [ @@ -101478,6 +102562,57 @@ "sha256": "04j4xwcdxlnrwxs89605zmwxszbi2j0z67v80651pshgnhj5p19i" } }, + { + "ename": "xwwp", + "commit": "83c34ae5023410cc31f93255275d6465b6152a10", + "sha256": "07r62haa1ks2xvfh4zkqadpsjdhk6kbafk1fmvcim3m13ma6gch1", + "fetcher": "github", + "repo": "canatella/xwwp", + "unstable": { + "version": [ + 20200413, + 757 + ], + "commit": "dcf6f9430dd9745e5f2705c0f42e013fab961c0e", + "sha256": "1aks12zbfcq4m4s1baxcdg2xjn2y9f4dw19576yp35hg2cb550v6" + } + }, + { + "ename": "xwwp-follow-link-helm", + "commit": "83c34ae5023410cc31f93255275d6465b6152a10", + "sha256": "0dcbhc4zy4n03fi6pz3k9hlnpk7ys6xx1v6c4rwcjzy5ly80alwq", + "fetcher": "github", + "repo": "canatella/xwwp", + "unstable": { + "version": [ + 20200331, + 800 + ], + "deps": [ + "xwwp" + ], + "commit": "dcf6f9430dd9745e5f2705c0f42e013fab961c0e", + "sha256": "1aks12zbfcq4m4s1baxcdg2xjn2y9f4dw19576yp35hg2cb550v6" + } + }, + { + "ename": "xwwp-follow-link-ivy", + "commit": "83c34ae5023410cc31f93255275d6465b6152a10", + "sha256": "0i5wqj4170iqznghy02dc2g5l5cs76hjhk88dcwwpbss1mabj8ig", + "fetcher": "github", + "repo": "canatella/xwwp", + "unstable": { + "version": [ + 20200331, + 800 + ], + "deps": [ + "xwwp" + ], + "commit": "dcf6f9430dd9745e5f2705c0f42e013fab961c0e", + "sha256": "1aks12zbfcq4m4s1baxcdg2xjn2y9f4dw19576yp35hg2cb550v6" + } + }, { "ename": "yabin", "commit": "cc44b28e32ff9b35f60744a175c2d1e3036db8bc", @@ -101558,8 +102693,8 @@ 20171022, 1412 ], - "commit": "ecb66f0b77aac0123e5b3336ee1910fa07fa44f9", - "sha256": "1cvsp6x94b223g21avr2z255s5xwdwmdxnhwzq8qj2c3qrax6sx9" + "commit": "e844b662819344eb726f67e525f377b9ee808b24", + "sha256": "0d8c70bip8wxpnjqhqf33kq4q2lb2qdk9w2a4bp2v707fpr4pv73" } }, { @@ -101696,11 +102831,11 @@ "repo": "Kungsgeten/yankpad", "unstable": { "version": [ - 20200108, - 1811 + 20200409, + 1747 ], - "commit": "dd97994a8bff58e4d98aa6cb90aa08c5ddde5c82", - "sha256": "114qnr8s5v2dr3v3jvy4aagyi1wbn3fw27mrb6zdg6faxvfpd8sk" + "commit": "acfccf3633d7fd3b91d717fda4ae98e8e3345a06", + "sha256": "0xprfvgfcjdl20j1hxjk3f4gy7m3v0x9p0vyl2ygxmjj7ibgi7kw" }, "stable": { "version": [ @@ -101719,11 +102854,11 @@ "repo": "JorisE/yapfify", "unstable": { "version": [ - 20200326, - 917 + 20200406, + 830 ], - "commit": "2e5d344b6d9cf1965a1153b160b3a52582d492ff", - "sha256": "1pi1dgcqz1xn5r4z5pjxbyx4kq75cxzl3711zzp0dyn48w0a7sj3" + "commit": "3df4e8ce65f55fd69479b3417525ce83a2b00b45", + "sha256": "13q84a4q5bv56r9dhi84jqbkx7dc1bvi42s01ahh8vmdvg4h39d3" }, "stable": { "version": [ @@ -101849,14 +102984,14 @@ "repo": "joaotavora/yasnippet", "unstable": { "version": [ - 20200329, - 1434 + 20200413, + 2221 ], "deps": [ "cl-lib" ], - "commit": "7c02bc142c3b157699ab8c4f24ff98da94401248", - "sha256": "1yjqlb9jdbsmmywgg49wd25psbf9637hzgnx5i1q3diaravlnji6" + "commit": "5b1217ab085fab4abeb1118dccb260691b446703", + "sha256": "0486kd8brxwmbmw9bjf0p9i99dyl17hbc5aa03z7psqqlsw713mx" }, "stable": { "version": [ @@ -101897,25 +103032,25 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20200314, - 1030 + 20200425, + 1210 ], "deps": [ "yasnippet" ], - "commit": "d9a9ec282c6eb1156b06dd1362e018404221087d", - "sha256": "0kvpp1w02mr713lz9jnq0xwbl14f879g7f1icns3n6ilf8kgb104" + "commit": "937cb7bb1921db38ab2c0c62062e8e32a29eabed", + "sha256": "03v855gbr6ii21qw4h8whbzj88xi28sqpnz1yqd1a7ngrc149fgz" }, "stable": { "version": [ 0, - 20 + 22 ], "deps": [ "yasnippet" ], - "commit": "e813c1479a9fb2773d95ddba39c4aa0e7a1c33c5", - "sha256": "095w7cdmfwmmr6426mbq15n0a5izgbmv9408m9yh1pqz5x3v3vsx" + "commit": "e51a259527d685fe767b6ec951ad1940b1131a69", + "sha256": "1xcmx0frialb86z5adi07b6skqks326w3v1xn49c54gxim027i5d" } }, { @@ -102169,11 +103304,11 @@ "repo": "ryuslash/yoshi-theme", "unstable": { "version": [ - 20200307, - 704 + 20200422, + 208 ], - "commit": "25bde9dc4ca380941b6539757371aef91ca35968", - "sha256": "0p3qrp0wrqissbvz8bnpbrj67c2697mq1pni9c247fiijbcnl48j" + "commit": "caa83e4475885a2c9a126630f0feec1ce2eb0c4e", + "sha256": "0sga52lz54c2v08j6m9v3ddv7rlpdcgi9lkxn1cvajm5h60b20r8" }, "stable": { "version": [ @@ -102388,28 +103523,28 @@ "repo": "zephir-lang/zephir-mode", "unstable": { "version": [ - 20200329, - 1235 + 20200417, + 830 ], "deps": [ "cl-lib", "pkg-info" ], - "commit": "3e112ba7c52b5caad0c230e014b6e842d6379ab1", - "sha256": "1h6lhz7fvx6c2zwgjwm5aiax5f22v65dmq3rj0s51vpasyj2k9ib" + "commit": "4e9618b77dff67c1c7b6fff78605a62311db88b8", + "sha256": "0chh35h479jm0zcjxqyd9v1gzs2adicvyihdls87g8minmwvl19r" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ "cl-lib", "pkg-info" ], - "commit": "76c310faf792db93bc6750305f5b54aa6a4963bd", - "sha256": "1najsypq8qix6jgxqqj5kkfdp7b10l3xz25qw0y5lzz4by4pzzpa" + "commit": "9adc5cf07a9117d25eaab41867ddde914c6d2f5a", + "sha256": "0g2vfscikz8qa0danvcickcjnz99yjm9jgk3sci094gmgwka3j2y" } }, { @@ -102420,26 +103555,26 @@ "url": "https://gitlab.emacsos.com/sylecn/zero-el", "unstable": { "version": [ - 20200220, - 1619 + 20200405, + 1220 ], "deps": [ "s" ], - "commit": "3e6e45482c223d3a9610fb366e9cc3aab98a7aab", - "sha256": "1qqk419f4y59vadpqf4my75pzgap9maylfbmaw7k2sqwajy2mxnl" + "commit": "729da9f4b99acb744ee6974ed7f3d4e252fd19da", + "sha256": "1bcka4gzcb5r2y5g7a06l05n6ixvs7lm37w4ghvvq12ci2ypzp04" }, "stable": { "version": [ 2, - 6, + 8, 0 ], "deps": [ "s" ], - "commit": "3e6e45482c223d3a9610fb366e9cc3aab98a7aab", - "sha256": "1qqk419f4y59vadpqf4my75pzgap9maylfbmaw7k2sqwajy2mxnl" + "commit": "729da9f4b99acb744ee6974ed7f3d4e252fd19da", + "sha256": "1bcka4gzcb5r2y5g7a06l05n6ixvs7lm37w4ghvvq12ci2ypzp04" } }, { @@ -102479,14 +103614,25 @@ "repo": "efls/zetteldeft", "unstable": { "version": [ - 20200329, - 1506 + 20200415, + 1614 ], "deps": [ "deft" ], - "commit": "1dd8b052bb4bc8fcd18740e798057ace97cb63ac", - "sha256": "16bkcp6mq98bn1qli2qi6wgf5zrkxfqs912fi9fg88bcixk50k9j" + "commit": "cba7554afe740f64adcdc615b5f4ab0e1e47c6a1", + "sha256": "1b1bqz02xh19syyv9w64q9msay84kpq3kkmpdqy8i7mvhsd4cdry" + }, + "stable": { + "version": [ + 0, + 3 + ], + "deps": [ + "deft" + ], + "commit": "271ea573b0a4f265d16108db2ec7c928f3e9aa31", + "sha256": "0y709x03har1sm30vbja3k3vw4p1nfck5zii7cigl4vg0scpcri6" } }, { @@ -102907,22 +104053,22 @@ }, { "ename": "zpresent", - "commit": "3aae38ad54490fa650c832fb7d22e2c73b0fb060", - "sha256": "0316qyspmdbg94aw620133ilh8kfpr3db1p2cifgccgcacjv3v5j", - "fetcher": "bitbucket", - "repo": "zck/zpresent.el", + "commit": "d3828ad7599d13728b5571b882344c3ada434b85", + "sha256": "0i1qrb9qplmx9kx1286xypjyy48r9y3cvnlhi06r583adfr02wab", + "fetcher": "hg", + "url": "https://hg.sr.ht/~zck/zpresent", "unstable": { "version": [ - 20180605, - 438 + 20200417, + 309 ], "deps": [ "dash", "org-parser", "request" ], - "commit": "55fc14b66e2ea506247a4e7dd622a9dfe5545c4b", - "sha256": "17wkhl1a7jmg4ks011lf5h4f2vbhf8dl6vgzdzlmljk15f9hmw35" + "commit": "406967322b7692492a5942d901335d626cace4d0", + "sha256": "1nn6dvzcayh6nv6xn3siv09iixc5c3gy9c8y1fdwzq81yny9l2fr" } }, { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix deleted file mode 100644 index 820919b532..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ fetchurl, lib, melpaBuild }: - -melpaBuild { - pname = "thingatpt-plus"; - version = "20170307.1539"; - - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/thingatpt+.el"; - sha256 = "1k9y354315gvhbdk0m9xpjx24w1bwrnzlnfiils8xgdwnw4py99a"; - name = "thingatpt+.el"; - }; - - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+"; - sha256 = "0w031lzjl5phvzsmbbxn2fpziwkmdyxsn08h6b9lxbss1prhx7aa"; - name = "thingatpt-plus"; - }; - - meta = { - homepage = "https://melpa.org/#/thingatpt+"; - license = lib.licenses.gpl2Plus; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix deleted file mode 100644 index 4dc5689491..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{stdenv, fetchurl, emacs}: - -stdenv.mkDerivation { - name = "yaoddmuse-0.1.2"; - - src = fetchurl { - url = "http://emacswiki.org/emacs/download/yaoddmuse.el"; - sha256 = "0vlllq3xmnlni0ws226pqxj68nshclbl5rgqv6y11i3yvzgiazr6"; - }; - - phases = [ "buildPhase" "installPhase"]; - - buildInputs = [ emacs ]; - - buildPhase = '' - cp $src yaoddmuse.el - emacs --batch -f batch-byte-compile yaoddmuse.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install yaoddmuse.el $out/share/emacs/site-lisp - ''; - - meta = { - description = "Comprehensive Emacs integration with Oddmuse wikis"; - homepage = "http://emacswiki.org/emacs/Yaoddmuse"; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix index bca85c0101..07776bebe4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, p7zip +{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf , coreutils, gnugrep, which, git, unzip, libsecret, libnotify }: @@ -19,14 +19,14 @@ with stdenv; lib.makeOverridable mkDerivation rec { comment = lib.replaceChars ["\n"] [" "] meta.longDescription; desktopName = product; genericName = meta.description; - categories = "Application;Development;"; + categories = "Development;"; icon = execName; extraEntries = '' StartupWMClass=${wmClass} ''; }; - nativeBuildInputs = [ makeWrapper patchelf p7zip unzip ]; + nativeBuildInputs = [ makeWrapper patchelf unzip ]; patchPhase = lib.optionalString (!stdenv.isDarwin) '' get_file_size() { diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index b98acae2a8..282d950c85 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -250,12 +250,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2019.3.5"; /* updated by script */ + version = "2020.1"; /* 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 = "0qmhp0sqcknwgsirnbi6461lzr7mxgrgjsd0q5cxnhscbbczl7pk"; /* updated by script */ + sha256 = "18mbw72vgrzkvjykc23h17qxrxfvhjzhy9rxpi2asw196qalavzp"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -276,12 +276,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2019.3.4"; /* updated by script */ + version = "2020.1"; /* 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 = "01dik4ppn4a6m1bmz6cmdnyrilh2v190lrys65n4nps03sjy2v0b"; /* updated by script */ + sha256 = "1qlpx3vfqwpyyxjsknhxvbdhyciwihhl0hkinrpdky6bza1yfgf6"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -315,12 +315,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2019.3.4"; /* updated by script */ + version = "2020.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 = "1bxi2i6vxpw8x4mvb4d5plqy4r938xjf8nkimfg0sspramcc4r5m"; /* updated by script */ + sha256 = "1yvqljjv6004kw2nkpddrsgnigb56rapgs3f1pcvl20h6hj08qj8"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -354,12 +354,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2019.3.4"; /* updated by script */ + version = "2020.1.0"; /* 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 = "17axv0v31dpmjcaij5qpqqm071mwhmf1ahy0y0h96limq8cw9872"; /* updated by script */ + sha256 = "1allpdr7k48nvl8vbvzyn6h81jpklzaqdqivrqqyh8hy9l98w4ws"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -367,12 +367,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2019.3.4"; /* updated by script */ + version = "2020.1"; /* 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 = "13lwrqrkg5vk0azqfhr67psgv1idvkxwjxly2xawr6cy5vnrcd8s"; /* updated by script */ + sha256 = "1hk6k4f24infw9qj9mxp305nl0bxif6ymdsqg005pskvnyi8v5fi"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix index d429bb4bcb..3fe845a067 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib +{ lib, mkDerivation, fetchurl, fetchpatch, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib , openssl, R, qtbase, qtxmlpatterns, qtsensors, qtwebengine, qtwebchannel , libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc , llvmPackages @@ -8,7 +8,7 @@ with lib; let verMajor = "1"; verMinor = "2"; - verPatch = "5033"; + verPatch = "5042"; version = "${verMajor}.${verMinor}.${verPatch}"; ginVer = "2.1.2"; gwtVer = "2.8.1"; @@ -26,11 +26,19 @@ mkDerivation rec { owner = "rstudio"; repo = "rstudio"; rev = "v${version}"; - sha256 = "0f3p2anz9xay2859bxj3bvyj582igsp628qxsccpkgn0jifvi4np"; + sha256 = "1n67fa357v51j3z1ma8v2ydfsx3y8n10k2svmfcf4mdzsi8w0kc5"; }; # Hack RStudio to only use the input R and provided libclang. - patches = [ ./r-location.patch ./clang-location.patch ]; + patches = [ ./r-location.patch ./clang-location.patch + (fetchpatch { + # Fetch a patch to ensure Rstudio compiles against R + # 4.0.0, should be removed next 1.2.X Rstudio update + # or possibly 1.3.X + url = "https://github.com/rstudio/rstudio/commit/3fb2397c2f208bb8ace0bbaf269481ccb96b5b20.patch"; + sha256 = "0qpgjy6aash0fc0xbns42cwpj3nsw49nkbzwyq8az01xwg81g0f3"; + }) + ]; postPatch = '' substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R} substituteInPlace src/cpp/core/libclang/LibClang.cpp \ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix index 2f636764e1..67f1f47dcc 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ stdenv, fetchFromGitHub , libX11, libXext, libXi , freetype, fontconfig , libpng, libjpeg @@ -7,17 +7,15 @@ stdenv.mkDerivation rec { pname = "azpainter"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "Symbian9"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "0x5jmsprjissqcvwq75pqq9wgv4k9b7cy507hai8xk6xs3vxwgba"; + rev = "v${version}"; + sha256 = "sha256-al87Rnf4HkKdmtN3EqxC0zEHgVWwnVi7WttqT/Qxr0Q="; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libX11 libXext libXi freetype fontconfig @@ -25,14 +23,11 @@ stdenv.mkDerivation rec { zlib ]; - configureFlags = [ - "--with-freetype-dir=${stdenv.lib.getDev freetype}/include/freetype2" - ]; - meta = with stdenv.lib; { description = "Full color painting software for illustration drawing"; homepage = "https://osdn.net/projects/azpainter"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dtzWill ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix index 771e6677b1..948b4ddd54 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "3.0.1"; + version = "3.0.2"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "1dvwmgnlfvi1lvdhgyddcp5apwlc8v5gwy9gmfcpra8lv8hkjjy5"; + sha256 = "1yrnkw8c47kmy2x6m1xp69hwyk02xyc8pd9kvcmyj54lzrhzdfka"; }; nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix index aa1ac0f262..8281596374 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "12.9.9"; + version = "13.0.3"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "07lx99fd4vkgdhagshzawrh8ncbv19hvxjpzgd3yjdj0nalvmxin"; + sha256 = "104pfwipm8ch9xqlsz1gh18icr1p6i3n4c77bbdjakxcy4s5n7sg"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fstl/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/fstl/default.nix index 1d712a63fb..c96ea765d4 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/fstl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/fstl/default.nix @@ -2,7 +2,7 @@ mkDerivation rec { pname = "fstl"; - version = "0.9.3"; + version = "0.9.4"; buildInputs = [qtbase mesa_glu]; @@ -23,7 +23,7 @@ mkDerivation rec { owner = "mkeeter"; repo = "fstl"; rev = "v" + version; - sha256 = "1j0y9xbf0ybrrnsmfzgpyyz6bi98xgzn9ivani424j01vffns892"; + sha256 = "028hzdv11hgvcpc36q5scf4nw1256qswh37xhfn5a0iv7wycmnif"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/qimgv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/qimgv/default.nix index 2756d659ed..4bbf6aa31d 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/qimgv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/qimgv/default.nix @@ -1,12 +1,14 @@ { mkDerivation , lib , fetchFromGitHub +, fetchpatch , cmake , pkgconfig , exiv2 , mpv +, opencv4 , qtbase , qtimageformats , qtsvg @@ -14,15 +16,25 @@ mkDerivation rec { pname = "qimgv"; - version = "0.8.9"; + version = "0.9"; src = fetchFromGitHub { owner = "easymodo"; repo = pname; rev = "v${version}"; - sha256 = "0cmya06j466v0pirhxbzbj1vbz0346y7rbc1gbv4n9xcp6c6bln6"; + sha256 = "1yynjk47gjf2kjfb0ak4blxpb5irgqc1k59z726lwjd6gvg689fl"; }; + patches = [ + # QtAtomicInt's `storeRelaxed` was introduced in Qt 5.14, while nixpkgs only + # has Qt 5.12. This appears to be the only instance of Qt 5.12 + # incompatibility, and will be fixed in the next release. + (fetchpatch { + url = "https://github.com/easymodo/qimgv/commit/a39d6086ceb9445d2c16943e0719096a99920bf8.patch"; + sha256 = "1z3ngv6i316hrdcdzig4jg6bcdbgfxjaxvm2jcfcw2dnfbfiq47s"; + }) + ]; + nativeBuildInputs = [ cmake pkgconfig @@ -31,6 +43,7 @@ mkDerivation rec { buildInputs = [ exiv2 mpv + opencv4 qtbase qtimageformats qtsvg diff --git a/third_party/nixpkgs/pkgs/applications/graphics/qimgv/qt5-12-compat.diff b/third_party/nixpkgs/pkgs/applications/graphics/qimgv/qt5-12-compat.diff new file mode 100644 index 0000000000..da64759e22 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/qimgv/qt5-12-compat.diff @@ -0,0 +1,13 @@ +diff --git a/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp b/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp +index 96ec9d3..6d95d08 100644 +--- a/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp ++++ b/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp +@@ -21,7 +21,7 @@ void LinuxWorker::setDescriptor(int desc) { + + void LinuxWorker::run() { + emit started(); +- isRunning.storeRelaxed(true); ++ isRunning.store(true); + + if (fd == -1) { + qDebug() << TAG << "File descriptor isn't set! Stopping"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 22e8a2ca53..2ada41ac98 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb }: +{ stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }: let myPatchElf = file: with stdenv.lib; '' @@ -30,13 +30,13 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ makeWrapper patchelf coreutils udevRules ]; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; dontBuild = true; patchPhase = '' ${myPatchElf "opt/brother/scanner/brscan4/brsaneconfig4"} - RPATH=${libusb.out}/lib + RPATH=${libusb-compat-0_1.out}/lib for a in usr/lib64/sane/*.so*; do if ! test -L $a; then patchelf --set-rpath $RPATH $a diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/frontends.nix b/third_party/nixpkgs/pkgs/applications/graphics/sane/frontends.nix index 188431bda6..885dff311b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/sane/frontends.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/sane/frontends.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null }: +{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb-compat-0_1 ? null }: stdenv.mkDerivation rec { pname = "sane-frontends"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ sane-backends libX11 gtk2 ] - ++ stdenv.lib.optional (libusb != null) libusb; + ++ stdenv.lib.optional (libusb-compat-0_1 != null) libusb-compat-0_1; nativeBuildInputs = [ pkgconfig ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/xsane.nix b/third_party/nixpkgs/pkgs/applications/graphics/sane/xsane.nix index 22a8f4dc3b..04d19dee8a 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/sane/xsane.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/sane/xsane.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng -, libusb ? null +, libusb-compat-0_1 ? null , gimpSupport ? false, gimp ? null }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ] - ++ (if libusb != null then [libusb] else []) + ++ (if libusb-compat-0_1 != null then [libusb-compat-0_1] else []) ++ stdenv.lib.optional gimpSupport gimp; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/kde/ark/default.nix b/third_party/nixpkgs/pkgs/applications/kde/ark/default.nix index 76cc423f54..dbbfcf80c6 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/ark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/ark/default.nix @@ -9,14 +9,14 @@ libarchive, libzip, # Archive tools - p7zip, lrzip, + lrzip, # Unfree tools unfreeEnableUnrar ? false, unrar, }: let - extraTools = [ p7zip lrzip ] ++ lib.optional unfreeEnableUnrar unrar; + extraTools = [ lrzip ] ++ lib.optional unfreeEnableUnrar unrar; in mkDerivation { diff --git a/third_party/nixpkgs/pkgs/applications/kde/kate.nix b/third_party/nixpkgs/pkgs/applications/kde/kate.nix index f01a57a55d..e0d0273efd 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kate.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kate.nix @@ -14,6 +14,16 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; + # InitialPreference values are too high and end up making kate & + # kwrite defaults for anything considered text/plain. Resetting to + # 1, which is the default. + postPatch = '' + substituteInPlace kate/data/org.kde.kate.desktop \ + --replace InitialPreference=9 InitialPreference=1 + substituteInPlace kwrite/data/org.kde.kwrite.desktop \ + --replace InitialPreference=8 InitialPreference=1 + ''; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libgit2 diff --git a/third_party/nixpkgs/pkgs/applications/kde/konqueror.nix b/third_party/nixpkgs/pkgs/applications/kde/konqueror.nix index e6442fea2f..62ed3db063 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/konqueror.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/konqueror.nix @@ -12,9 +12,17 @@ mkDerivation { kdelibs4support kcmutils khtml kdesu qtwebkit qtwebengine qtx11extras qtscript qtwayland ]; + + # InitialPreference values are too high and any text/html ends up + # opening konqueror, even if firefox or chromium are also available. + # Resetting to 1, which is the default. + postPatch = '' + substituteInPlace kfmclient_html.desktop \ + --replace InitialPreference=9 InitialPreference=1 + ''; + meta = { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ ]; }; } - diff --git a/third_party/nixpkgs/pkgs/applications/kde/okular.nix b/third_party/nixpkgs/pkgs/applications/kde/okular.nix index f07df73a25..3bcdb9ca84 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/okular.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/okular.nix @@ -18,6 +18,15 @@ mkDerivation { kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5 qtdeclarative qtsvg threadweaver kcrash ] ++ lib.optional (!stdenv.isAarch64) chmlib; + + # InitialPreference values are too high and end up making okular + # default for anything considered text/plain. Resetting to 1, which + # is the default. + postPatch = '' + substituteInPlace generators/txt/okularApplication_txt.desktop \ + --replace InitialPreference=3 InitialPreference=1 + ''; + meta = with lib; { homepage = "http://www.kde.org"; license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix index b27569a8a3..010e9ae7a5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.9.4"; + version = "0.10.0"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; - sha256 = "0hgvcm42035fs2qhhvycppcrqgya98rmkk347j3hyj1m6kqxi99c"; + sha256 = "07j11ikd0rzsj4d8rv74rfy497svq6l2q94ndf3b0a0mr8riyazj"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - sha256 = "1fvl078kgpvzjr3jfp8zbajzsiwrcm33b7lqksxgcy30paqw6737"; + sha256 = "177cl4x7rj3d74kzrpmiwps5n31axmlhqdwrdpkmay2gk9inswbs"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg"; - sha256 = "0fzbfxsgf0s93kg647zla9n9k5adnfb57dcwwnibs6lq5k63h8mj"; + sha256 = "13yxmnh77g6zvl2gqf77m5i3v5706p2plgbgsn5hqrrf3g8ql63b"; } else throw "Architecture not supported"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/alacritty/default.nix b/third_party/nixpkgs/pkgs/applications/misc/alacritty/default.nix index c5d7b19618..19f0790fea 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/alacritty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/alacritty/default.nix @@ -95,7 +95,7 @@ rustPlatform.buildRustPackage rec { installPhase = '' runHook preInstall - install -D target/release/alacritty $out/bin/alacritty + install -D $releaseDir/alacritty $out/bin/alacritty '' + ( if stdenv.isDarwin then '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix b/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix index 00707fc7ec..5385cf6788 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "birdtray"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "gyunaev"; repo = pname; rev = version; - sha256 = "15d0gz889vf9b2a046m93s5kdi6lw2sqjd5gaxgjkjrs20x5vr18"; + sha256 = "15l8drdmamq1dpqpj0h9ajj2r5vcs23cx421drvhfgs6bqlzd1hl"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/clipit/default.nix b/third_party/nixpkgs/pkgs/applications/misc/clipit/default.nix index 82d6272aad..02207fb958 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/clipit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/clipit/default.nix @@ -4,23 +4,15 @@ stdenv.mkDerivation rec { pname = "clipit"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { - owner = "shantzu"; + owner = "CristianHenzel"; repo = "ClipIt"; - rev = "v${version}"; - sha256 = "05xi29v2y0rvb33fmvrz7r9j4l858qj7ngwd7dp4pzpkkaybjln0"; + rev = "45e2ea386d04dbfc411ea370299502450d589d0c"; + sha256 = "0byqz9hanwmdc7i55xszdby2iqrk93lws7hmjda2kv17g34apwl7"; }; - patches = [ - # gtk3 support, can be removed in the next release - (fetchpatch { - url = "https://github.com/CristianHenzel/ClipIt/commit/22e012c7d406436e1785b6dd3c4c138b25f68431.patch"; - sha256 = "0la4gc324dzxpx6nk2lqg5fmjgjpm2pyvzwddmfz1il8hqvrqg3j"; - }) - ]; - preConfigure = '' intltoolize --copy --force --automake ''; @@ -38,5 +30,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.gpl3; platforms = platforms.linux; + maintainers = with maintainers; [ kamilchm ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index 64c3f8ac28..163cb5ed54 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.0.2"; + version = "7.0.3"; 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 = "0p75kvs9ng5i5x5cpdqxlf18y3k83pqsvrkab0i1azk3x4lfkzmd"; + sha256 = "189rsavmaa7480r61qhpzagia3c8jr3dfcl01ks3nfyq53j08hml"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/ddgr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ddgr/default.nix index c4639150dd..82730842ba 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ddgr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ddgr/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3, installShellFiles }: stdenv.mkDerivation rec { - version = "1.8"; + version = "1.8.1"; pname = "ddgr"; src = fetchFromGitHub { owner = "jarun"; repo = "ddgr"; rev = "v${version}"; - sha256 = "1cyaindcg2vc3ij0p6b35inr01c6ys04izxsn1h70ixhsz46qg8z"; + sha256 = "0668wzh1gqin0xscy3fly9hz370n2ny175f3kya9bsld0x0jkd5p"; }; nativeBuildInputs = [ installShellFiles ]; @@ -17,11 +17,6 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - # Version 1.8 was released as 1.7 - postPatch = '' - substituteInPlace ddgr --replace "_VERSION_ = '1.7'" "_VERSION_ = '${version}'" - ''; - postInstall = '' installShellCompletion --bash --name ddgr.bash auto-completion/bash/ddgr-completion.bash installShellCompletion --fish auto-completion/fish/ddgr.fish diff --git a/third_party/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix b/third_party/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix index a6ae453065..95159d1927 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix @@ -7,7 +7,7 @@ , libtool , qrencode , udev -, libusb +, libusb-compat-0_1 , makeWrapper , pkgconfig , qtbase @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { libevent libtool udev - libusb + libusb-compat-0_1 qrencode qtbase diff --git a/third_party/nixpkgs/pkgs/applications/misc/dmenu/wayland.nix b/third_party/nixpkgs/pkgs/applications/misc/dmenu/wayland.nix index 7b17d48477..ca2e6f56e8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dmenu/wayland.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dmenu/wayland.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "dmenu-wayland-unstable"; - version = "2020-02-28"; + version = "2020-04-03"; src = fetchFromGitHub { owner = "nyyManni"; repo = "dmenu-wayland"; - rev = "68e08e8bcde10a10ac3290431f173c6c7fce4238"; - sha256 = "10b1v2brgpgb6wkzn62haj56zmkf3aq6fs3p9rp6bxiw8bs2nvlm"; + rev = "550a7c39f3f925b803d51c616609c8cb6c0ea543"; + sha256 = "0az3w1csn4x6mjyacg6lf70kykdfqamic3hbr57mj83i5jjv0jlv"; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/garmin-plugin/default.nix b/third_party/nixpkgs/pkgs/applications/misc/garmin-plugin/default.nix index ba6868b62f..95cbdd9c19 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/garmin-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/garmin-plugin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, garmintools, libgcrypt, libusb, pkgconfig, tinyxml, zlib }: +{ stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkgconfig, tinyxml, zlib }: stdenv.mkDerivation { name = "garmin-plugin-0.3.26"; src = fetchurl { @@ -7,7 +7,7 @@ stdenv.mkDerivation { }; sourceRoot = "GarminPlugin-0.3.26/src"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ garmintools libusb libgcrypt tinyxml zlib ]; + buildInputs = [ garmintools libusb-compat-0_1 libgcrypt tinyxml zlib ]; configureFlags = [ "--with-libgcrypt-prefix=${libgcrypt.dev}" "--with-garmintools-incdir=${garmintools}/include" diff --git a/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix b/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix index 3dffc5c77c..761d05e5f9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, mkDerivation , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools -, qtconnectivity, qtcharts, libusb +, qtconnectivity, qtcharts, libusb-compat-0_1 , yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper }: @@ -27,7 +27,7 @@ in mkDerivation rec { buildInputs = [ qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib - qtconnectivity qtcharts libusb + qtconnectivity qtcharts libusb-compat-0_1 ]; nativeBuildInputs = [ flex makeWrapper qmake yacc ]; @@ -39,9 +39,9 @@ in mkDerivation rec { cp src/gcconfig.pri.in src/gcconfig.pri cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri - echo 'LIBUSB_INSTALL = ${libusb}' >> src/gcconfig.pri - echo 'LIBUSB_INCLUDE = ${libusb.dev}/include' >> src/gcconfig.pri - echo 'LIBUSB_LIBS = -L${libusb}/lib -lusb' >> src/gcconfig.pri + echo 'LIBUSB_INSTALL = ${libusb-compat-0_1}' >> src/gcconfig.pri + echo 'LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include' >> src/gcconfig.pri + echo 'LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb' >> src/gcconfig.pri sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local # Use qtwebengine instead of qtwebkit diff --git a/third_party/nixpkgs/pkgs/applications/misc/googler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/googler/default.nix index 3e4c9828ed..fba36f5e8a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/googler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/googler/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "googler"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "13jj15ph0vmbyxjslzl6z4h5b7wyllvhwgsrb6zf7qlkcmkd4vwy"; + sha256 = "04d7n2l159s7c9xzvyvbnbii1k3zdbajagpx09x1l692cwjbvpxw"; }; propagatedBuildInputs = [ python ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index 7077b855e3..c519bf63e0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -2,19 +2,19 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.28"; + version = "7.29"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0077y5az3hb46rvkqrpl4zxga5wnm85ca6rz1rdpwiwhq4ch9q8y"; + sha256 = "sha256-OTKyxEu7RZZy3JBHTM7YoH+G4lhoRfb1INLtQEKC5p4="; }; nativeBuildInputs = [ qmake qttools ]; preConfigure = '' - lrelease lang/*.ts + lrelease gpxsee.pro ''; postInstall = with stdenv; lib.optionalString isDarwin '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/havoc/default.nix b/third_party/nixpkgs/pkgs/applications/misc/havoc/default.nix new file mode 100644 index 0000000000..fc4cc680ca --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/havoc/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub +, pkgconfig, libxkbcommon, wayland, wayland-protocols }: + +stdenv.mkDerivation rec { + + pname = "havoc"; + version = "2019-12-08"; + + src = fetchFromGitHub { + owner = "ii8"; + repo = pname; + rev = "507446c92ed7bf8380a58c5ba2b14aba5cdf412c"; + sha256 = "13nfnan1gmy4cqxmqv0rc8a4mcb1g62v73d56hy7z2psv4am7a09"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxkbcommon wayland wayland-protocols ]; + + dontConfigure = true; + + installFlags = [ "PREFIX=$$out" ]; + + postInstall = '' + install -D -m 644 havoc.cfg -t $out/etc/${pname}/ + install -D -m 644 README.md -t $out/share/doc/${pname}-${version}/ + ''; + + meta = with stdenv.lib; { + description = "A minimal terminal emulator for Wayland"; + homepage = "https://github.com/ii8/havoc"; + license = with licenses; [ mit publicDomain ]; + platforms = with platforms; unix; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix index 7fc042832b..e58c933b84 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hugo"; - version = "0.69.0"; + version = "0.69.2"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "050gqjrdfy5ygwl60qdspjn9s6a84k311g3p2fk3sr7i4rnwf36l"; + sha256 = "0bw31264q8w2r3fm3g2qjh9531nmbn942vl5rjf2cjff25c0d4ji"; }; - modSha256 = "07zfqz7d2slswiyx0pw6ip4l428q7nc3i95d4w6d7hfqp0pvp6i0"; + modSha256 = "1i1mw8jcklmnsqawc1jkgw4h1dxjxb9zaf2p8pgfzxzpy5cp6qkl"; buildFlags = [ "-tags" "extended" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/latte-dock/default.nix b/third_party/nixpkgs/pkgs/applications/misc/latte-dock/default.nix index 3fc5099acc..424da3ad36 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/latte-dock/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/latte-dock/default.nix @@ -3,11 +3,11 @@ mkDerivation rec { pname = "latte-dock"; - version = "0.9.10"; + version = "0.9.11"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "11s9fslr33h3ic14ifr43jphf68jpny8jmhvmrrwcz6w0p3falzw"; + sha256 = "0x7a93a7axsa0fzpbkkv1z722k9za4p51xcpzdpnh5ih1zij0csi"; name = "${pname}-${version}.tar.xz"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/lutris/chrootenv.nix b/third_party/nixpkgs/pkgs/applications/misc/lutris/chrootenv.nix index 2861991cc4..4505432b23 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lutris/chrootenv.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lutris/chrootenv.nix @@ -92,7 +92,7 @@ in buildFHSUserEnv { multiPkgs = pkgs: with pkgs; [ # Common libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio - libao libusb libevdev udev libgcrypt libxml2 libusb libpng libmpeg2 libv4l + libao libevdev udev libgcrypt libxml2 libusb-compat-0_1 libpng libmpeg2 libv4l libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils diff --git a/third_party/nixpkgs/pkgs/applications/misc/nut/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nut/default.nix index ce80ae14f2..8f188818d4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi +{ stdenv, fetchurl, pkgconfig, neon, libusb-compat-0_1, openssl, udev, avahi, freeipmi , libtool, makeWrapper, autoreconfHook, fetchpatch }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ neon libusb openssl udev avahi freeipmi ]; + buildInputs = [ neon libusb-compat-0_1 openssl udev avahi freeipmi ]; nativeBuildInputs = [ autoreconfHook libtool pkgconfig makeWrapper ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \ - "$out/lib:${neon}/lib:${libusb.out}/lib:${avahi}/lib:${freeipmi}/lib" + "$out/lib:${neon}/lib:${libusb-compat-0_1.out}/lib:${avahi}/lib:${freeipmi}/lib" ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix index b9951b6662..3c192c124c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix @@ -1,5 +1,7 @@ -{ stdenv, lib, fetchFromGitHub, python2 }: - +{ 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: { @@ -11,17 +13,19 @@ let }); }; - py = python2.override { + py = python3.override { + self = py; packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ - (mkOverride "flask" "0.10.1" "0wrkavjdjndknhp8ya8j850jq7a1cli4g5a93mg8nh1xz2gq50sc") - (mkOverride "flask_login" "0.2.11" "1rg3rsjs1gwi2pw6vr9jmhaqm9b3vc9c4hfcsvp4y8agbh7g3mc3") + (mkOverride "flask" "0.12.5" "fac2b9d443e49f7e7358a444a3db5950bdd0324674d92ba67f8f1f15f876b14f") + (mkOverride "flaskbabel" "0.12.2" "11jwp8vvq1gnm31qh6ihy2h393hy18yn9yjp569g60r0wj1x2sii") (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d") + (mkOverride "psutil" "5.6.7" "ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa") # 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. - (pself: psuper: { - jinja2 = psuper.jinja2.overridePythonAttrs (oldAttrs: rec { + (self: super: { + jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec { version = "2.8.1"; src = oldAttrs.src.override { inherit version; @@ -29,74 +33,75 @@ let }; doCheck = false; }); + + httpretty = super.httpretty.overridePythonAttrs (oldAttrs: rec { + doCheck = false; + }); + + celery = super.celery.overridePythonAttrs (oldAttrs: rec { + doCheck = false; + }); }) + (self: super: { + octoprint = self.buildPythonPackage rec { + pname = "OctoPrint"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "foosel"; + repo = "OctoPrint"; + rev = version; + sha256 = "0387228544v28d69dcdg2zr5gp6qavkfr6dydpjgj5awxv3w25d5"; + }; + + 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 ]; + + checkInputs = with super; [ pytestCheckHook mock ddt ]; + + postPatch = let + ignoreVersionConstraints = [ + "sentry-sdk" + ]; + in '' + sed -r -i \ + ${lib.concatStringsSep "\n" (map (e: + ''-e 's@${e}[<>=]+.*@${e}",@g' \'' + ) ignoreVersionConstraints)} + setup.py + ''; + + dontUseSetuptoolsCheck = true; + + preCheck = '' + export HOME=$(mktemp -d) + rm pytest.ini + ''; + + 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 ]); }; - - ignoreVersionConstraints = [ - "Click" - "Flask-Assets" - "Flask-Babel" - "Flask-Principal" - "emoji" - "flask" - "future" - "futures" - "monotonic" - "markdown" - "pkginfo" - "psutil" - "pyserial" - "requests" - "rsa" - "sarge" - "scandir" - "semantic_version" - "watchdog" - "websocket-client" - "wrapt" - "sentry-sdk" - "werkzeug" # 0.16 just deprecates some stuff - ]; - -in py.pkgs.buildPythonApplication rec { - pname = "OctoPrint"; - version = "1.3.12"; - - src = fetchFromGitHub { - owner = "foosel"; - repo = "OctoPrint"; - rev = version; - sha256 = "1lmqssgwjyhknjf3x58g7cr0fqz7fs5a3rl07r69wfpch63ranyd"; - }; - - propagatedBuildInputs = with py.pkgs; [ - awesome-slugify flask_assets rsa requests pkginfo watchdog - semantic-version flask_principal werkzeug flaskbabel tornado - psutil pyserial flask_login netaddr markdown sockjs-tornado - pylru pyyaml sarge feedparser netifaces click websocket_client - scandir chainmap future futures wrapt monotonic emoji - frozendict cachelib sentry-sdk typing filetype - ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ]; - - checkInputs = with py.pkgs; [ nose mock ddt ]; - - postPatch = '' - sed -r -i \ - ${lib.concatStringsSep "\n" (map (e: - ''-e 's@${e}[<>=]+.*@${e}",@g' \'' - ) ignoreVersionConstraints)} - setup.py - ''; - - checkPhase = '' - HOME=$(mktemp -d) nosetests ${lib.optionalString stdenv.isDarwin "--exclude=test_set_external_modification"} - ''; - - 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 ]; - }; -} +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 69eb313238..b5d52f5e5f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix @@ -1,255 +1,255 @@ -{ stdenv, fetchgit, fetchFromGitHub, octoprint, python2Packages, marlin-calc }: +{ pkgs }: -let - buildPlugin = args: python2Packages.buildPythonPackage (args // { +with pkgs; + +self: super: let + buildPlugin = args: self.buildPythonPackage (args // { pname = "OctoPrintPlugin-${args.pname}"; inherit (args) version; - propagatedBuildInputs = (args.propagatedBuildInputs or []) ++ [ octoprint ]; + propagatedBuildInputs = (args.propagatedBuildInputs or []) ++ [ super.octoprint ]; # none of the following have tests doCheck = false; }); +in { + inherit buildPlugin; - self = { + # Deprecated alias + m3d-fio = self.m33-fio; # added 2016-08-13 - # Deprecated alias - m3d-fio = self.m33-fio; # added 2016-08-13 + m33-fio = buildPlugin rec { + pname = "M33-Fio"; + version = "1.21"; - m33-fio = buildPlugin rec { - pname = "M33-Fio"; - version = "1.21"; - - src = fetchFromGitHub { - owner = "donovan6000"; - repo = "M33-Fio"; - rev = "V${version}"; - sha256 = "1la3611kkqn8yiwjn6cizc45ri8pnk6ckld1na4nk6mqk88jvjq7"; - }; - - patches = [ - ./m33-fio-one-library.patch - ]; - - postPatch = '' - rm -rf octoprint_m33fio/static/libraries/* - ( - cd 'shared library source' - make - ) - ''; - - meta = with stdenv.lib; { - description = "OctoPrint plugin for the Micro 3D printer"; - homepage = "https://github.com/donovan6000/M33-Fio"; - license = licenses.gpl3; - maintainers = with maintainers; [ abbradar ]; - }; + src = fetchFromGitHub { + owner = "donovan6000"; + repo = "M33-Fio"; + rev = "V${version}"; + sha256 = "1la3611kkqn8yiwjn6cizc45ri8pnk6ckld1na4nk6mqk88jvjq7"; }; - mqtt = buildPlugin rec { - pname = "MQTT"; - version = "0.8.6"; + patches = [ + ./m33-fio-one-library.patch + ]; - src = fetchFromGitHub { - owner = "OctoPrint"; - repo = "OctoPrint-MQTT"; - rev = version; - sha256 = "0y1jnfplcy8mh3szrfbbvngl02j49cbdizglrfsry4fvqg50zjxd"; - }; + postPatch = '' + rm -rf octoprint_m33fio/static/libraries/* + ( + cd 'shared library source' + make + ) + ''; - propagatedBuildInputs = with python2Packages; [ paho-mqtt ]; - - meta = with stdenv.lib; { - description = "Publish printer status MQTT"; - homepage = "https://github.com/OctoPrint/OctoPrint-MQTT"; - license = licenses.agpl3; - maintainers = with maintainers; [ peterhoeg ]; - }; - }; - - titlestatus = buildPlugin rec { - pname = "TitleStatus"; - version = "0.0.4"; - - src = fetchFromGitHub { - owner = "MoonshineSG"; - repo = "OctoPrint-TitleStatus"; - rev = version; - sha256 = "1l78xrabn5hcly2mgxwi17nwgnp2s6jxi9iy4wnw8k8icv74ag7k"; - }; - - meta = with stdenv.lib; { - description = "Show printers status in window title"; - homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus"; - license = licenses.agpl3; - maintainers = with maintainers; [ abbradar ]; - }; - }; - - stlviewer = buildPlugin rec { - pname = "STLViewer"; - version = "0.4.2"; - - src = fetchFromGitHub { - owner = "jneilliii"; - repo = "OctoPrint-STLViewer"; - rev = version; - sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b"; - }; - - meta = with stdenv.lib; { - description = "A simple stl viewer tab for OctoPrint"; - homepage = "https://github.com/jneilliii/Octoprint-STLViewer"; - license = licenses.agpl3; - maintainers = with maintainers; [ abbradar ]; - }; - }; - - curaenginelegacy = buildPlugin rec { - pname = "CuraEngineLegacy"; - version = "1.0.2"; - - src = fetchFromGitHub { - owner = "OctoPrint"; - repo = "OctoPrint-${pname}"; - rev = version; - sha256 = "1cdb276wfyf3wcfj5g3migd6b6aqmkrxncrqjfcfx4j4k3xac965"; - }; - - meta = with stdenv.lib; { - description = "Plugin for slicing via Cura Legacy from within OctoPrint"; - homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy"; - license = licenses.agpl3; - maintainers = with maintainers; [ gebner ]; - }; - }; - - touchui = buildPlugin rec { - pname = "TouchUI"; - version = "0.3.13"; - - src = fetchFromGitHub { - owner = "BillyBlaze"; - repo = "OctoPrint-${pname}"; - rev = version; - sha256 = "0qk12ysabdzy6cna3l4f8v3qcnppppwxxsjx2i0xn1nd0cv6yzwh"; - }; - - meta = with stdenv.lib; { - description = "Touch friendly interface for a small TFT module or phone for OctoPrint"; - homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI"; - license = licenses.agpl3; - maintainers = with maintainers; [ gebner ]; - }; - }; - - psucontrol = buildPlugin rec { - pname = "PSUControl"; - version = "0.1.8"; - - src = fetchFromGitHub { - owner = "kantlivelong"; - repo = "OctoPrint-${pname}"; - rev = version; - sha256 = "0aj38d7b7d5pzmzq841pip18cpg18wy2vrxq2nd13875597y54b8"; - }; - - preConfigure = '' - # optional; RPi.GPIO is broken on vanilla kernels - sed /RPi.GPIO/d -i requirements.txt - ''; - - meta = with stdenv.lib; { - description = "OctoPrint plugin to control ATX/AUX power supply"; - homepage = "https://github.com/kantlivelong/OctoPrint-PSUControl"; - license = licenses.agpl3; - maintainers = with maintainers; [ gebner ]; - }; - }; - - printtimegenius = buildPlugin rec { - pname = "PrintTimeGenius"; - version = "2.2.1"; - - src = fetchFromGitHub { - owner = "eyal0"; - repo = "OctoPrint-${pname}"; - rev = version; - sha256 = "1dr93vbpxgxw3b1q4rwam8f4dmiwr5vnfr9796g6jx8xkpfzzy1h"; - }; - - preConfigure = '' - # PrintTimeGenius ships with marlin-calc binaries for multiple architectures - rm */analyzers/marlin-calc* - sed 's@"{}.{}".format(binary_base_name, machine)@"${marlin-calc}/bin/marlin-calc"@' -i */analyzers/analyze_progress.py - ''; - - patches = [ - ./printtimegenius-logging.patch - ]; - - meta = with stdenv.lib; { - description = "Better print time estimation for OctoPrint"; - homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius"; - license = licenses.agpl3; - maintainers = with maintainers; [ gebner ]; - }; - }; - - abl-expert = buildPlugin rec { - pname = "ABL_Expert"; - version = "2019-12-21"; - - src = fetchgit { - url = "https://framagit.org/razer/Octoprint_ABL_Expert/"; - rev = "f11fbe05088ad618bfd9d064ac3881faec223f33"; - sha256 = "026r4prkyvwzxag5pv36455q7s3gaig37nmr2nbvhwq3d2lbi5s4"; - }; - - meta = with stdenv.lib; { - description = "Marlin auto bed leveling control, mesh correction, and z probe handling"; - homepage = "https://framagit.org/razer/Octoprint_ABL_Expert/"; - license = licenses.agpl3; - maintainers = with maintainers; [ WhittlesJr ]; - }; - }; - - gcodeeditor = buildPlugin rec { - pname = "GcodeEditor"; - version = "0.2.6"; - - src = fetchFromGitHub { - owner = "ieatacid"; - repo = "OctoPrint-${pname}"; - rev = version; - sha256 = "0c6p78r3vd6ys3kld308pyln09zjbr9yif1ljvcx6wlml2i5l1vh"; - }; - - meta = with stdenv.lib; { - description = "Edit gcode on OctoPrint"; - homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop"; - license = licenses.agpl3; - maintainers = with maintainers; [ WhittlesJr ]; - }; - }; - - simpleemergencystop = buildPlugin rec { - pname = "SimpleEmergencyStop"; - version = "0.2.5"; - - src = fetchFromGitHub { - owner = "Sebclem"; - repo = "OctoPrint-${pname}"; - rev = version; - sha256 = "10wadv09wv2h96igvq3byw9hz1si82n3c7v5y0ii3j7hm2d06y8p"; - }; - - meta = with stdenv.lib; { - description = "A simple plugin that add an emergency stop buton on NavBar of OctoPrint"; - homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor"; - license = licenses.agpl3; - maintainers = with maintainers; [ WhittlesJr ]; - }; + meta = with stdenv.lib; { + description = "OctoPrint plugin for the Micro 3D printer"; + homepage = "https://github.com/donovan6000/M33-Fio"; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; }; }; -in self + mqtt = buildPlugin rec { + pname = "MQTT"; + version = "0.8.6"; + + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-MQTT"; + rev = version; + sha256 = "0y1jnfplcy8mh3szrfbbvngl02j49cbdizglrfsry4fvqg50zjxd"; + }; + + propagatedBuildInputs = with super; [ paho-mqtt ]; + + meta = with stdenv.lib; { + description = "Publish printer status MQTT"; + homepage = "https://github.com/OctoPrint/OctoPrint-MQTT"; + license = licenses.agpl3; + maintainers = with maintainers; [ peterhoeg ]; + }; + }; + + titlestatus = buildPlugin rec { + pname = "TitleStatus"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "MoonshineSG"; + repo = "OctoPrint-TitleStatus"; + rev = version; + sha256 = "1l78xrabn5hcly2mgxwi17nwgnp2s6jxi9iy4wnw8k8icv74ag7k"; + }; + + meta = with stdenv.lib; { + description = "Show printers status in window title"; + homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus"; + license = licenses.agpl3; + maintainers = with maintainers; [ abbradar ]; + }; + }; + + stlviewer = buildPlugin rec { + pname = "STLViewer"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "jneilliii"; + repo = "OctoPrint-STLViewer"; + rev = version; + sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b"; + }; + + meta = with stdenv.lib; { + description = "A simple stl viewer tab for OctoPrint"; + homepage = "https://github.com/jneilliii/Octoprint-STLViewer"; + license = licenses.agpl3; + maintainers = with maintainers; [ abbradar ]; + }; + }; + + curaenginelegacy = buildPlugin rec { + pname = "CuraEngineLegacy"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "1cdb276wfyf3wcfj5g3migd6b6aqmkrxncrqjfcfx4j4k3xac965"; + }; + + meta = with stdenv.lib; { + description = "Plugin for slicing via Cura Legacy from within OctoPrint"; + homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; + }; + }; + + touchui = buildPlugin rec { + pname = "TouchUI"; + version = "0.3.14"; + + src = fetchFromGitHub { + owner = "BillyBlaze"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "033b9nk3kpnmjw9nggcaxy39hcgfviykcy2cx0j6m411agvmqbzf"; + }; + + meta = with stdenv.lib; { + description = "Touch friendly interface for a small TFT module or phone for OctoPrint"; + homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; + }; + }; + + psucontrol = buildPlugin rec { + pname = "PSUControl"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "kantlivelong"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "1cn009bdgn6c9ba9an5wfj8z02wi0xcsmbhkqggiqlnqy1fq45ca"; + }; + + preConfigure = '' + # optional; RPi.GPIO is broken on vanilla kernels + sed /RPi.GPIO/d -i requirements.txt + ''; + + meta = with stdenv.lib; { + description = "OctoPrint plugin to control ATX/AUX power supply"; + homepage = "https://github.com/kantlivelong/OctoPrint-PSUControl"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; + }; + }; + + printtimegenius = buildPlugin rec { + pname = "PrintTimeGenius"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "eyal0"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "1dr93vbpxgxw3b1q4rwam8f4dmiwr5vnfr9796g6jx8xkpfzzy1h"; + }; + + preConfigure = '' + # PrintTimeGenius ships with marlin-calc binaries for multiple architectures + rm */analyzers/marlin-calc* + sed 's@"{}.{}".format(binary_base_name, machine)@"${pkgs.marlin-calc}/bin/marlin-calc"@' -i */analyzers/analyze_progress.py + ''; + + patches = [ + ./printtimegenius-logging.patch + ]; + + meta = with stdenv.lib; { + description = "Better print time estimation for OctoPrint"; + homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; + }; + }; + + abl-expert = buildPlugin rec { + pname = "ABL_Expert"; + version = "2019-12-21"; + + src = fetchgit { + url = "https://framagit.org/razer/Octoprint_ABL_Expert/"; + rev = "f11fbe05088ad618bfd9d064ac3881faec223f33"; + sha256 = "026r4prkyvwzxag5pv36455q7s3gaig37nmr2nbvhwq3d2lbi5s4"; + }; + + meta = with stdenv.lib; { + description = "Marlin auto bed leveling control, mesh correction, and z probe handling"; + homepage = "https://framagit.org/razer/Octoprint_ABL_Expert/"; + license = licenses.agpl3; + maintainers = with maintainers; [ WhittlesJr ]; + }; + }; + + gcodeeditor = buildPlugin rec { + pname = "GcodeEditor"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "ieatacid"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "0c6p78r3vd6ys3kld308pyln09zjbr9yif1ljvcx6wlml2i5l1vh"; + }; + + meta = with stdenv.lib; { + description = "Edit gcode on OctoPrint"; + homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor"; + license = licenses.agpl3; + maintainers = with maintainers; [ WhittlesJr ]; + }; + }; + + simpleemergencystop = buildPlugin rec { + pname = "SimpleEmergencyStop"; + version = "0.2.5"; + + src = fetchFromGitHub { + owner = "Sebclem"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "10wadv09wv2h96igvq3byw9hz1si82n3c7v5y0ii3j7hm2d06y8p"; + }; + + meta = with stdenv.lib; { + description = "A simple plugin that add an emergency stop buton on NavBar of OctoPrint"; + homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop"; + license = licenses.agpl3; + maintainers = with maintainers; [ WhittlesJr ]; + }; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/perkeep/default.nix b/third_party/nixpkgs/pkgs/applications/misc/perkeep/default.nix index 87a6bdf5e5..5a1e5ba65d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/perkeep/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/perkeep/default.nix @@ -13,13 +13,13 @@ let in buildGoPackage rec { name = "perkeep-${version}"; - version = "unstable-2019-07-29"; + version = "unstable-2020-03-23"; src = fetchFromGitHub { owner = "perkeep"; repo = "perkeep"; - rev = "c9f78d02adf9740f3b8d403a1418554293cc9f41"; - sha256 = "11rin94pjzg0kvizrq9ss42fjw7wfwx3g1pk8zdlhyfkiwwh2rmg"; + rev = "c2e31370ddefd86b6112a5d891100ea3382a4254"; + sha256 = "0jf02k20ms7h60wglcq6dj3vqi9rlfww7db5iplgwznbij70c1i4"; }; goPackagePath = "perkeep.org"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/playonlinux/default.nix b/third_party/nixpkgs/pkgs/applications/misc/playonlinux/default.nix index fe9838fe0d..e3b7c48d2b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/playonlinux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/playonlinux/default.nix @@ -9,7 +9,7 @@ , imagemagick , netcat-gnu , p7zip -, python2Packages +, python2 , unzip , wget , wine @@ -27,25 +27,25 @@ let version = "4.3.4"; - binpath = stdenv.lib.makeBinPath - [ cabextract - python2Packages.python - gettext - glxinfo - gnupg - icoutils - imagemagick - netcat-gnu - p7zip - unzip - wget - wine - xdg-user-dirs - xterm - which - curl - jq - ]; + binpath = stdenv.lib.makeBinPath [ + cabextract + python + gettext + glxinfo + gnupg + icoutils + imagemagick + netcat-gnu + p7zip + unzip + wget + wine + xdg-user-dirs + xterm + which + curl + jq + ]; ld32 = if stdenv.hostPlatform.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" @@ -54,6 +54,11 @@ let ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ]; + python = python2.withPackages(ps: with ps; [ + wxPython + setuptools + ]); + in stdenv.mkDerivation { pname = "playonlinux"; inherit version; @@ -65,15 +70,13 @@ in stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - buildInputs = - [ python2Packages.python - python2Packages.wxPython - python2Packages.setuptools - xorg.libX11 - libGL - ]; + buildInputs = [ + xorg.libX11 + libGL + python + ]; - patchPhase = '' + postPatch = '' patchShebangs python tests/python sed -i "s/ %F//g" etc/PlayOnLinux.desktop ''; @@ -85,7 +88,6 @@ in stdenv.mkDerivation { install -D -m644 etc/PlayOnLinux.desktop $out/share/applications/playonlinux.desktop makeWrapper $out/share/playonlinux/playonlinux $out/bin/playonlinux \ - --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \ --prefix PATH : ${binpath} bunzip2 $out/share/playonlinux/bin/check_dd_x86.bz2 diff --git a/third_party/nixpkgs/pkgs/applications/misc/qlandkartegt/garmindev.nix b/third_party/nixpkgs/pkgs/applications/misc/qlandkartegt/garmindev.nix index 2137808421..8705abd925 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qlandkartegt/garmindev.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qlandkartegt/garmindev.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libusb }: +{ stdenv, fetchurl, cmake, libusb-compat-0_1 }: stdenv.mkDerivation rec { pname = "garmindev"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/qlcplus/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qlcplus/default.nix index c0b844d121..77a24413bd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qlcplus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qlcplus/default.nix @@ -1,5 +1,5 @@ { stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, udev -, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb +, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb-compat-0_1 , libsndfile, libmad }: @@ -16,7 +16,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ - udev qtmultimedia qtscript alsaLib ola libftdi1 libusb libsndfile libmad + udev qtmultimedia qtscript alsaLib ola libftdi1 libusb-compat-0_1 libsndfile libmad ]; qmakeFlags = [ "INSTALLROOT=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/rescuetime/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rescuetime/default.nix index 13ae1f1ba7..9784e24187 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rescuetime/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rescuetime/default.nix @@ -5,15 +5,15 @@ let if stdenv.hostPlatform.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; - sha256 = "0mw8dh9z7pqan0yrhycmv39h5c1sc4mbw5l02cfnn17cy75xdiay"; + sha256 = "1yzbs2lg04bq0clkr6gfkx3j6wrahpnxqfiq4askk9k76y4ncd4m"; } else fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "1a6pc8vi2ab721kzyhvg6bmw24dr85dgmx2m9j9vbf3jyr85fv10"; + sha256 = "1njxsh601d0p6n0hxv44gcg8gd43xwym83xwqba26vj6xw82bknv"; }; in mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html - name = "rescuetime-2.14.5.2"; + name = "rescuetime-2.15.0.1"; inherit src; nativeBuildInputs = [ dpkg ]; # avoid https://github.com/NixOS/patchelf/issues/99 diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-file-browser/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi-file-browser/default.nix new file mode 100644 index 0000000000..10453b8584 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/rofi-file-browser/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, rofi, gtk3 }: + +stdenv.mkDerivation rec { + pname = "rofi-file-browser-extended"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "marvinkreis"; + repo = pname; + rev = version; + sha256 = "10wk5sif3bmvsgyk2gdy0qhpv1b37zgzf89n3h0yh7pg195fi2gn"; + fetchSubmodules = true; + }; + + prePatch = '' + substituteInPlace ./CMakeLists.txt \ + --replace ' ''${ROFI_PLUGINS_DIR}' " $out/lib/rofi" \ + --replace "/usr/share/" "$out/share/" + ''; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ rofi gtk3 ]; + + ROFI_PLUGINS_DIR = "$out/lib/rofi"; + + dontUseCmakeBuildDir = true; + + meta = with stdenv.lib; { + description = "Use rofi to quickly open files"; + homepage = "https://github.com/marvinkreis/rofi-file-browser-extended"; + license = licenses.mit; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/st/default.nix b/third_party/nixpkgs/pkgs/applications/misc/st/default.nix index 33924bdb7b..018fd9306a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/st/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/st/default.nix @@ -4,18 +4,17 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "st-0.8.2"; + name = "st-0.8.3"; src = fetchurl { url = "https://dl.suckless.org/st/${name}.tar.gz"; - sha256 = "0ddz2mdp1c7q67rd5vrvws9r0493ln0mlqyc3d73dv8im884xdxf"; + sha256 = "0ll5wbw1szs70wdf8zy1y2ig5mfbqw2w4ls8d64r8z3y4gdf76lk"; }; inherit patches; - prePatch = optionalString (conf != null) '' - cp ${writeText "config.def.h" conf} config.def.h - ''; + configFile = optionalString (conf!=null) (writeText "config.def.h" conf); + postPatch = optionalString (conf!=null) "cp ${configFile} config.def.h"; nativeBuildInputs = [ pkgconfig ncurses ]; buildInputs = [ libX11 libXft ] ++ extraLibs; diff --git a/third_party/nixpkgs/pkgs/applications/misc/subsurface/default.nix b/third_party/nixpkgs/pkgs/applications/misc/subsurface/default.nix index d262fb74c4..e189351022 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/subsurface/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/subsurface/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkgconfig, qmake -, curl, grantlee, libgit2, libusb, libssh2, libxml2, libxslt, libzip, zlib +, curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib , qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite }: @@ -83,7 +83,7 @@ in stdenv.mkDerivation { buildInputs = [ libdc googlemaps - curl grantlee libgit2 libssh2 libusb libxml2 libxslt libzip + curl grantlee libgit2 libssh2 libusb-compat-0_1 libxml2 libxslt libzip qtbase qtconnectivity qtsvg qttools qtwebkit ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/terminator/default.nix b/third_party/nixpkgs/pkgs/applications/misc/terminator/default.nix index ea73d5cbb6..5de8109e3a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/terminator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/terminator/default.nix @@ -1,28 +1,64 @@ -{ stdenv, fetchurl, python2, keybinder3, intltool, file, gtk3, gobject-introspection -, libnotify, wrapGAppsHook, vte +{ stdenv +, fetchFromGitHub +, python3 +, keybinder3 +, intltool +, file +, gtk3 +, gobject-introspection +, libnotify +, wrapGAppsHook +, vte }: -python2.pkgs.buildPythonApplication rec { - name = "terminator-${version}"; - version = "1.91"; +python3.pkgs.buildPythonApplication rec { + pname = "terminator"; + version = "1.92"; - src = fetchurl { - url = "https://launchpad.net/terminator/gtk3/${version}/+download/${name}.tar.gz"; - sha256 = "95f76e3c0253956d19ceab2f8da709a496f1b9cf9b1c5b8d3cd0b6da3cc7be69"; + src = fetchFromGitHub { + owner = "gnome-terminator"; + repo = "terminator"; + rev = "v${version}"; + sha256 = "105f660wzf9cpn24xzwaaa09igg5h3qhchafv190v5nqck6g1ssh"; }; - nativeBuildInputs = [ file intltool wrapGAppsHook gobject-introspection ]; - buildInputs = [ gtk3 vte libnotify keybinder3 - gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 + nativeBuildInputs = [ + file + intltool + gobject-introspection + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 + keybinder3 + libnotify + python3 + vte + ]; + + propagatedBuildInputs = with python3.pkgs; [ + configobj + dbus-python + pygobject3 + psutil + pycairo ]; - propagatedBuildInputs = with python2.pkgs; [ pygobject3 psutil pycairo ]; postPatch = '' - patchShebangs . + patchShebangs run_tests tests po + # dbus-python is correctly passed in propagatedBuildInputs, but for some reason setup.py complains. + # The wrapped terminator has the correct path added, so ignore this. + substituteInPlace setup.py --replace "'dbus-python'," "" ''; checkPhase = '' + runHook preCheck + ./run_tests + + runHook postCheck ''; meta = with stdenv.lib; { @@ -33,7 +69,7 @@ python2.pkgs.buildPythonApplication rec { quadkonsole, etc. in that the main focus is arranging terminals in grids (tabs is the most common default method, which Terminator also supports). ''; - homepage = "https://gnometerminator.blogspot.no/p/introduction.html"; + homepage = "https://github.com/gnome-terminator/terminator"; license = licenses.gpl2; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tuir/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tuir/default.nix index e479dc26f1..11bf70cb56 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tuir/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tuir/default.nix @@ -3,13 +3,13 @@ with python3Packages; buildPythonApplication rec { pname = "tuir"; - version = "1.28.3"; + version = "1.29.0"; src = fetchFromGitLab { owner = "ajak"; repo = pname; rev = "v${version}"; - sha256 = "0nhpbb0vdngwb0fhlimjgm3wq2s67m4rb3vv920zyllnmfplk0lk"; + sha256 = "1fqp6bvq8kzdsf3nna4mn1phdcixpx76bya43xrivxjbzsfl59ib"; }; # Tests try to access network diff --git a/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix index 586766e545..e9b09d68da 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "tut"; - version = "0.0.2"; + version = "0.0.7"; goPackagePath = "github.com/RasmusLindroth/tut"; goDeps = ./deps.nix; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "0c44mgkmjnfpf06cj63i6mscxcsm5cipm0l4n6pjxhc7k3qhgsfw"; + sha256 = "1v1cvdsrxz1yj2vibx3iapw17ngfihjkr62zhxsn1msb77xyd7lb"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/tut/deps.nix b/third_party/nixpkgs/pkgs/applications/misc/tut/deps.nix index 89453f121a..9264153e50 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tut/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tut/deps.nix @@ -72,6 +72,15 @@ sha256 = "1csg9qkmbg4ksj5247kgqcy7bxvqgz6b98r0rv2s4c1mkc99gx2r"; }; } + { + goPackagePath = "github.com/gopherjs/gopherjs"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/gopherjs"; + rev = "0766667cb4d1"; + sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw"; + }; + } { goPackagePath = "github.com/gorilla/websocket"; fetch = { @@ -81,6 +90,15 @@ sha256 = "03n1n0nwz3k9qshmriycqznnnvd3dkzsfwpnfjzzvafjxk9kyapv"; }; } + { + goPackagePath = "github.com/jtolds/gls"; + fetch = { + type = "git"; + url = "https://github.com/jtolds/gls"; + rev = "v4.20.0"; + sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"; + }; + } { goPackagePath = "github.com/kyoh86/xdg"; fetch = { @@ -158,8 +176,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "v1.6.0"; - sha256 = "0l2830pi64fg0bdsyd5afkbw0p7879pppzdqqk3c7vjrjfmi5xbq"; + rev = "v1.7.0"; + sha256 = "0sqrwldjj2qxrgjz1diw1ffviya4ma7mz7nhdgydbisi2h55lqla"; }; } { @@ -167,8 +185,8 @@ fetch = { type = "git"; url = "https://github.com/rivo/tview"; - rev = "cd38d7432498"; - sha256 = "1rs048gf1jip0p20qir99vy5k0f3m54h7bh56l1sh8lxij5qj406"; + rev = "ca37f83cb2e7"; + sha256 = "05nifgrxv6aib8f20mhs9m0grdfdyyg5vyhk6zgwsxjlwbzaj021"; }; } { @@ -180,6 +198,24 @@ sha256 = "0flpc1px1l6b1lxzhdxi0mvpkkjchppvgxshxxnlmm40s76i9ww5"; }; } + { + goPackagePath = "github.com/smartystreets/assertions"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/assertions"; + rev = "b2de0cb4f26d"; + sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y"; + }; + } + { + goPackagePath = "github.com/smartystreets/goconvey"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/goconvey"; + rev = "v1.6.4"; + sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m"; + }; + } { goPackagePath = "github.com/tomnomnom/linkheader"; fetch = { @@ -212,8 +248,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "118fecf932d8"; - sha256 = "1rwrqfwh2yhnnhy7x0mbmlmk0rg1mi2jjad476y45i259a0c2ym6"; + rev = "d3edc9973b7e"; + sha256 = "12zbjwcsh9b0lwycqlkrnbyg5a6a9dzgj8hhgq399bdda5bd97y7"; }; } { @@ -230,8 +266,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "12a6c2dcc1e4"; - sha256 = "0z1g49d36kh459dz0xhnss2f88vw7n5b3l3637v46f7daddvln67"; + rev = "85ca7c5b95cd"; + sha256 = "1504qkgbhhm4f0bhk77v2r1lj6x171ay5m79alkg78wjb5cign5l"; }; } { @@ -248,8 +284,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "90fa682c2a6e"; - sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak"; + rev = "ab21143f2384"; + sha256 = "15fk0psk53pplpyghz55bhay0kvsv5rikmn5hwgjnnyxq9vfy178"; }; } { @@ -261,13 +297,22 @@ sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; }; } + { + goPackagePath = "gopkg.in/ini.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/ini.v1"; + rev = "v1.55.0"; + sha256 = "1b7wsfal3b3pl5pv5n2qix09b3imh0zhirrphlsg5p2rb8fk0d0j"; + }; + } { goPackagePath = "gopkg.in/yaml.v2"; fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.4"; - sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2"; + rev = "v2.2.8"; + sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; }; } ] diff --git a/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix index 12780ca73a..e557c5081c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "0pybj2h844x9vncwdcaymihyd1mwdnxxpnzpq0p29ra0cwmsxcgr"; + sha256 = "0v6yafpz3sycq6yb7w4dyxqclszvdgwbyhqs5ii8ckynqcf6ifn7"; }; - modSha256 = "00xvhajag25kfkizi2spv4ady3h06as43rnbjzfbv7z1mln844y4"; + modSha256 = "0csxc5q7i2iq8z71ysfan2kwf4mghi89i5zja5g1a4cvmcabiq1g"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; 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 index 77505b47d8..40ddafd254 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1s16wl101yabq0l7w0q50lxkr2gn090pcaj6l5sj6g5xvi9lhgbf"; - sha256bin64 = "0k6fsqlpiwp9vds83hb3cg9xf74hqgbfdm3ijyad2rmwc5rqk0ax"; - version = "83.0.4103.14"; + sha256 = "1s3flhzp69g62285r9nwc5m9fa65ldx19inwdm4nq1m5bn63v6lj"; + sha256bin64 = "0xbbj89xx98vvw1a4l4wj7hhwjasdmkxbbkgaad2cj4zqmbb8h52"; + version = "83.0.4103.23"; }; dev = { - sha256 = "0djppzwzpfyyfjb1mhy5wws2379m3wpzyk2x3kw5nd0mdz35hbny"; - sha256bin64 = "1wg55qhfvd5zvigjl6496za81mh9b2c5da53zy07bk8wj91ly8pf"; - version = "84.0.4115.5"; + sha256 = "1jgx55sb3azwb2rni89yxlz94j264iilwh0br29sngcailxamrbd"; + sha256bin64 = "107yndkcdb78zxpswn9aja63n0q4q5q49183058z5jm4zlplkgad"; + version = "84.0.4122.7"; }; stable = { - sha256 = "0ahqh3vmzbpai4xwn7qybgw9phc8ssjdvfc7384mxqk9swqgv7qg"; - sha256bin64 = "0gpgim244594m35qwf625blwdqgjbp4qr846wq75a9a9zqwqs05w"; - version = "81.0.4044.122"; + sha256 = "1ls663s1f74p912x42qp3zcvm17kmjiv1ij6yy1c14gdhcpmjx7z"; + sha256bin64 = "0nzds27x1j3298cq5xkgikjdddymbw88gcpnlm03492b6090257y"; + version = "81.0.4044.129"; }; } 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 7c010b91a1..b22a35bc54 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,25 +1,28 @@ -{ stdenv, fetchFromGitHub, makeDesktopItem +{ stdenv, lib, fetchgit, makeDesktopItem , pkgconfig, autoconf213, alsaLib, bzip2, cairo , dbus, dbus-glib, ffmpeg, file, fontconfig, freetype , gnome2, gnum4, gtk2, hunspell, libevent, libjpeg , libnotify, libstartup_notification, makeWrapper -, libGLU, libGL, perl, python, libpulseaudio +, libGLU, libGL, perl, python2, libpulseaudio , unzip, xorg, wget, which, yasm, zip, zlib + +, withGTK3 ? false, gtk3 }: let - libPath = stdenv.lib.makeLibraryPath [ ffmpeg ]; + libPath = lib.makeLibraryPath [ ffmpeg ]; + gtkVersion = if withGTK3 then "3" else "2"; in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.8.4"; + version = "28.9.1"; - src = fetchFromGitHub { - owner = "MoonchildProductions"; - repo = "UXP"; - rev = "PM${version}_Release"; - sha256 = "1k2j4rlgjwkns3a592pbiwwhrpja3fachvzby1his3d1mhdvyc6f"; + src = fetchgit { + url = "https://github.com/MoonchildProductions/Pale-Moon.git"; + rev = "${version}_Release"; + sha256 = "1772by9r9l1l0wmj4hs89r3zyckcbrq1krb09bn3pxvjjywzvkfl"; + fetchSubmodules = true; }; desktopItem = makeDesktopItem { @@ -29,7 +32,7 @@ in stdenv.mkDerivation rec { desktopName = "Pale Moon"; genericName = "Web Browser"; categories = "Application;Network;WebBrowser;"; - mimeType = stdenv.lib.concatStringsSep ";" [ + mimeType = lib.concatStringsSep ";" [ "text/html" "text/xml" "application/xhtml+xml" @@ -40,60 +43,75 @@ in stdenv.mkDerivation rec { ]; }; + nativeBuildInputs = [ + file gnum4 makeWrapper perl pkgconfig python2 wget which + ]; + buildInputs = [ - alsaLib bzip2 cairo dbus dbus-glib ffmpeg file fontconfig freetype - gnome2.GConf gnum4 gtk2 hunspell libevent libjpeg libnotify - libstartup_notification makeWrapper libGLU libGL perl - pkgconfig python libpulseaudio unzip wget which yasm zip zlib - ] ++ (with xorg; [ + alsaLib bzip2 cairo dbus dbus-glib ffmpeg fontconfig freetype + gnome2.GConf gtk2 hunspell libevent libjpeg libnotify + libstartup_notification libGLU libGL + libpulseaudio unzip yasm zip zlib + ] + ++ (with xorg; [ libX11 libXext libXft libXi libXrender libXScrnSaver libXt pixman xorgproto - ]); + ]) + ++ lib.optional withGTK3 gtk3; enableParallelBuilding = true; configurePhase = '' - export MOZBUILD_STATE_PATH=$(pwd)/mozbuild export MOZCONFIG=$(pwd)/mozconfig export MOZ_NOSPAM=1 - export builddir=$(pwd)/pmbuild - echo > $MOZCONFIG " - mk_add_options AUTOCLOBBER=1 - mk_add_options MOZ_OBJDIR=$builddir + # Keep this similar to the official .mozconfig file, + # only minor changes for portability are permitted with branding. + # https://developer.palemoon.org/build/linux/ + echo > $MOZCONFIG ' + # Clear this if not a 64bit build + _BUILD_64=${lib.optionalString stdenv.hostPlatform.is64bit "1"} + + # Set GTK Version to 2 or 3 + _GTK_VERSION=${gtkVersion} + + # Standard build options for Pale Moon ac_add_options --enable-application=palemoon + ac_add_options --enable-optimize="-O2 -w" + ac_add_options --enable-default-toolkit=cairo-gtk$_GTK_VERSION + ac_add_options --enable-jemalloc + ac_add_options --enable-strip + ac_add_options --enable-devtools - ac_add_options --enable-optimize='-O2' + ac_add_options --disable-eme + ac_add_options --disable-webrtc + ac_add_options --disable-gamepad + ac_add_options --disable-tests + 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 - ac_add_options --enable-default-toolkit=cairo-gtk2 - ac_add_options --enable-jemalloc - ac_add_options --enable-strip - ac_add_options --with-pthreads + ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]} - ac_add_options --disable-tests - ac_add_options --disable-eme - ac_add_options --disable-parental-controls - ac_add_options --disable-accessibility - ac_add_options --disable-webrtc - ac_add_options --disable-gamepad - ac_add_options --disable-necko-wifi - ac_add_options --disable-updater + export MOZ_PKG_SPECIAL=gtk$_GTK_VERSION - ac_add_options --x-libraries=${xorg.libX11.out}/lib + # + # NixOS-specific adjustments + # ac_add_options --prefix=$out - mk_add_options MOZ_MAKE_FLAGS='-j$NIX_BUILD_CORES' + + mk_add_options MOZ_MAKE_FLAGS="-j$NIX_BUILD_CORES" mk_add_options AUTOCONF=${autoconf213}/bin/autoconf - " + ' ''; - buildPhase = '' - $src/mach build - ''; + buildPhase = "$src/mach build"; installPhase = '' $src/mach install @@ -104,7 +122,7 @@ in stdenv.mkDerivation rec { for n in 16 22 24 32 48 256; do size=$n"x"$n mkdir -p $out/share/icons/hicolor/$size/apps - cp $src/application/palemoon/branding/official/default$n.png \ + cp $src/palemoon/branding/official/default$n.png \ $out/share/icons/hicolor/$size/apps/palemoon.png done @@ -112,7 +130,7 @@ in stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${libPath}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An Open Source, Goanna-based web browser focusing on efficiency and customization"; longDescription = '' Pale Moon is an Open Source, Goanna-based web browser focusing on 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 537bb0ebf2..d75be65c19 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -21,12 +21,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.10.1"; + version = "1.11.0"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "06bcnsfb4kz92bh8xjxwaghhy9x2mmcb76wk3fv868jb1ga75vd8"; + sha256 = "0b0qlki9bp9mm41lrh6rc6qqvm4nsz8da63sby3a1f2xm9b9vvg2"; }; # Needs tox 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 d07da2b3b0..25ee5462b2 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 @@ -24,8 +24,13 @@ , libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone # package customization -, useVaapi ? false , useOzone ? false +, useVaapi ? !(useOzone || stdenv.isAarch64) # Built if supported, but disabled in the wrapper +# VA-API TODOs: +# - Ozone: M81 fails to build due to "ozone_platform_gbm = false" +# - Possible solutions: Write a patch to fix the build (wrong gn dependencies) +# or build with minigbm +# - AArch64: Causes serious regressions (https://github.com/NixOS/nixpkgs/pull/85253#issuecomment-614405879) , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true @@ -134,10 +139,10 @@ let libXScrnSaver libXcursor libXtst libGLU libGL pciutils protobuf speechd libXdamage at-spi2-core jre - ] ++ optional gnomeKeyringSupport libgnome-keyring3 + ] ++ optional useVaapi libva + ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional useVaapi libva ++ optional pulseSupport libpulseaudio ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; @@ -156,9 +161,9 @@ let # # ++ optionals (channel == "dev") [ ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) ] # ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) - ] ++ optionals (useVaapi) ([ - # source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi - ./patches/vaapi-fix.patch + ] ++ optionals (useVaapi) ([ # Fixes 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) ] ++ optionals (versionRange "81" "82") [ (githubPatch "5b2ff215473e0526b5b24aeff4ad90d369b21c75" "0n00vh8wfpn2ay5fqsxcsx0zadnv7mihm72bcvnrfzh75nzbg902") (githubPatch "98e343ab369e4262511b5fce547728e3e5eefba8" "00wwp653jk0k0yvix00vr7ymgck9dj7fxjwx4nc67ynn84dh6064") 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 f172e7c09c..9d6c7fada7 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 @@ -6,14 +6,16 @@ , lib # package customization +# Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) , channel ? "stable" , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false , proprietaryCodecs ? true , enablePepperFlash ? false , enableWideVine ? false +, useVaapi ? false # Deprecated, use enableVaapi instead! +, enableVaapi ? false # Disabled by default due to unofficial support and issues on radeon , ungoogled ? true -, useVaapi ? false # test video on radeon, before enabling this , useOzone ? false , cupsSupport ? true , pulseSupport ? config.pulseaudio or stdenv.isLinux @@ -21,7 +23,7 @@ }: let - llvmPackages = if channel == "dev" + llvmPackages = if channel != "stable" then llvmPackages_10 else llvmPackages_9; stdenv = llvmPackages.stdenv; @@ -34,9 +36,10 @@ let upstream-info = (callPackage ./update.nix {}).getChannel channel; mkChromiumDerivation = callPackage ./common.nix ({ - inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi useOzone ungoogled; + inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone; + inherit ungoogled; gnChromium = gn; - } // lib.optionalAttrs (channel == "dev") { + } // lib.optionalAttrs (channel != "stable") { # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-03-23"; @@ -130,6 +133,14 @@ let cp -a ${widevineCdm}/WidevineCdm $out/libexec/chromium/ '' else browser; + + optionalVaapiFlags = if useVaapi # TODO: Remove after 20.09: + then throw '' + Chromium's useVaapi was replaced by enableVaapi and you don't need to pass + "--ignore-gpu-blacklist" anymore (also no rebuilds are required anymore). + '' else lib.optionalString + (!enableVaapi) + "--add-flags --disable-accelerated-video-decode --add-flags --disable-accelerated-video-encode"; in stdenv.mkDerivation { name = "chromium${suffix}-${version}"; inherit version; @@ -149,15 +160,14 @@ in stdenv.mkDerivation { buildCommand = let browserBinary = "${chromiumWV}/libexec/chromium/chromium"; getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; - libPath = stdenv.lib.makeLibraryPath ([] - ++ stdenv.lib.optional useVaapi libva - ); + libPath = stdenv.lib.makeLibraryPath [ libva ]; in with stdenv.lib; '' mkdir -p "$out/bin" eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ + ${optionalVaapiFlags} \ ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} ed -v -s "$out/bin/chromium" << EOF diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/vaapi-fix.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/vaapi-fix.patch rename to third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch new file mode 100644 index 0000000000..bd278633f6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch @@ -0,0 +1,48 @@ +From b2144fd28e09cd52e7a88a62a9d9b54cf9922f9f Mon Sep 17 00:00:00 2001 +From: Michael Weiss +Date: Tue, 14 Apr 2020 14:16:10 +0200 +Subject: [PATCH] Enable accelerated video decode on Linux + +This will enable accelerated video decode on Linux by default (i.e. +without "--ignore-gpu-blacklist"), but on NixOS we'll provide +"--disable-accelerated-video-decode" and +"--disable-accelerated-video-encode" by default to avoid regressions +(e.g. VA-API doesn't work properly for some radeon drivers). + +Video acceleration can then be enabled via: +chromium.override { enableVaapi = true; } +without rebuilding Chromium. +--- + gpu/config/software_rendering_list.json | 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json +index 22712bdbf38f..a06dd19a50e4 100644 +--- a/gpu/config/software_rendering_list.json ++++ b/gpu/config/software_rendering_list.json +@@ -336,22 +336,6 @@ + ] + }, + { +- "id": 48, +- "description": "Accelerated video decode is unavailable on Linux", +- "cr_bugs": [137247, 1032907], +- "os": { +- "type": "linux" +- }, +- "exceptions": [ +- { +- "machine_model_name": ["Chromecast"] +- } +- ], +- "features": [ +- "accelerated_video_decode" +- ] +- }, +- { + "id": 50, + "description": "Disable VMware software renderer on older Mesa", + "cr_bugs": [145531, 332596, 571899, 629434], +-- +2.11.0 + 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 434bd77b6d..1dd9baa628 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 @@ -45,11 +45,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.344"; + version = "32.0.0.363"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "05ijlgsby9zxx0qs6f3vav1z0p6xr1cg6idl4akxvfmsl6hn6hkq"; + sha256 = "0znk8an892mykgbz56hyv3gz65vc9mhb3vn96c6bsvicwl1fn460"; 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 9b5c76f534..f6f3c06e93 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 @@ { - "81.0.4044.92" = { - rev = "81.0.4044.92-2"; - sha256 = "071a33idn2zcix6z8skn7y85mhb9w5s0bh0fvrjm269y7cmjrh3l"; + "81.0.4044.122" = { + rev = "81.0.4044.122-2"; + sha256 = "0bbr4a2gkgm3ykdgpj8x58sd3dwam6qkifhzfs2997681g7b2v2q"; }; } 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 index c5f9d60122..77505b47d8 100644 --- 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 @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2"; - sha256bin64 = "1y70kmfz9nv507b0zdda7zfk2ac9qh9m2gq00aphdmzd0al7skj8"; - version = "81.0.4044.92"; + sha256 = "1s16wl101yabq0l7w0q50lxkr2gn090pcaj6l5sj6g5xvi9lhgbf"; + sha256bin64 = "0k6fsqlpiwp9vds83hb3cg9xf74hqgbfdm3ijyad2rmwc5rqk0ax"; + version = "83.0.4103.14"; }; dev = { - sha256 = "1rydvjmv62zj95sf0fgsyipqz2hphbxm60y8q0813wq9ym35d4yy"; - sha256bin64 = "1m6740lw7xjjp1lplwp9ii4d3l7dfa9jrv5bysm4ar5pb9kywrai"; - version = "83.0.4100.3"; + sha256 = "0djppzwzpfyyfjb1mhy5wws2379m3wpzyk2x3kw5nd0mdz35hbny"; + sha256bin64 = "1wg55qhfvd5zvigjl6496za81mh9b2c5da53zy07bk8wj91ly8pf"; + version = "84.0.4115.5"; }; stable = { - sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2"; - sha256bin64 = "1ig899cpahw1xfhdff5xj6w4k8jja5smxvrcbw6b0jcjmawdrf72"; - version = "81.0.4044.92"; + sha256 = "0ahqh3vmzbpai4xwn7qybgw9phc8ssjdvfc7384mxqk9swqgv7qg"; + sha256bin64 = "0gpgim244594m35qwf625blwdqgjbp4qr846wq75a9a9zqwqs05w"; + version = "81.0.4044.122"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix index 3210842603..a801a12237 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "machine"; @@ -14,13 +14,13 @@ buildGoPackage rec { sha256 = "0xxzxi5v7ji9j2k7kxhi0ah91lfa7b9rg3nywgx0lkv8dlgp8kmy"; }; - postInstall = '' - mkdir -p \ - $bin/share/bash-completion/completions/ \ - $bin/share/zsh/site-functions/ + nativeBuildInputs = [ installShellFiles ]; - cp go/src/github.com/docker/machine/contrib/completion/bash/* $bin/share/bash-completion/completions/ - cp go/src/github.com/docker/machine/contrib/completion/zsh/* $bin/share/zsh/site-functions/ + postInstall = '' + pushd go/src/${goPackagePath}/contrib/completion + installShellCompletion --bash bash/* + installShellCompletion --zsh zsh/* + popd ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix index ba3b1e4d88..ec5a79e9ac 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix @@ -1,19 +1,20 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath preBuild; + inherit (minikube) version src nativeBuildInputs buildInputs modSha256 commit; pname = "docker-machine-hyperkit"; - subPackages = [ "cmd/drivers/hyperkit" ]; - modSha256 = minikube.go-modules.outputHash; + buildPhase = '' + make docker-machine-driver-hyperkit COMMIT=${commit} + ''; - postInstall = '' - mv $out/bin/hyperkit $out/bin/docker-machine-driver-hyperkit + installPhase = '' + install out/docker-machine-driver-hyperkit -Dt $out/bin ''; meta = with lib; { - homepage = "https://github.com/kubernetes/minikube/blob/master/docs/drivers.md"; + homepage = "https://minikube.sigs.k8s.io/docs/drivers/hyperkit"; description = "HyperKit driver for docker-machine."; license = licenses.asl20; maintainers = with maintainers; [ atkinschang ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index 6659b18b1b..6af1bf126b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -1,22 +1,27 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath preBuild; + inherit (minikube) version src nativeBuildInputs buildInputs modSha256 commit; pname = "docker-machine-kvm2"; - subPackages = [ "cmd/drivers/kvm" ]; - modSha256 = minikube.go-modules.outputHash; + postPatch = '' + sed -i '/GOARCH=$*/d' Makefile + ''; - postInstall = '' - mv $out/bin/kvm $out/bin/docker-machine-driver-kvm2 + buildPhase = '' + make docker-machine-driver-kvm2 COMMIT=${commit} + ''; + + installPhase = '' + install out/docker-machine-driver-kvm2 -Dt $out/bin ''; meta = with lib; { - homepage = "https://github.com/kubernetes/minikube/blob/master/docs/drivers.md"; + homepage = "https://minikube.sigs.k8s.io/docs/drivers/kvm2"; description = "KVM2 driver for docker-machine."; license = licenses.asl20; maintainers = with maintainers; [ tadfisher atkinschang ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } 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 0eac175a17..deb6d75f12 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.1.3"; + version = "3.2.0"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "1j6pr1a9ff32bnjq9rncllmfpraip5r2fj3zsljw5jq68x5wamdc"; + sha256 = "1x05xnc3czk7vpn9qnfdavdjy5agv800nh7jyqczpiw125l9jfyd"; }; - modSha256 = "0618zzi4x37ahsrazsr82anghhfva8yaryzb3p5d737p3ixbiyv8"; + modSha256 = "000knqwsajlqika4abp3fh721mn1vykcsnv3c1qw0mzffkmzwsqd"; subPackages = [ "cmd/helm" ]; buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ]; 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 index 21f4011f07..aa86dcbeb2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/heptio-ark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/heptio-ark/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "18h9hvp95va0hyl268gnzciwy1dqmc57bpifbj885870rdfp0ffv"; }; - postInstall = "rm $bin/bin/issue-template-gen"; + excludedPackages = [ "issue-template-gen" ]; meta = with stdenv.lib; { description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; 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 1cf76e1cff..a51d1afb36 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.18.1"; + version = "0.19.4"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "0a5x4yamvx2qlwngfvainbhplwp0hqwgvdqlj2jbrbz4hfhr1l59"; + sha256 = "1ya3lrw31pxd1rxzf88l5hzilaxwrng1a3ibawgn57my333hrmf6"; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - modSha256 = "0wpf6iyq6p3a8azdkn17gdp01wq9khyzr1bab6qgvsnsnhnjzcky"; + modSha256 = "11jxyzajlk6b5j19sg1kjr7qdzpxkwjwrvyhx9mwy6jb5sgqbzv8"; meta = with stdenv.lib; { description = "Kubernetes CLI To Manage Your Clusters In Style."; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kompose/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kompose/default.nix index 09a69f4b80..2467ed93b3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kompose/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kompose/default.nix @@ -15,9 +15,10 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - $bin/bin/kompose completion bash > kompose.bash - $bin/bin/kompose completion zsh > kompose.zsh - installShellCompletion kompose.{bash,zsh} + for shell in bash zsh; do + $bin/bin/kompose completion $shell > kompose.$shell + installShellCompletion kompose.$shell + done ''; meta = with lib; { 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 a5f1806e57..b4983a602e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata, installShellFiles }: let goPackagePath = "k8s.io/kops"; @@ -18,7 +18,7 @@ let inherit sha256; }; - nativeBuildInputs = [ go-bindata ]; + nativeBuildInputs = [ go-bindata installShellFiles ]; subPackages = [ "cmd/kops" ]; buildFlagsArray = '' @@ -33,10 +33,10 @@ let ''; postInstall = '' - mkdir -p $bin/share/bash-completion/completions - mkdir -p $bin/share/zsh/site-functions - $bin/bin/kops completion bash > $bin/share/bash-completion/completions/kops - $bin/bin/kops completion zsh > $bin/share/zsh/site-functions/_kops + for shell in bash zsh; do + $bin/bin/kops completion $shell > kops.$shell + installShellCompletion kops.$shell + done ''; meta = with stdenv.lib; { @@ -51,28 +51,13 @@ in rec { mkKops = generic; - kops_1_12 = mkKops { - version = "1.12.3"; - sha256 = "0rpbaz54l5v1z7ab5kpxcb4jyakkl5ysgz1sxajqmw2d6dvf7xly"; - }; - - kops_1_13 = mkKops { - version = "1.13.2"; - sha256 = "0lkkg34vn020r62ga8vg5d3a8jwvq00xlv3p1s01nkz33f6salng"; - }; - - kops_1_14 = mkKops { - version = "1.14.1"; - sha256 = "0ikd8qwrjh8s1sc95g18sm0q6p33swz2m1rjd8zw34mb2w9jv76n"; - }; - kops_1_15 = mkKops { version = "1.15.2"; sha256 = "1sjfd7pfi81ccq1dkgkh9xx6y94bqzlp727pvyf7l01x3d14z2b3"; }; kops_1_16 = mkKops { - version = "1.16.0"; - sha256 = "1b2lzf6b29rs5imbpqp8gnp3b511lk7jrm2f62y32gmx0gyjws6a"; + version = "1.16.1"; + sha256 = "04ji1703z6b3rd4wmccah68api0jj2bndzkgdzqi855gccqbmi5g"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernix/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernix/default.nix new file mode 100644 index 0000000000..2251b12e49 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernix/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "kubernix"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "saschagrunert"; + repo = pname; + rev = "v${version}"; + sha256 = "04dzfdzjwcwwaw9min322g30q0saxpq5kqzld4f22fmk820ki6gp"; + }; + + cargoSha256 = "17agwqx7nhzi124yq1s6zpqb227drrhp9c11r3jbicc08dz88bwg"; + doCheck = false; + + meta = with stdenv.lib; { + description = "Single dependency Kubernetes clusters for local testing, experimenting and development"; + homepage = "https://github.com/saschagrunert/kubernix"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ saschagrunert ]; + platforms = platforms.linux; + }; +} 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 d48a28f46a..9c5727ec73 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -1,67 +1,56 @@ { stdenv , buildGoModule , fetchFromGitHub -, pkgconfig -, makeWrapper , go-bindata +, installShellFiles +, pkg-config +, which , libvirt , vmnet }: buildGoModule rec { - pname = "minikube"; + pname = "minikube"; version = "1.9.2"; - # for -ldflags - commit = "1b78a7b8a99ad6a3c62b8d22f57120d614d17935"; - goPackagePath = "k8s.io/minikube"; - subPackages = [ "cmd/minikube" ]; - modSha256 = "1pxs6myszgma3rzz0nhfjbnylv6m0xzlinvmlg0c4ijvkkzxg3v5"; + # for -ldflags + commit = "1b78a7b8a99ad6a3c62b8d22f57120d614d17935"; + + modSha256 = "1pxs6myszgma3rzz0nhfjbnylv6m0xzlinvmlg0c4ijvkkzxg3v5"; src = fetchFromGitHub { - owner = "kubernetes"; - repo = "minikube"; - rev = "v${version}"; + owner = "kubernetes"; + repo = "minikube"; + rev = "v${version}"; sha256 = "025v45427d885qkjjg7ig8fgrvjalnf1lajsj0cnbwbih2m69svg"; }; - nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ libvirt ] - ++ stdenv.lib.optionals stdenv.isDarwin [ vmnet ]; + nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; - preBuild = '' - go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/... - go-bindata -nomemcopy -o pkg/minikube/translate/translations.go -pkg translate translations/... + buildInputs = if stdenv.isDarwin then [ vmnet ] else if stdenv.isLinux then [ libvirt ] else null; - VERSION_MAJOR=$(grep "^VERSION_MAJOR" Makefile | sed "s/^.*\s//") - VERSION_MINOR=$(grep "^VERSION_MINOR" Makefile | sed "s/^.*\s//") - ISO_VERSION=v$VERSION_MAJOR.$VERSION_MINOR.0 - ISO_BUCKET=$(grep "^ISO_BUCKET" Makefile | sed "s/^.*\s//") - - export buildFlagsArray="-ldflags=\ - -X ${goPackagePath}/pkg/version.version=v${version} \ - -X ${goPackagePath}/pkg/version.isoVersion=$ISO_VERSION \ - -X ${goPackagePath}/pkg/version.isoPath=$ISO_BUCKET \ - -X ${goPackagePath}/pkg/version.gitCommitID=${commit} \ - -X ${goPackagePath}/pkg/drivers/kvm.version=v${version} \ - -X ${goPackagePath}/pkg/drivers/kvm.gitCommitID=${commit} \ - -X ${goPackagePath}/pkg/drivers/hyperkit.version=v${version} \ - -X ${goPackagePath}/pkg/drivers/hyperkit.gitCommitID=${commit}" + buildPhase = '' + make COMMIT=${commit} ''; - postInstall = '' - mkdir -p $out/share/bash-completion/completions/ - MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $out/bin/minikube completion bash > $out/share/bash-completion/completions/minikube + installPhase = '' + install out/minikube -Dt $out/bin - mkdir -p $out/share/zsh/site-functions/ - MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $out/bin/minikube completion zsh > $out/share/zsh/site-functions/_minikube + export HOME=$PWD + export MINIKUBE_WANTUPDATENOTIFICATION=false + export MINIKUBE_WANTKUBECTLDOWNLOADMSG=false + + for shell in bash zsh; do + $out/bin/minikube completion $shell > minikube.$shell + installShellCompletion minikube.$shell + done ''; meta = with stdenv.lib; { - homepage = "https://github.com/kubernetes/minikube"; + homepage = "https://minikube.sigs.k8s.io"; description = "A tool that makes it easy to run Kubernetes locally"; - license = licenses.asl20; + license = licenses.asl20; maintainers = with maintainers; [ ebzzry copumpkin vdemeester atkinschang ]; - platforms = with platforms; unix; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix index 829ea1000f..da668b9589 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "nomad"; - version = "0.11.0"; + version = "0.11.1"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "0jg7h52wlgd2aslx13fs97j3b8g5xfgil3p2jsc4j95l7lmqn7bv"; + sha256 = "1pcn1bk7sqhhsrm3izqljwyrwdz6bdlplrajvjzka39l3k6f9hgc"; }; # ui: diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix index a9b0ed3fcb..19272c37ee 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, utillinux -, coreutils, kerberos, clang +, coreutils, kerberos, ncurses, clang, installShellFiles , components ? [ "cmd/oc" "cmd/openshift" @@ -9,12 +9,12 @@ with lib; let - version = "3.11.0"; + version = "4.1.0"; ver = stdenv.lib.elemAt (stdenv.lib.splitVersion version); versionMajor = ver 0; versionMinor = ver 1; versionPatch = ver 2; - gitCommit = "0cbc58b"; + gitCommit = "b4261e0"; # version is in vendor/k8s.io/kubernetes/pkg/version/base.go k8sversion = "v1.11.1"; k8sgitcommit = "b1b2997"; @@ -28,29 +28,17 @@ in buildGoPackage rec { owner = "openshift"; repo = "origin"; rev = "v${version}"; - sha256 = "06q4v2a1mm6c659ab0rzkqz6b66vx4avqfg0s9xckwhq420lzgka"; + sha256 = "16bc6ljm418kxz92gz8ldm82491mvlqamrvigyr6ff72rf7ml7ba"; }; goPackagePath = "github.com/openshift/origin"; - buildInputs = [ kerberos ]; + buildInputs = [ kerberos ncurses ]; - nativeBuildInputs = [ which rsync go-bindata clang ]; + nativeBuildInputs = [ which rsync go-bindata clang installShellFiles ]; patchPhase = '' patchShebangs ./hack - - substituteInPlace pkg/oc/clusterup/docker/host/host.go \ - --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \ - 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt' - - substituteInPlace pkg/oc/clusterup/docker/host/host.go \ - --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \ - 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount' - - substituteInPlace pkg/oc/clusterup/docker/host/host.go \ - --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \ - 'nsenter --mount=/rootfs/proc/1/ns/mnt ${coreutils}/bin/mkdir' ''; buildPhase = '' @@ -58,6 +46,7 @@ in buildGoPackage rec { # Openshift build require this variables to be set # unless there is a .git folder which is not the case with fetchFromGitHub echo "OS_GIT_VERSION=v${version}" >> os-version-defs + echo "OS_GIT_TREE_STATE=clean" >> os-version-defs echo "OS_GIT_MAJOR=${versionMajor}" >> os-version-defs echo "OS_GIT_MINOR=${versionMinor}" >> os-version-defs echo "OS_GIT_PATCH=${versionPatch}" >> os-version-defs @@ -74,8 +63,8 @@ in buildGoPackage rec { installPhase = '' mkdir -p $bin/bin cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$bin/bin/" - install -D -t "$bin/etc/bash_completion.d" contrib/completions/bash/* - install -D -t "$bin/share/zsh/site-functions" contrib/completions/zsh/* + installShellCompletion --bash contrib/completions/bash/* + installShellCompletion --zsh contrib/completions/zsh/* ''; meta = with stdenv.lib; { 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 144d46043f..95ad965c34 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildPackages, buildGoPackage, fetchFromGitHub, installShellFiles }: let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in @@ -17,13 +17,15 @@ buildGoPackage rec { goDeps = ./deps.nix; + nativeBuildInputs = [ installShellFiles ]; + postInstall = let stern = if isCrossBuild then buildPackages.stern else "$bin"; in '' - mkdir -p $bin/share/bash-completion/completions - ${stern}/bin/stern --completion bash > $bin/share/bash-completion/completions/stern - mkdir -p $bin/share/zsh/site-functions - ${stern}/bin/stern --completion zsh > $bin/share/zsh/site-functions/_stern + for shell in bash zsh; do + ${stern}/bin/stern --completion $shell > stern.$shell + installShellCompletion stern.$shell + done ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/data.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/data.nix index d07b6321cb..6994f2b85a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -4,9 +4,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-aci"; - rev = "v0.1.8"; - version = "0.1.8"; - sha256 = "14hya00ygz0khljjxwvkp6wbrbsavh2n8f26s2mjakph2havb8a3"; + rev = "v0.2.1"; + version = "0.2.1"; + sha256 = "1ylc3w5m68q7vvdignrgw3kwdmrw7w0blmfffxc4cam0a6a7q05l"; }; acme = { @@ -28,9 +28,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - rev = "v1.77.0"; - version = "1.77.0"; - sha256 = "0g8i8dmxzgkzylh2hh4fa9nq6x8bmxqaz0ly0f0cijb82lcbc3qf"; + rev = "v1.80.1"; + version = "1.80.1"; + sha256 = "0d483lp3rwz99f77sds717hafzbz1z7gq58dw52qzqagam8lrc10"; }; archive = { @@ -52,33 +52,33 @@ { owner = "terraform-providers"; repo = "terraform-provider-auth0"; - rev = "v0.8.1"; - version = "0.8.1"; - sha256 = "0hfmbw76p99xa9jz2sjss56p4wzqqhnf9l9gqgyamywfrdd2bn57"; - }; - aviatrix = - { - owner = "terraform-providers"; - repo = "terraform-provider-aviatrix"; - rev = "v2.12.0"; - version = "2.12.0"; - sha256 = "01n3cqb5k8gd0cll3nqbdmnx3mi0scm57j0xpzhxnif14kpj15g6"; + rev = "v0.9.3"; + version = "0.9.3"; + sha256 = "04dd7jxhpw2dqj6h3sbknbl1fa92jzshznm8icxrjajpxhcnbc32"; }; avi = { owner = "terraform-providers"; repo = "terraform-provider-avi"; - rev = "v0.2.1"; - version = "0.2.1"; - sha256 = "1pyknx5maq1qxm4i2y69iz9c2ym3q3n0fd4hbwxcl83n39cb5iy6"; + rev = "18.2.8"; + version = "18.2.8"; + sha256 = "0vpa6wksvb4gz65hgq0vizw0bky400bqh9zgf41g0mqkhv3wwb4i"; + }; + aviatrix = + { + owner = "terraform-providers"; + repo = "terraform-provider-aviatrix"; + rev = "v2.13.0"; + version = "2.13.0"; + sha256 = "1913fp3lfvdr3npwr0vbdhb4xsvyyr1r76hv3h7rg5fidf3vpw5a"; }; aws = { owner = "terraform-providers"; repo = "terraform-provider-aws"; - rev = "v2.55.0"; - version = "2.55.0"; - sha256 = "0pxmwdy5cin0navva1nf3l02yrqqbg01xcq3hf8w0ch8fgr8mr25"; + rev = "v2.59.0"; + version = "2.59.0"; + sha256 = "0hkvjvabw8phl5mb9km2dxm64a5lf56g9aq9qf593zsij1rsjwkk"; }; azuread = { @@ -92,9 +92,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - rev = "v2.3.0"; - version = "2.3.0"; - sha256 = "195r6l0ddpjmmf947c1k5v0vdscnhsg2ilp6x7pna418pnx84y2d"; + rev = "v2.7.0"; + version = "2.7.0"; + sha256 = "0w4bafj3kn5kvkrc26ix1y9rgf3w4810x7la7g1aclpg7507fcv3"; }; azurestack = { @@ -108,9 +108,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-baiducloud"; - rev = "v1.1.0"; - version = "1.1.0"; - sha256 = "1va0b9vqfcv2nrqh8jwf80ylyl1x826jhb7h4ghnf18c144qm0i1"; + rev = "v1.2.0"; + version = "1.2.0"; + sha256 = "1s2vk4vjni5nc50pdw60pm0grrf835xy551i6d4cmfxkkpqx3f6f"; }; bigip = { @@ -180,17 +180,25 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - rev = "v2.5.0"; - version = "2.5.0"; - sha256 = "1dqxn2iwbidmfb0850sicwqh4yp6ynarkl36lnr8nqw9lasvqr5a"; + rev = "v2.6.0"; + version = "2.6.0"; + sha256 = "01z2znif5yy4bawcf76b6d0j3b67fljbx87b4b2cb5vqy4l4aamk"; + }; + cloudinit = + { + owner = "hashicorp"; + repo = "terraform-provider-cloudinit"; + rev = "v1.0.0"; + version = "1.0.0"; + sha256 = "0i926f4xkfydd2bxmim69xrvi9ymn1vrc66zl117axzsmy9200zx"; }; cloudscale = { owner = "terraform-providers"; repo = "terraform-provider-cloudscale"; - rev = "v2.1.1"; - version = "2.1.1"; - sha256 = "122yi2wbd8mqddkwp2la6vwqw0kw7c9ff5j6y4xqczjg2bwb9mph"; + rev = "v2.1.2"; + version = "2.1.2"; + sha256 = "052pa17a77fkmhvygfgmpz87xlc08qvz1apzc2scg2449xfdv7zb"; }; cloudstack = { @@ -228,9 +236,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-digitalocean"; - rev = "v1.15.1"; - version = "1.15.1"; - sha256 = "0nld6lgz5vy8n4s0y0wpssrslp866rha2znli6pd5sw1nvi6yg0z"; + rev = "v1.16.0"; + version = "1.16.0"; + sha256 = "0yymgkn66a9mif0wic4rais7ap6d4gfxij835ssr2pr3rb49ay8d"; }; dme = { @@ -268,9 +276,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-dome9"; - rev = "v1.17.0"; - version = "1.17.0"; - sha256 = "123phc71rnb25lv9glybadhmr3pdsrbzl7xm6mj8j213a78qdmn5"; + rev = "v1.18.1"; + version = "1.18.1"; + sha256 = "0m4fxpik55z9ah5nlhvy314xyxvlaldqbwdp3bx1xs9kpm3znvyl"; }; dyn = { @@ -284,9 +292,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-exoscale"; - rev = "v0.16.1"; - version = "0.16.1"; - sha256 = "0gs39nx12ws0ikal9zyqkyfiljbxbw0pj7llj9xsq96s7crvy6xr"; + rev = "v0.16.2"; + version = "0.16.2"; + sha256 = "102z4v3shk0as76v90151j4c6p93wy16m1hzzk1yp50dlc8ffsks"; }; external = { @@ -300,9 +308,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-fastly"; - rev = "v0.13.0"; - version = "0.13.0"; - sha256 = "0mcjmk21fil4q98p8v3qln7s2fqbdkjv1pvba0cf9v9d101dhhi9"; + rev = "v0.14.0"; + version = "0.14.0"; + sha256 = "1ak5gyrv66dnf5qy54hvwc4478n3cs5nxd0nwa2vf0gn2zp55bhy"; }; flexibleengine = { @@ -332,33 +340,33 @@ { owner = "terraform-providers"; repo = "terraform-provider-github"; - rev = "v2.5.1"; - version = "2.5.1"; - sha256 = "1lqnwq5gsz34n6zzwajxrh0i1cbyicl4zxakr4fch7makri2fqwg"; + rev = "v2.6.1"; + version = "2.6.1"; + sha256 = "1hg5pij2hllj6m6x8salsgw404ap7pw6yccvgynw4y4k26dl0jlr"; }; gitlab = { owner = "terraform-providers"; repo = "terraform-provider-gitlab"; - rev = "v2.5.0"; - version = "2.5.0"; - sha256 = "1g7girhjks6p7rcs82p2zd8clp6kdfn6d1synlmfwiw6d3496fvf"; + rev = "v2.6.0"; + version = "2.6.0"; + sha256 = "0qy58fgwipcjwxz473rpcnpkb22n9hqsjckx88lhc2br4pgbcbrd"; }; google-beta = { owner = "terraform-providers"; repo = "terraform-provider-google-beta"; - rev = "v3.15.0"; - version = "3.15.0"; - sha256 = "1xncw82y48dcc464v2gzfmr94l3kgh9x2rlmpmmy6g4mihiwh38b"; + rev = "v3.18.0"; + version = "3.18.0"; + sha256 = "1rsaqrgr6ddgx1pala83y70dk32s0mvf6vi877awmimxjzsa1l4r"; }; google = { owner = "terraform-providers"; repo = "terraform-provider-google"; - rev = "v3.15.0"; - version = "3.15.0"; - sha256 = "0vw7sndy441xn34kiv2k9hq9p9g649amh7bk91rf0f5p8cmyll1c"; + rev = "v3.18.0"; + version = "3.18.0"; + sha256 = "18cxl1qw1wyvzvhgjm1s3c19hbi5z9s6mipgazhrac70myw8dmy7"; }; grafana = { @@ -372,9 +380,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-gridscale"; - rev = "v1.5.0"; - version = "1.5.0"; - sha256 = "05nzia9sa555k07gkhyyckdgn9n6a50w8l3id69rjq1jjh0pngd7"; + rev = "v1.5.1"; + version = "1.5.1"; + sha256 = "0m5j9y26a7jl3frnw1j8gll999brprgf0i29p201d3c9b02pxnla"; }; hcloud = { @@ -404,9 +412,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-heroku"; - rev = "v2.3.0"; - version = "2.3.0"; - sha256 = "1lv3l54fw6rgj2ixkz2dvaf3djj3slhrm0nlbza5c7zjb945igfq"; + rev = "v2.4.0"; + version = "2.4.0"; + sha256 = "1rhny1mbkqkfiqshps5mc5f3ykxnpypsdi72hw4g1k29pbvr4hh8"; }; http = { @@ -428,9 +436,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-huaweicloud"; - rev = "v1.13.0"; - version = "1.13.0"; - sha256 = "1caix3lycqnd856z6c3zp9mmq3vr7rblwhhbkwn4rrcld8sv285j"; + rev = "v1.14.0"; + version = "1.14.0"; + sha256 = "10g5xl3pspzmj0bjzqbw3br4k7kh2jplph06f7sz2zg9dncl4h5z"; + }; + ibm = + { + owner = "IBM-Cloud"; + repo = "terraform-provider-ibm"; + rev = "v1.4.0"; + version = "1.4.0"; + sha256 = "147vl55g6c49ihk8z2hwfq2v7g1yj35id1qfjlz0dxalm7cwa3l6"; }; icinga2 = { @@ -464,6 +480,14 @@ version = "1.3.0"; sha256 = "19af40g8hgz2rdz6523v0fs71ww7qdlf2mh5j9vb7pfzriqwa5k9"; }; + infoblox = + { + owner = "terraform-providers"; + repo = "terraform-provider-infoblox"; + rev = "v1.0.0"; + version = "1.0.0"; + sha256 = "0p95y5w3fzddygmsjc0j60z0f4aazvy5iwbwszj0i8gs42qhda2f"; + }; jdcloud = { owner = "terraform-providers"; @@ -484,9 +508,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-launchdarkly"; - rev = "v1.1.0"; - version = "1.1.0"; - sha256 = "1gj0srv8shn6qg109y1g42dx8dybkp3qrjn412bvs6f063ggk0zs"; + rev = "v1.2.2"; + version = "1.2.2"; + sha256 = "0rvyzn2a8bh8hvd3f6whfwzpx2frqnfmh8nwlasb0r4xya8lv3bc"; }; librato = { @@ -500,9 +524,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-linode"; - rev = "v1.9.2"; - version = "1.9.2"; - sha256 = "1nrk8fi0fwkcm4csrppjwv7vd2ilpbj01dywak696nj8b15w176q"; + rev = "v1.9.3"; + version = "1.9.3"; + sha256 = "12jwvpnv4xl9crq6jynking2rcl4ci8ci22db3fadigxqs98hb4w"; }; local = { @@ -556,9 +580,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-mongodbatlas"; - rev = "v0.4.2"; - version = "0.4.2"; - sha256 = "0cb8dh7bwz9yzyhz8v9j6ksi4dgmmz8d1qpm7234rj36ccirnjmz"; + rev = "v0.5.0"; + version = "0.5.0"; + sha256 = "15m7qmn1gd7gmzlqgf2q70kmihf8ihqabpkf122pxhb3iyikwh77"; }; mysql = { @@ -604,17 +628,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-nomad"; - rev = "v1.4.4"; - version = "1.4.4"; - sha256 = "05029s8h8vx7pl0y3d9cd5nlww3483caxhwkbrmk0vs7zdgxk8ns"; + rev = "v1.4.5"; + version = "1.4.5"; + sha256 = "1sccm4mspjn92ky6nscsrmbb573mx53wzsvvapsf2p4119h9s30i"; }; ns1 = { owner = "terraform-providers"; repo = "terraform-provider-ns1"; - rev = "v1.8.0"; - version = "1.8.0"; - sha256 = "1h1pqrj11wdi0fnrrh2mkwahi59jl2vd8affy4acx7kny4n92s49"; + rev = "v1.8.1"; + version = "1.8.1"; + sha256 = "04s46f40md8hrqqiwj6wcq4qpx0115qk8hwbln9a7lsrh0zmmmb3"; }; nsxt = { @@ -644,9 +668,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-oci"; - rev = "v3.69.0"; - version = "3.69.0"; - sha256 = "17vndv6bpa9ajs7llnf64bb482b15virbv311d3ds5lrva4vvrv8"; + rev = "v3.72.0"; + version = "3.72.0"; + sha256 = "05sl702b0j9lpsy3bjac104qngjlsln0v2ni8a78j97xif8jb0an"; }; oktaasa = { @@ -660,9 +684,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-okta"; - rev = "v3.1.1"; - version = "3.1.1"; - sha256 = "1hky6hqrfyl2gj1lykb7gazj9awjgsxhc028558whm5rysx2wpsr"; + rev = "v3.2.0"; + version = "3.2.0"; + sha256 = "13z5srra4pj5p2dwzrqiny2ph4vmmp8q59ycmd7x2yi93fd02mcl"; }; oneandone = { @@ -676,9 +700,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-opc"; - rev = "v1.3.7"; - version = "1.3.7"; - sha256 = "01g09w8mqfp1d8phplsdj0vz63q5bgq9fqwy2kp4vrnwb70dq52w"; + rev = "v1.4.0"; + version = "1.4.0"; + sha256 = "1yl8bbh4pf94wlmna294zcawylr9hiaix82wr321g9wb0vi3d5l8"; }; opennebula = { @@ -692,9 +716,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - rev = "v1.26.0"; - version = "1.26.0"; - sha256 = "1vsvzs8112vbi0x99yg6niw0wr55p09x7cg85qwjd0r42gpfdfq2"; + rev = "v1.27.0"; + version = "1.27.0"; + sha256 = "0d6dms5y8vndcm10zfid1g13c5fi19z7hqll8z07jr0hgvhbzp2v"; }; opentelekomcloud = { @@ -708,9 +732,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-opsgenie"; - rev = "v0.2.9"; - version = "0.2.9"; - sha256 = "13y6awnm9j5qzq1bcmhg7ngzvx43h2dw9wmzdfi1xcpmv1ldvwpi"; + rev = "v0.3.1"; + version = "0.3.1"; + sha256 = "1ciqhibij0fk2z20yabl464mj9srp1v6dy04dyazmxkw46bm1lc5"; }; oraclepaas = { @@ -732,17 +756,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-packet"; - rev = "v2.8.0"; - version = "2.8.0"; - sha256 = "1qnjla347hll0fav0ngnifblk6slbmh1klnm7k9jv327jmv92hz5"; + rev = "v2.8.1"; + version = "2.8.1"; + sha256 = "1idrvkc2bbp3vwz2w45nazr1hq10f7bmyamb57q7mlswydcyk6b2"; }; pagerduty = { owner = "terraform-providers"; repo = "terraform-provider-pagerduty"; - rev = "v1.5.1"; - version = "1.5.1"; - sha256 = "12n12sx1qxckqklcaphzr0j9bcwzrl6p8qzdc3d2csiqccqrpdas"; + rev = "v1.7.0"; + version = "1.7.0"; + sha256 = "168v1mpl9df63yp8zjq79hyxcjj4imyzg20rdn6n71d6iz8v85g8"; }; panos = { @@ -780,9 +804,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-profitbricks"; - rev = "v1.4.4"; - version = "1.4.4"; - sha256 = "0pzcl3pdhaykihvv1v38zrv607mydchvkzrzhwcakgmdkp3vq54i"; + rev = "v1.5.0"; + version = "1.5.0"; + sha256 = "0v9x8sj9c6acmbnkv4bnjvz93dd1fmg9b98rwghiakf968hxx6hl"; }; pureport = { @@ -804,9 +828,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-rancher2"; - rev = "v1.8.1"; - version = "1.8.1"; - sha256 = "15pvz1sd1x932yxdp7d679vax3dw56bfhp3422vxqsgmdgscwg1s"; + rev = "v1.8.3"; + version = "1.8.3"; + sha256 = "1k2d9j17b7sssliraww6as196ihdcra1ylhg1qbynklpr0asiwna"; }; rancher = { @@ -884,17 +908,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-signalfx"; - rev = "v4.18.6"; - version = "4.18.6"; - sha256 = "1xjajkvkcksz0dnawjb3hv14ysp140g0vdj5warshafz8hjbys17"; + rev = "v4.19.4"; + version = "4.19.4"; + sha256 = "15cf9paqrcznj99gv6mxqvgvkd8qbxkwz2145h2qxp5vdcykj78g"; }; skytap = { owner = "terraform-providers"; repo = "terraform-provider-skytap"; - rev = "v0.14.0"; - version = "0.14.0"; - sha256 = "01cscykfw5qilf5rlvh7y2l3bqbv8f180ssqw7zqzyr9p4m6511l"; + rev = "v0.14.1"; + version = "0.14.1"; + sha256 = "0ygsdkv7czyhsjsx1q57rmmcl8x66d65yarhg40hlng5c7xpi52g"; }; softlayer = { @@ -904,6 +928,14 @@ version = "0.0.1"; sha256 = "1xcg5zm2n1pc3l7ng94k589r7ykv6fxsmr5qn9xmmpdf912rdnfq"; }; + sops = + { + owner = "carlpett"; + repo = "terraform-provider-sops"; + rev = "v0.5.0"; + version = "0.5.0"; + sha256 = "18zhqjkw1639a1vrxniws3sf5p91vrf5m7kksaj3yfiavsr5q2ki"; + }; spotinst = { owner = "terraform-providers"; @@ -928,6 +960,14 @@ version = "1.0.0"; sha256 = "1x295va6c72465cxps0kx3rrb7s9aip2cniy6icsg1b2yrsb9b26"; }; + sumologic = + { + owner = "terraform-providers"; + repo = "terraform-provider-sumologic"; + rev = "v2.0.0"; + version = "2.0.0"; + sha256 = "0j6lq9xcc3znjd4yd8gyzsbhwbbwi95k16kj1la9cicbvgra8iap"; + }; telefonicaopencloud = { owner = "terraform-providers"; @@ -948,9 +988,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-tencentcloud"; - rev = "v1.30.7"; - version = "1.30.7"; - sha256 = "0d7byng63sxbgn8f5r92lkcaqvq3r0plm619h63f47h6z6z8xarc"; + rev = "v1.32.0"; + version = "1.32.0"; + sha256 = "014zgslr14r446qifk4slq9g5qydxs7bk181gw227k9mr6krgba1"; }; terraform = { @@ -964,9 +1004,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-tfe"; - rev = "v0.15.1"; - version = "0.15.1"; - sha256 = "0372yjifsr4kvbc36hzhzf6ajlg6wy1r2x94p67m7rgr2fw061n2"; + rev = "v0.16.0"; + version = "0.16.0"; + sha256 = "0c9csyp655wijlnr3rbmymg6gaa23y4fyav0b1y99qsxaa358af5"; }; tls = { @@ -984,13 +1024,21 @@ version = "0.6.0"; sha256 = "10z032fa64sd8d6r4v2f4m7gp93v8wb2zk2r13fflzg5rfk5740z"; }; + turbot = + { + owner = "terraform-providers"; + repo = "terraform-provider-turbot"; + rev = "v1.1.0"; + version = "1.1.0"; + sha256 = "1wb5n17rv1r5jn6xdzjjafw7s96i826x9ww8w6llllihgl798zn7"; + }; ucloud = { owner = "terraform-providers"; repo = "terraform-provider-ucloud"; - rev = "v1.17.0"; - version = "1.17.0"; - sha256 = "0dpy3bkrm20sk4zpkikas5c8ygl0zf9v6cnd34iblw1m41f44n7v"; + rev = "v1.19.0"; + version = "1.19.0"; + sha256 = "17wkhhxvriqix520nv4q4jrk7gah8kkq3l4nj0rzp1kdwxphmsz0"; }; ultradns = { @@ -1004,17 +1052,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - rev = "v2.9.0"; - version = "2.9.0"; - sha256 = "0a1jkwxz45qcbnd91im0xz948k197zal78n6y45bwcbqnil32yiy"; + rev = "v2.10.0"; + version = "2.10.0"; + sha256 = "1yg8ck9z5ycw8akfhnv4pnxyfzav9dzbhizv4dp78xi2gnddrawi"; }; vcd = { owner = "terraform-providers"; repo = "terraform-provider-vcd"; - rev = "v2.7.0"; - version = "2.7.0"; - sha256 = "0bh8hqxpy6722q1v9cnpvn8fqwh5llzz1aavrbsib5brgjc8vqmy"; + rev = "v2.8.0"; + version = "2.8.0"; + sha256 = "0myj5a9mrh7vg6h3gk5f0wsdp6832nz0z10h184107sdchpv253n"; }; venafi = { @@ -1028,17 +1076,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-vra7"; - rev = "v0.5.0"; - version = "0.5.0"; - sha256 = "123yskwgzp771nx03sg49vwi5ph3zf2ajf06s7msj0blvz6wan4v"; + rev = "v1.0.1"; + version = "1.0.1"; + sha256 = "0qmldgxmrv840c5rbmskdf4f9g4v52gg9v7magm6j2w2g0dp1022"; }; vsphere = { owner = "terraform-providers"; repo = "terraform-provider-vsphere"; - rev = "v1.17.0"; - version = "1.17.0"; - sha256 = "16fglpfy8grlifaa1d1ymvjys7wh39m6py8h45g1xgs1jyfkz00s"; + rev = "v1.17.3"; + version = "1.17.3"; + sha256 = "109rg8w6szdqq2hb9jg4j3i79z5ppb6vayikl1cg8m8dsv2whhrj"; }; vthunder = { @@ -1052,9 +1100,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-vultr"; - rev = "v1.1.4"; - version = "1.1.4"; - sha256 = "14anp7b759yyh78ickas52amads2lmwg85h8i0ikln7qhrhl42d7"; + rev = "v1.1.5"; + version = "1.1.5"; + sha256 = "06sxcqklqqsninqach05fzilh6k2h9bv66mgfhf9s53ggs5nm8z7"; }; wavefront = { @@ -1068,8 +1116,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-yandex"; - rev = "v0.35.0"; - version = "0.35.0"; - sha256 = "10zj5s0zdgh54rlczyvkq292v9xj1ivvn2k9ml65l6j3h0axlgxv"; + rev = "v0.38.0"; + version = "0.38.0"; + sha256 = "16s9ffbdgws5hglfr6f48ipjv2sbkdpkg20m9s1m6v2f055nxwak"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix index c3c44160c1..82ce5a7067 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -50,9 +50,10 @@ let # These are the providers that don't fall in line with the default model special-providers = { - # Override the google providers + # Override providers that use Go modules + vendor/ folder google = patchGoModVendor automated-providers.google; google-beta = patchGoModVendor automated-providers.google-beta; + ibm = patchGoModVendor automated-providers.ibm; # providers that were moved to the `hashicorp` organization, # but haven't updated their references yet: @@ -129,12 +130,13 @@ let ''; }); - elasticsearch = callPackage ./elasticsearch {}; + # Packages that don't fit the default model + ansible = callPackage ./ansible {}; gandi = callPackage ./gandi {}; - ibm = callPackage ./ibm {}; + elasticsearch = callPackage ./elasticsearch {}; libvirt = callPackage ./libvirt {}; lxd = callPackage ./lxd {}; - ansible = callPackage ./ansible {}; + vpsadmin = callPackage ./vpsadmin {}; }; in automated-providers // special-providers diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix deleted file mode 100644 index bd667dbc15..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: - -# -# USAGE: -# install the following package globally or in nix-shell: -# -# (terraform.withPlugins ( plugins: [ terraform-provider-ibm ])) -# -# examples: -# https://github.com/IBM-Cloud/terraform-provider-ibm/tree/master/examples -# - -buildGoPackage rec { - pname = "terraform-provider-ibm"; - version = "0.11.1"; - - goPackagePath = "github.com/terraform-providers/terraform-provider-ibm"; - subPackages = [ "./" ]; - - src = fetchFromGitHub { - owner = "IBM-Cloud"; - repo = "terraform-provider-ibm"; - sha256 = "1vp1kzadfkacn6c4illxjra8yki1fx7h77b38fixkcvc79mzasmv"; - rev = "v${version}"; - }; - - # Terraform allow checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postBuild = "mv go/bin/terraform-provider-ibm{,_v${version}}"; - - meta = with stdenv.lib; { - homepage = "https://github.com/IBM-Cloud/terraform-provider-ibm"; - description = "Terraform provider is used to manage IBM Cloud resources."; - platforms = platforms.all; - license = licenses.mpl20; - maintainers = with maintainers; [ jensbin ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-all b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-all index 89ed5a94f2..70dfc2f825 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-all +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-all @@ -112,8 +112,10 @@ cd "$(dirname "$0")" # individual repos to fetch slugs=( + IBM-Cloud/terraform-provider-ibm ajbosco/terraform-provider-segment camptocamp/terraform-provider-pass + carlpett/terraform-provider-sops poseidon/terraform-provider-matchbox spaceapegames/terraform-provider-wavefront tweag/terraform-provider-nixos diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix new file mode 100644 index 0000000000..2f788ed915 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, buildGoModule }: +buildGoModule rec { + pname = "terraform-provider-vpsadmin"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "vpsfreecz"; + repo = "terraform-provider-vpsadmin"; + rev = "v${version}"; + hash = "sha256-+6jRjcManQdoKh7ewOJI1UaulY5OSbkIUHmtrBI33u4="; + }; + + modSha256 = "sha256-gz+t50uHFj4BQnJg6kOJI/joJVE+usLpVzTqziek2wY="; + + subPackages = [ "." ]; + + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postInstall = "mv $out/bin/${pname}{,_v${version}}"; + + meta = with stdenv.lib; { + description = "Terraform provider for vpsAdmin"; + homepage = "https://github.com/vpsfreecz/terraform-provider-vpsadmin"; + license = licenses.mpl20; + maintainers = with maintainers; [ zimbatm ]; + }; +} 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 ee27422a13..50a5129226 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper, coreutils -, runCommand, writeText, terraform-providers }: +, runCommand, writeText, terraform-providers, fetchpatch }: let goPackagePath = "github.com/hashicorp/terraform"; @@ -120,7 +120,13 @@ in rec { terraform_0_12 = pluggable (generic { version = "0.12.24"; sha256 = "1rjihp6qcaizp2nnv4z20kpmjnqcw95pq5rnhq381a3pdzr0cd0z"; - patches = [ ./provider-path.patch ]; + patches = [ + ./provider-path.patch + (fetchpatch { + name = "fix-mac-mojave-crashes.patch"; + url = "https://github.com/hashicorp/terraform/pull/24562.patch"; + sha256 = "1k70kk4hli72x8gza6fy3vpckdm3sf881w61fmssrah3hgmfmbrs"; + }) ]; passthru = { inherit plugins; }; }); diff --git a/third_party/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix index e72f50cd29..60a7e5b2fb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -19,7 +19,7 @@ buildRustPackage rec { installPhase = '' mkdir -p $out/bin - cp -p target/release/cfdyndns $out/bin/ + cp -p $releaseDir/cfdyndns $out/bin/ ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/gmailctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gmailctl/default.nix index ea387dad42..a7dc6fe155 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gmailctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gmailctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gmailctl"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mbrt"; repo = "gmailctl"; rev = "v${version}"; - sha256 = "0g581gdkib7bj86blpm8skjvbnivmzh9ddikxai9hr5qq231j1pb"; + sha256 = "08q4yjfbwlldirf3j5db18l8kn6sf288wd364s50jlcx2ka8w50j"; }; - modSha256 = "0pv3lhzl96ygzh9y01hi9klrrk403ii92imr9yrbimaf7rsvyvjp"; + modSha256 = "1c7dk6l8lkq2j04cp5g97hwkwfmmyn5r0vpr5zpavvalxgjidsf4"; meta = with stdenv.lib; { description = "Declarative configuration for Gmail filters"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/gopher/gopherclient/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gopher/gopherclient/default.nix deleted file mode 100644 index 40e9401a40..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/gopher/gopherclient/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, buildGoPackage, fetchgit, makeWrapper, pkgconfig, qtbase, qtdeclarative, qtwebengine }: - -buildGoPackage rec { - pname = "gopherclient"; - version = "2016-10-02"; - rev = "91c41b5542d08001636708e2a5054521a6004702"; - - goPackagePath = "github.com/prologic/gopherclient"; - - src = fetchgit { - inherit rev; - url = "https://github.com/prologic/gopherclient"; - sha256 = "0b1gvxhv4zg930hvric9mmbfp0lnww0sqlkkfbzfkif3wz9ni5y9"; - }; - - nativeBuildInputs = [ makeWrapper pkgconfig ]; - - buildInputs = [ qtbase qtdeclarative qtwebengine ]; - - preBuild = '' - # Generate gopherclient resources with genqrc. - ln -s ${goPackagePath}/vendor/gopkg.in go/src/ - GOBIN="$(pwd)" go install -v gopkg.in/qml.v1/cmd/genqrc - PATH="$(pwd):$PATH" go generate ${goPackagePath} - ''; - - NIX_CFLAGS_COMPILE = [ - # go-qml needs private Qt headers. - "-I${qtbase.dev}/include/QtCore/${qtbase.version}" - ]; - - postInstall = '' - # https://github.com/prologic/gopherclient/#usage - wrapProgram $bin/bin/gopherclient --prefix GODEBUG , cgocheck=0 - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/prologic/gopherclient"; - description = "Gopher Qt GUI client"; - license = licenses.mit; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/hydroxide/default.nix b/third_party/nixpkgs/pkgs/applications/networking/hydroxide/default.nix index 75c1cdaece..679b3f4014 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/hydroxide/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/hydroxide/default.nix @@ -2,24 +2,16 @@ buildGoModule rec { pname = "hydroxide"; - version = "0.2.11"; + version = "0.2.14"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "0rn35iyli80kgj3yn93lrx0ybgc8fhvmkvx1d18ill7r4cmavand"; + sha256 = "0d8wjyzmw89yhrszz487f7i19rcz7xlx4w2wd4c69k5nsdrs6dys"; }; - modSha256 = "0b19rcif8yiyvhrsjd3q5nsvr580lklamlphx4dk47n456ckcqfp"; - - # FIXME: remove with next release - patches = [ - (fetchpatch { - url = "https://github.com/emersion/hydroxide/commit/80e0fa6f3e0154338fb0af8a82ca32ae6281dd15.patch"; - sha256 = "1xi0clzgz14a7sxnwr0li7sz9p05sfh3zh5iqg2qz5f415k9jknj"; - }) - ]; + modSha256 = "0888ikywclhjb4n7xqxc7hvzlhx1qhf4c3skaddqs3nrxm171jwn"; subPackages = [ "cmd/hydroxide" ]; 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 92857aa1a6..f2b026e79d 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 @@ -4,19 +4,19 @@ assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.07"; stdenv.mkDerivation { pname = "jackline"; - version = "unstable-2020-03-22"; + version = "unstable-2020-04-24"; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "52f84525c74c43e8d03fb1e6ff025ccb2699e4aa"; - sha256 = "0wir573ah1w16xzdn9rfwk3569zq4ff5frp0ywq70va4gdlb679c"; + rev = "885b97b90d565f5f7c2b5f66f5edf14a82251b87"; + sha256 = "1mdn413ya2g0a1mrdbh1b65gnygrxb08k99z5lmidhh34kd1llsj"; }; 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 mtime notty sexplib hex uutf + ocaml_lwt otr astring ptime notty sexplib hex uutf dns-client base64 ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix index 1938bae4f7..f3b304564c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,79 +1,82 @@ -{ lib, stdenv, fetchFromGitHub -, cmake, cmark, lmdb, mkDerivation, qtbase, qtmacextras -, qtmultimedia, qttools, mtxclient, boost, spdlog, olm, pkgconfig +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, cmark +, lmdb +, lmdbxx +, tweeny +, mkDerivation +, qtbase +, qtmacextras +, qtmultimedia +, qttools +, qtquickcontrols2 +, qtgraphicaleffects +, mtxclient +, boost17x +, spdlog +, olm +, pkgconfig , nlohmann_json }: -# These hashes and revisions are based on those from here: -# https://github.com/Nheko-Reborn/nheko/blob/v0.6.4/deps/CMakeLists.txt#L52 -let - tweeny = fetchFromGitHub { - owner = "mobius3"; - repo = "tweeny"; - rev = "b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf"; - sha256 = "1wyyq0j7dhjd6qgvnh3knr70li47hmf5394yznkv9b1indqjx4mi"; - }; - - lmdbxx = fetchFromGitHub { - owner = "bendiken"; - repo = "lmdbxx"; - rev = "0b43ca87d8cfabba392dfe884eb1edb83874de02"; - sha256 = "1whsc5cybf9rmgyaj6qjji03fv5jbgcgygp956s3835b9f9cjg1n"; - }; -in mkDerivation rec { pname = "nheko"; - version = "0.6.4"; + version = "0.7.1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "19dkc98l1q4070v6mli4ybqn0ip0za607w39hjf0x8rqdxq45iwm"; + sha256 = "12sxibbrn79sxkf9jrm7jrlj7l5vz15claxrrll7pkv9mv44wady"; }; - # If, on Darwin, you encounter the error - # error: must specify at least one argument for '...' parameter of variadic - # macro [-Werror,-Wgnu-zero-variadic-macro-arguments] - # Then adding this parameter is likely the fix you want. - # - # However, it looks like either cmake doesn't honor this CFLAGS variable, or - # darwin's compiler doesn't have the same syntax as gcc for turning off - # -Werror selectively. - # - # Anyway, this is something that will have to be debugged with access to a - # darwin-based OS. Sorry about that! - # - #preConfigure = lib.optionalString stdenv.isDarwin '' - # export CFLAGS=-Wno-error=gnu-zero-variadic-macro-arguments - #''; - - postPatch = '' - mkdir -p .deps/include/ - ln -s ${tweeny}/include .deps/include/tweeny - ln -s ${spdlog} .deps/spdlog - ''; - + nativeBuildInputs = [ + lmdbxx + cmake + pkgconfig + ]; cmakeFlags = [ - "-DTWEENY_INCLUDE_DIR=.deps/include" - "-DLMDBXX_INCLUDE_DIR=${lmdbxx}" - "-Dnlohmann_json_DIR=${nlohmann_json}/lib/cmake/nlohmann_json" + # Can be removed once either https://github.com/NixOS/nixpkgs/pull/85254 or + # https://github.com/NixOS/nixpkgs/pull/73940 are merged + "-DBoost_NO_BOOST_CMAKE=TRUE" + ]; + # commit missing from latest release and recommended by upstream: + # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619263903 + patches = [ + (fetchpatch { + name = "room-ids-escape-patch"; + url = "https://github.com/Nheko-Reborn/nheko/commit/d94ac86816f9f325cba11f71344a3ca99591130d.patch"; + sha256 = "1p0kj4a60l3jf0rfakc88adld7ccg3vfjhzia5rf2i03h35cxw8c"; + }) ]; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ - mtxclient olm boost lmdb spdlog cmark - qtbase qtmultimedia qttools + nlohmann_json + tweeny + mtxclient + olm + boost17x + lmdb + spdlog + cmark + qtbase + qtmultimedia + qttools + qtquickcontrols2 + qtgraphicaleffects ] ++ lib.optional stdenv.isDarwin qtmacextras; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Desktop client for the Matrix protocol"; homepage = "https://github.com/Nheko-Reborn/nheko"; maintainers = with maintainers; [ ekleog fpletz ]; - platforms = platforms.unix; + platforms = platforms.all; + # Should be fixable if a higher clang version is used, see: + # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 + broken = stdenv.targetPlatform.isDarwin; license = licenses.gpl3Plus; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix index ec6a497bde..18b590304d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -1,46 +1,47 @@ { mkDerivation, stdenv, lib, fetchFromGitHub, cmake -, qtbase, qtquickcontrols, qtkeychain, qtmultimedia, qttools -, libqmatrixclient_0_5 -, libsecret +, qtbase, qtquickcontrols, qtquickcontrols2, qtkeychain, qtmultimedia, qttools +, libquotient, libsecret }: -let - generic = version: sha256: prefix: library: mkDerivation { - pname = "quaternion"; - inherit version; +mkDerivation rec { + pname = "quaternion"; + version = "0.0.9.4e"; - src = fetchFromGitHub { - owner = "QMatrixClient"; - repo = "Quaternion"; - rev = "${prefix}${version}"; - inherit sha256; - }; - - buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain library libsecret ]; - - nativeBuildInputs = [ cmake qttools ]; - - postInstall = if stdenv.isDarwin then '' - mkdir -p $out/Applications - mv $out/bin/quaternion.app $out/Applications - rmdir $out/bin || : - '' else '' - substituteInPlace $out/share/applications/quaternion.desktop \ - --replace 'Exec=quaternion' "Exec=$out/bin/quaternion" - ''; - - meta = with lib; { - description = "Cross-platform desktop IM client for the Matrix protocol"; - homepage = "https://matrix.org/docs/projects/client/quaternion.html"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; - inherit (qtbase.meta) platforms; - inherit version; - }; + src = fetchFromGitHub { + owner = "QMatrixClient"; + repo = "Quaternion"; + rev = "${version}"; + sha256 = "sha256-2yEiILiitRPj2hCodUDM8UNVq8crb9nyX21ebuh5EEM="; }; -in rec { - quaternion = generic "0.0.9.4c" "12mkwiqqbi4774kwl7gha72jyf0jf547acy6rw8ry249zl4lja54" "" libqmatrixclient_0_5; + buildInputs = [ + qtbase + qtmultimedia + qtquickcontrols + qtquickcontrols2 + qtkeychain + libquotient + libsecret + ]; - quaternion-git = quaternion; + nativeBuildInputs = [ cmake qttools ]; + + postInstall = if stdenv.isDarwin then '' + mkdir -p $out/Applications + mv $out/bin/quaternion.app $out/Applications + rmdir $out/bin || : + '' else '' + substituteInPlace $out/share/applications/com.github.quaternion.desktop \ + --replace 'Exec=quaternion' "Exec=$out/bin/quaternion" + ''; + + meta = with lib; { + description = + "Cross-platform desktop IM client for the Matrix protocol"; + homepage = "https://matrix.org/docs/projects/client/quaternion.html"; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + inherit (qtbase.meta) platforms; + inherit version; + }; } 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 1237892ef6..74a644d189 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 @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free and Open Source messaging and emailing app that combines common web applications into one"; - homepage = "http://rambox.pro"; + homepage = "https://rambox.pro"; license = licenses.mit; maintainers = with maintainers; [ gnidorah ma27 ]; platforms = ["i686-linux" "x86_64-linux"]; 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 c39b199235..4a751bac4a 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 @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook +{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, nixosTests , 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 @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.33.3"; # Please backport all updates to the stable channel. + version = "1.33.4"; # 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 +33,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 = "1brw1hidmrznb55cb794yvgzin7sf3cxnffivmag4vf2a2vcvf4y"; + sha256 = "0mcxia2zaflaazfdl1ngpab0dyhwwzbhad7brc6kwhjxydbnmwcd"; }; nativeBuildInputs = [ @@ -121,6 +121,9 @@ in stdenv.mkDerivation rec { autoPatchelf --no-recurse -- $out/lib/Signal/ ''; + # Tests if the application launches and waits for "Link your phone to Signal Desktop": + passthru.tests.application-launch = nixosTests.signal-desktop; + meta = { description = "Private, simple, and secure messenger"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 5eda797174..0cc8cd848c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.58.0.93"; + version = "8.59.0.77"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -62,9 +62,10 @@ let fetchurl { urls = [ "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" + "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "1nqadil50z896jg0r202gw3xmm3diawn0pnh6n6nxn900f02avl3"; + sha256 = "1cnlwlp84942ywji3x60zvhijavazdxfym3rfzq3ysky28b6mn6i"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; 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 e9a795b59c..9cf436ff18 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,13 @@ let throwSystem = throw "Unsupported system: ${system}"; sha256 = { - x86_64-darwin = "05xsbiviikrwfayjr6rvvfkm70681x2an6mgcg1cxw1fsi4sr6fd"; - x86_64-linux = "0h2rfgx92yq9a6dqsv9a0r8a6m5xfrywkljjk5w9snw49b0r1p12"; + x86_64-darwin = "0z731q00bwljlcmbjwqphyys7skqms1vg87pyi4nsvjmc7kjx7qg"; + x86_64-linux = "0wrs0i2bqv21ivy8s88khbww28b3gsw4abbbbjc76mqma9b0bajs"; + }.${system} or throwSystem; + + version = { + x86_64-darwin = "4.4.2"; + x86_64-linux = "4.4.2"; }.${system} or throwSystem; meta = with stdenv.lib; { @@ -53,8 +58,7 @@ let }; linux = stdenv.mkDerivation rec { - inherit pname meta; - version = "4.4.0"; + inherit pname meta version; src = fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; inherit sha256; @@ -140,8 +144,7 @@ let }; darwin = stdenv.mkDerivation rec { - inherit pname meta; - version = "4.4.1"; + inherit pname meta version; phases = [ "installPhase" ]; 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 63d922ab29..6b5acd8344 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 @@ -52,6 +52,28 @@ stdenv.mkDerivation rec { ln -s $out/opt/teams/teams $out/bin/ ''; + dontAutoPatchelf = true; + + # Includes runtimeDependencies in the RPATH of the included Node modules + # so that dynamic loading works. We cannot use directly runtimeDependencies + # here, since the libraries from runtimeDependencies are not propagated + # to the dynamically loadable node modules because of a condition in + # autoPatchElfHook since *.node modules have Type: DYN (Shared object file) + # instead of EXEC or INTERP it expects. + # Fixes: https://github.com/NixOS/nixpkgs/issues/85449 + postFixup = '' + autoPatchelf "$out" + + runtime_rpath="${lib.makeLibraryPath runtimeDependencies}" + + for mod in $(find "$out/opt/teams" -name '*.node'); do + mod_rpath="$(patchelf --print-rpath "$mod")" + + echo "Adding runtime dependencies to RPATH of Node module $mod" + patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod" + done; + ''; + meta = with stdenv.lib; { description = "Microsoft Teams"; homepage = "https://teams.microsoft.com"; 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 6f4099c1d8..319f400d95 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 @@ -2,7 +2,7 @@ , pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 -, tl-expected, microsoft_gsl, hunspell +, tl-expected, hunspell # TODO: Shouldn't be required: , pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst , xdg_utils @@ -19,12 +19,12 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "2.1.0"; + version = "2.1.1"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "0l5917w90z9pg1al1hzcycb4yxv03vc88jg958ifl9nlvz1arll6"; + sha256 = "0032csgzwfby5a8q8w9iks7ggv1dcqli3qyhksbzly2xzxmfzqaj"; }; postPatch = '' @@ -43,7 +43,7 @@ mkDerivation rec { buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3 - tl-expected microsoft_gsl hunspell + tl-expected hunspell # TODO: Shouldn't be required: pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst ]; @@ -57,6 +57,7 @@ mkDerivation rec { "-DTDESKTOP_API_TEST=ON" "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" "-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF" + "-DDESKTOP_APP_USE_PACKAGED_GSL=OFF" "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON" "-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF" #"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""' 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 ef06f26522..360d8b4e1c 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 = "3.5.385850.0413"; + version = "5.0.399860.0429"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "049kxgkyaxknxpk0hf1a7bxn0c08dk250z3q2ba9pc1xkrn5kdnw"; + sha256 = "1jid8rs403b709scz8vpqsi1dxdmssn5426wa3d16p45blnxk16k"; }; }; 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 81b2fcf62b..e1eb8863a0 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.13.5"; + version = "1.14.0"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0lx65a44b03rbvcrz0y9syrik67fx3hvblxyyvz5l9bb7rdipmvc"; + sha256 = "1y7racrhz06k9mwxw5qspfjfyvbj5fmwai3gsfgrm36k7al84bnz"; }; 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 612af14b87..ad7b4debd3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,29 +1,20 @@ { stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell, sqlite, zlib -, fetchpatch +, glibcLocales }: stdenv.mkDerivation rec { - version = "20200417"; + version = "20200501"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "0s7943r2s14kavyjf7i70vca252l626539i09a9vk0i9sfi35vx5"; + sha256 = "1xrs2bagrcg489zp7g39l3rrpgz8n1ji9cbr21wrnasfbhqcsmnx"; }; - patches = [ - # Remove on next release. Fixes the `change-folder` - # macro (https://github.com/neomutt/neomutt/issues/2268) - (fetchpatch { - url = "https://github.com/neomutt/neomutt/commit/9e7537caddb9c6adc720bb3322a7512cf51ab025.patch"; - sha256 = "1vmlvgnhx1ra3rnyjkpkv6lrqw8xfh2kkmqp43fqn9lnk3pkjxvv"; - }) - ]; - buildInputs = [ cyrus_sasl gss gpgme kerberos libidn ncurses notmuch openssl perl lmdb @@ -95,8 +86,10 @@ stdenv.mkDerivation rec { (cd test-files && ./setup.sh) export NEOMUTT_TEST_DIR=$(pwd)/test-files + export LC_ALL="en_US.UTF-8" ''; + checkInputs = [ glibcLocales ]; checkTarget = "test"; postCheck = "unset NEOMUTT_TEST_DIR"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix index d9ed62bb94..f6bf60166c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions" "--bashcompletiondir=${placeholder "out"}/share/bash-completion/completions" - "--infodir=${placeholder "info"}" + "--infodir=${placeholder "info"}/share/info" ] ++ optional (!withEmacs) "--without-emacs" ++ optional (withEmacs) "--emacslispdir=${placeholder "emacs"}/share/emacs/site-lisp" ++ optional (isNull ruby) "--without-ruby"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix index 0117ab978c..9e990dcdf3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, pkgconfig, texinfo +{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, texinfo , netcat-gnu, gnutls, gsasl, libidn2, Security , withKeyring ? true, libsecret ? null , systemd ? null }: @@ -9,20 +9,15 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; - version = "1.8.8"; + version = "1.8.10"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "1rarck61mz3mwg0l30vjj6j9fq6gc7gic0r1c1ppwpq2izj57jzc"; + sha256 = "041g921rdjiv8bapp61gp4rylq8cckfkcwzyh8bs7xwxs4wpzfna"; }; - # the 2nd patch should go when 1.8.9 is released patches = [ ./paths.patch - (fetchpatch { - url = "https://github.com/marlam/msmtp-mirror/commit/c78f24347ec996c7a3830b48403bf3736afca071.patch"; - sha256 = "0d4sc2f5838jriv65wahpgvwckkzqhdk3hs660fyg80si2i0l1bx"; - }) ]; buildInputs = [ gnutls gsasl libidn2 ] diff --git a/third_party/nixpkgs/pkgs/applications/networking/nym/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nym/default.nix new file mode 100644 index 0000000000..6bb86c016b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/nym/default.nix @@ -0,0 +1,54 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkgconfig +, openssl +, libredirect +, writeText +}: + +rustPlatform.buildRustPackage rec { + pname = "nym"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "nymtech"; + repo = "nym"; + rev = "v${version}"; + sha256 = "1q9i24mzys6a9kp9n0bnxr3iwzblabmc6iif3ah75gffyf0cipk4"; + }; + + cargoSha256 = "0qas544bs4wyllvqf2r5mvqxs1nviwcvxa3rzq10dvjyjm1xyh3k"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ openssl ]; + + /* + Nym's test presence::converting_mixnode_presence_into_topology_mixnode::it_returns_resolved_ip_on_resolvable_hostname tries to resolve nymtech.net. + Since there is no external DNS resolution available in the build sandbox, we point cargo and its children (that's what we remove the 'unsetenv' call for) to a hosts file in which we statically resolve nymtech.net. + */ + preCheck = '' + export LD_PRELOAD=${libredirect.overrideAttrs (drv: { + postPatch = "sed -i -e /unsetenv/d libredirect.c"; + })}/lib/libredirect.so + export NIX_REDIRECTS=/etc/hosts=${writeText "nym_resolve_test_hosts" "127.0.0.1 nymtech.net"} + ''; + + postCheck = "unset NIX_REDIRECTS LD_PRELOAD"; + + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "A mixnet providing IP-level privacy"; + longDescription = '' + Nym routes IP packets through other participating nodes to hide their source and destination. + In contrast with Tor, it prevents timing attacks at the cost of latency. + ''; + homepage = "https://nymtech.net"; + license = licenses.asl20; + maintainers = [ maintainers.ehmry ]; + platforms = with platforms; intersectLists (linux ++ darwin) (x86 ++ x86_64); # see https://github.com/nymtech/nym/issues/179 for architectures + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/nym/update.sh b/third_party/nixpkgs/pkgs/applications/networking/nym/update.sh new file mode 100755 index 0000000000..0c65521c7f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/nym/update.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq nix-prefetch + +# adapted from rust-analyzer + +set -euo pipefail +cd "$(dirname "$0")" +nixpkgs=../../../.. + +owner=$(sed -nE 's/.*\bowner = "(.*)".*/\1/p' ./default.nix) +repo=$(sed -nE 's/.*\brepo = "(.*)".*/\1/p' ./default.nix) +rev=$( + curl -s "https://api.github.com/repos/$owner/$repo/releases" | + jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output +) +version=${rev:1} +old_version=$(sed -nE 's/.*\bversion = "(.*)".*/\1/p' ./default.nix) +if grep -q 'cargoSha256 = ""' ./default.nix; then + old_version='broken' +fi +if [[ "$version" == "$old_version" ]]; then + echo "Up to date: $version" + exit +fi +echo "$old_version -> $version" + +sha256=$(nix-prefetch -f "$nixpkgs" nym.src --rev "$rev") +# Clear cargoSha256 to avoid inconsistency. +sed -e "s/version = \".*\"/version = \"$version\"/" \ + -e "s/sha256 = \".*\"/sha256 = \"$sha256\"/" \ + -e "s/cargoSha256 = \".*\"/cargoSha256 = \"\"/" \ + --in-place ./default.nix + +echo "Prebuilding for cargoSha256" +cargo_sha256=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).nym.cargoDeps.overrideAttrs (_: { outputHash = sha256; })") +sed "s/cargoSha256 = \".*\"/cargoSha256 = \"$cargo_sha256\"/" \ + --in-place ./default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix b/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix index 6ac2e89cf4..7319dd4a44 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, libsamplerate, alsaLib }: +{ stdenv, fetchFromGitHub, openssl, libsamplerate, alsaLib, AppKit }: stdenv.mkDerivation rec { pname = "pjsip"; @@ -11,12 +11,19 @@ stdenv.mkDerivation rec { sha256 = "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0"; }; - patches = [ ./fix-aarch64.patch ]; + patches = [ + ./fix-aarch64.patch + ]; - buildInputs = [ openssl libsamplerate alsaLib ]; + buildInputs = [ openssl libsamplerate ] + ++ stdenv.lib.optional stdenv.isLinux alsaLib + ++ stdenv.lib.optional stdenv.isDarwin AppKit; preConfigure = '' export LD=$CC + '' # Fixed on master, remove with 2.11 + + stdenv.lib.optionalString stdenv.isDarwin '' + NIX_CFLAGS_COMPILE+=" -framework Security" ''; postInstall = '' @@ -29,11 +36,11 @@ stdenv.mkDerivation rec { # We need the libgcc_s.so.1 loadable (for pthread_cancel to work) dontPatchELF = true; - meta = { + meta = with stdenv.lib; { description = "A multimedia communication library written in C, implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE"; homepage = "https://pjsip.org/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [olynch]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ olynch ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix index 02a2c63b43..4c67105daf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix @@ -1,21 +1,21 @@ -{stdenv, fetchFromGitHub, openssl, libX11, libgssglue, pkgconfig, autoreconfHook +{stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1, nettle, gnutls, pkgconfig, autoreconfHook , enableCredssp ? (!stdenv.isDarwin) } : stdenv.mkDerivation (rec { pname = "rdesktop"; - version = "1.8.6"; + version = "1.9.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "02sbhnqbasa54c75c86qw9w9h9sxxbnldj7bjv2gvn18lmq5rm20"; + sha256 = "1s6k1jwd28y38ymk3lfv76ch4arpfwrbdhpkbnwwy3fc4617gb78"; }; nativeBuildInputs = [pkgconfig autoreconfHook]; - buildInputs = [openssl libX11] - ++ stdenv.lib.optional enableCredssp libgssglue; + buildInputs = [openssl libX11 libXcursor libtasn1 nettle gnutls] + ++ stdenv.lib.optional enableCredssp krb5; configureFlags = [ "--with-ipv6" 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 2f48446745..57925a3292 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, buildPackages }: +{ stdenv, buildGoPackage, fetchFromGitHub, buildPackages, installShellFiles }: buildGoPackage rec { pname = "rclone"; @@ -17,6 +17,8 @@ buildGoPackage rec { outputs = [ "bin" "out" "man" ]; + nativeBuildInputs = [ installShellFiles ]; + postInstall = let rcloneBin = @@ -25,10 +27,11 @@ buildGoPackage rec { else stdenv.lib.getBin buildPackages.rclone; in '' - install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1 - mkdir -p $bin/share/zsh/site-functions $bin/share/bash-completion/completions/ - ${rcloneBin}/bin/rclone genautocomplete zsh $bin/share/zsh/site-functions/_rclone - ${rcloneBin}/bin/rclone genautocomplete bash $bin/share/bash-completion/completions/rclone.bash + installManPage $src/rclone.1 + for shell in bash zsh; do + ${rcloneBin}/bin/rclone genautocomplete $shell rclone.$shell + installShellCompletion rclone.$shell + done ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix index 535757503c..7b7318544c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses +{stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep , enableX11 ? true}: let inherit (ocamlPackages) ocaml lablgtk; in @@ -38,7 +38,7 @@ stdenv.mkDerivation (rec { postInstall = if enableX11 then '' for i in $(cd $out/bin && ls); do wrapProgram $out/bin/$i \ - --run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")" + --run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | ${gnugrep}/bin/grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")" done '' else ""; diff --git a/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix b/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix index d7664b347e..a8630381eb 100644 --- a/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { pname = "gnucash"; - version = "3.9"; + version = "3.10"; src = fetchurl { url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2"; - sha256 = "1zxrgrjbs13vgr002rvl734w9f7zzxfq4xxmyhj777dwgkfds0ld"; + sha256 = "05kgg7mhizndwn7icnarqk3c19xrzfawf90y9nb3jdm6fv1741xn"; }; nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ]; @@ -69,7 +69,6 @@ stdenv.mkDerivation rec { ''; # TODO: The following tests FAILED: - # 61 - test-gnc-timezone (Failed) # 70 - test-load-c (Failed) # 71 - test-modsysver (Failed) # 72 - test-incompatdep (Failed) diff --git a/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix b/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix index be63092026..6dc124c6a2 100644 --- a/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }: let - _version = "2.8.4"; - _build = "453"; + _version = "2.8.6"; + _build = "455"; version = "${_version}-${_build}"; name = "jameica-${version}"; @@ -17,7 +17,7 @@ let comment = "Free Runtime Environment for Java Applications."; desktopName = "Jameica"; genericName = "Jameica"; - categories = "Application;Office;"; + categories = "Office;"; }; in stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "willuhn"; repo = "jameica"; rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}"; - sha256 = "1imm3wpdrgh2sr2wh9vgaf2mp1ixs845vgzk5ib82mak7lg9m1zl"; + sha256 = "1pndklxsvixy6zyblqr62ki3pqaq8lfrzgasrvhclqxxh76gjlss"; }; # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries diff --git a/third_party/nixpkgs/pkgs/applications/office/ledger-autosync/default.nix b/third_party/nixpkgs/pkgs/applications/office/ledger-autosync/default.nix index 00c4025586..3a0f362dcf 100644 --- a/third_party/nixpkgs/pkgs/applications/office/ledger-autosync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/ledger-autosync/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "ledger-autosync"; - version = "1.0.1"; + version = "1.0.2"; # no tests included in PyPI tarball src = fetchFromGitHub { owner = "egh"; repo = "ledger-autosync"; rev = "v${version}"; - sha256 = "1h5mjngdd3rmzwmy026xmas0491kxxi1vxkd5m1xii7y6j50z14q"; + sha256 = "0sh32jcf8iznnbg1kqlrswbzfmn4h3gkw32q20xwxzz4935pz1qk"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/applications/office/scribus/unstable.nix b/third_party/nixpkgs/pkgs/applications/office/scribus/unstable.nix index d6084c0f37..aa0c2dee97 100644 --- a/third_party/nixpkgs/pkgs/applications/office/scribus/unstable.nix +++ b/third_party/nixpkgs/pkgs/applications/office/scribus/unstable.nix @@ -116,7 +116,7 @@ mkDerivation rec { ]; platforms = platforms.linux; description = "Desktop Publishing (DTP) and Layout program for Linux"; - homepage = "http://www.scribus.net"; + homepage = "https://www.scribus.net"; # There are a lot of licenses... https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19 license = with licenses; [ bsd3 diff --git a/third_party/nixpkgs/pkgs/applications/office/watson/default.nix b/third_party/nixpkgs/pkgs/applications/office/watson/default.nix index 160e821008..52c94ce378 100644 --- a/third_party/nixpkgs/pkgs/applications/office/watson/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/watson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages, fetchpatch }: +{ stdenv, pythonPackages, fetchpatch, installShellFiles }: with pythonPackages; @@ -14,15 +14,21 @@ buildPythonApplication rec { checkPhase = '' pytest -vs tests - ''; + ''; + + postInstall = '' + installShellCompletion --bash --name watson watson.completion + installShellCompletion --zsh --name _watson watson.zsh-completion + ''; checkInputs = [ py pytest pytest-datafiles mock pytest-mock pytestrunner ]; propagatedBuildInputs = [ requests click arrow ]; + nativeBuildInputs = [ installShellFiles ]; meta = with stdenv.lib; { homepage = "https://tailordev.github.io/Watson/"; description = "A wonderful CLI to track your time!"; license = licenses.mit; - maintainers = with maintainers; [ mguentner nathyong ] ; + maintainers = with maintainers; [ mguentner nathyong ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix index 7cb64f92f3..6d0a19334d 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix @@ -13,7 +13,7 @@ libav, libiio, libopus, libpulseaudio, -libusb, +libusb-compat-0_1, limesuite, mkDerivation, ocl-icd, @@ -51,7 +51,7 @@ in mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - glew opencv3 libusb boost libopus limesuite libav libiio libpulseaudio + glew opencv3 libusb-compat-0_1 boost libopus limesuite libav libiio libpulseaudio qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf fftwFloat codec2' cm256cc serialdv ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix index 36df6ad19d..676f7d3c83 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, lndir, makeWrapper , fetchFromGitHub, cmake -, libusb, pkgconfig +, libusb-compat-0_1, pkgconfig , usePython ? false , python, ncurses, swig2 , extraPackages ? [] @@ -25,7 +25,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; - buildInputs = [ libusb ncurses ] + buildInputs = [ libusb-compat-0_1 ncurses ] ++ lib.optionals usePython [ python swig2 ]; propagatedBuildInputs = lib.optional usePython python.pkgs.numpy; 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 971399c4a2..0518744089 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/welle-io/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/welle-io/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig , qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2 -, faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec, lame, mpg123 }: +, faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123 }: let version = "2.1"; @@ -23,7 +23,7 @@ in mkDerivation { faad2 fftwSinglePrec lame - libusb + libusb-compat-0_1 mpg123 qtbase qtcharts diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/dcm2niix/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/dcm2niix/default.nix index 8ea3588fa8..59b173ac98 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/dcm2niix/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "1.0.20190902"; + version = "1.0.20200331"; pname = "dcm2niix"; src = fetchFromGitHub { owner = "rordenlab"; repo = "dcm2niix"; rev = "v${version}"; - sha256 = "0h8jsadgv831lqb0jhnaxm7lldirmnp5agrhgg5bcxvn860fl15b"; + sha256 = "1cncfwhyhmg18n970lkn6yvp0i74ajznsl8dqz00asqfzmg681n1"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix index 7c5942d825..58bdd5c722 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix @@ -13,11 +13,11 @@ let in mkDerivation rec { pname = "eagle"; - version = "9.6.0"; + version = "9.6.1"; src = fetchurl { url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz"; - sha256 = "1crkyc7ws2zz5dfs00h6rj4z2hyqb97kp6r4hxhmcgg5647ij4z8"; + sha256 = "1iq4aahrh4g3549vbr7gka5y2h7f17n3yafzl21njc2mkqb12jdw"; }; desktopItem = makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh index 7dc0b008b6..f048ccde4e 100755 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh @@ -1,6 +1,8 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p coreutils git nix curl +set -e + # this script will generate versions.nix in the right location # this should contain the versions' revs and hashes # the stable revs are stored only for ease of skipping @@ -50,12 +52,11 @@ for arg in "$@"; do done here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -now=$(date --iso-8601) +now=$(date --iso-8601 --utc) file="${here}/versions.nix" # just in case this runs in parallel -rand="$(head -c 3 /dev/urandom | base64)" -tmp="${here}/,versions.nix.${rand}" +tmp="${here}/,versions.nix.${RANDOM}" # libraries currently on github, move to $gitlab/libraries planned libs=( symbols templates footprints packages3d ) @@ -112,16 +113,16 @@ for version in "${all_versions[@]}"; do echo "Checking src" >&2 src_rev="$(${get_rev} "${gitlab}"/code/kicad.git "${version}" | cut -f1)" - ret="$(grep -sm 1 "\"${pname}\"" -A 4 "${file}" | grep -sm 1 "${src_rev}")" + has_rev="$(grep -sm 1 "\"${pname}\"" -A 4 "${file}" | grep -sm 1 "${src_rev}" || true)" has_hash="$(grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "sha256")" - if [[ -n ${ret} && -n ${has_hash} && -z ${clean} ]]; then + if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then echo "Reusing old ${pname}.src.sha256, already latest .rev" >&2 grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "rev" -A 1 else printf "%8srev =\t\t\t\"%s\";\n" "" "${src_rev}" printf "%8ssha256 =\t\t\"%s\";\n" \ "" "$(${prefetch} "${gitlab_pre}${src_rev}")" - (( count++ )) + count=$((count+1)) fi printf "%6s};\n" "" printf "%4s};\n" "" @@ -132,25 +133,25 @@ for version in "${all_versions[@]}"; do echo "Checking i18n" >&2 i18n_rev="$(${get_rev} "${i18n}" "${version}" | cut -f1)" - ret="$(grep -sm 1 "\"${pname}\"" -A 11 "${file}" | grep -sm 1 "${i18n_rev}")" + has_rev="$(grep -sm 1 "\"${pname}\"" -A 11 "${file}" | grep -sm 1 "${i18n_rev}" || true)" has_hash="$(grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n.sha256")" - if [[ -n ${ret} && -n ${has_hash} && -z ${clean} ]]; then + if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then echo "Reusing old kicad-i18n-${today}.src.sha256, already latest .rev" >&2 grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n" -A 1 else printf "%8si18n.rev =\t\t\"%s\";\n" "" "${i18n_rev}" printf "%8si18n.sha256 =\t\t\"%s\";\n" "" \ "$(${prefetch} "${i18n_pre}${i18n_rev}")" - (( count++ )) + count=$((count+1)) fi for lib in "${libs[@]}"; do echo "Checking ${lib}" >&2 url="${github}-${lib}.git" lib_rev="$(${get_rev} "${url}" "${version}" | cut -f1)" - ret="$(grep -sm 1 "\"${pname}\"" -A 19 "${file}" | grep -sm 1 "${lib_rev}" -A 1)" + has_rev="$(grep -sm 1 "\"${pname}\"" -A 19 "${file}" | grep -sm 1 "${lib_rev}" || true)" has_hash="$(grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}.sha256")" - if [[ -n ${ret} && -n ${has_hash} && -z ${clean} ]]; then + if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then echo "Reusing old kicad-${lib}-${today}.src.sha256, already latest .rev" >&2 grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}" -A 1 else @@ -161,7 +162,7 @@ for version in "${all_versions[@]}"; do printf "\"%s\";\n" "${lib_rev}" printf "%8s%s.sha256 =\t\"%s\";\n" "" \ "${lib}" "$(${prefetch} "${github}-${lib}/archive/${lib_rev}.tar.gz")" - (( count++ )) + count=$((count+1)) fi done printf "%6s};\n" "" @@ -175,6 +176,11 @@ done printf "}\n" } > "${tmp}" +if grep '""' "${tmp}"; then + echo "empty value detected, out of space?" >&2 + exit "1" +fi + mv "${tmp}" "${file}" printf "\nFinished\nMoved output to %s\n\n" "${file}" >&2 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 6b9a981a87..174532d696 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-02-10"; + version = "2020-04-25"; src = { - rev = "1190e60dd426d246661e478db3287f266ec6cda2"; - sha256 = "0cgfad07j69cks97llj4hf3kga0d5qf728s89xwxrzcwm06k62bi"; + rev = "3759799d1e03b2da6a0dcd72273e4978880fc8f1"; + sha256 = "0ba14fla8m5zli68wfjkfc4ymvj4j8z92y3jigxs8hys0450bybi"; }; }; libVersion = { - version = "2020-02-10"; + version = "2020-04-25"; libSources = { - i18n.rev = "26786c4ca804bad7eb072f1ef381f00b5a2ff3ee"; - i18n.sha256 = "0iqr1xfw4s677afjy9bn5y41z4isp327f9y90wypkxiwwq3dfkfl"; - symbols.rev = "35b7da2d211d7cc036b37ad7f5e40ef03faa1bc7"; - symbols.sha256 = "0wbfw1swbfvfp47cn48pxpqlygjs3xh568ydrrs51v3w102x8y64"; - templates.rev = "0c0490897f803ab8b7c3dad438b7eb1f80e0417c"; - templates.sha256 = "0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g"; - footprints.rev = "9357b6f09312966c57fec9f66a516941d79c3038"; - footprints.sha256 = "0cgah1q0h012ffwfl220k7qb6hgbs0i91spq2j4v3lgpfr4g638d"; - packages3d.rev = "de368eb739abe41dfc3163e0e370477e857f9cc1"; - packages3d.sha256 = "0b3p5v8g24h6l7q3sbqz7ns0gnrf9l89glj86m5ybhizvls9vrrs"; + i18n.rev = "fc14baa52ca56a58b0048ab860bf31887d3cf8eb"; + i18n.sha256 = "05nayab7dkjyq7g3i9q7k55hcckpc0cmq4bbklmxx16rx4rbhzc6"; + symbols.rev = "0f9ff2d17237f90bb649bf0a52b6d454f68197e8"; + symbols.sha256 = "1a54428syn2xksc00n2bvh1alrx2vrqmp7cg7d2rn8nlq8yk4qd5"; + templates.rev = "7db8d4d0ea0711f1961d117853547fb3edbc3857"; + templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg"; + footprints.rev = "61df6d8853b4c68cca0ac87784c0a33cff9394d3"; + footprints.sha256 = "0blmhk8pwd4mi6rlsr4lf4lq7j01h6xbpbvr3pm8pmw8zylhi54v"; + packages3d.rev = "88bcf2e817fe000bb2c05e14489afc3b1a4e10ed"; + packages3d.sha256 = "0z9p1fn5xbz940kr5jz2ibzf09hpdi1c9izmabkffvrnfy6408x6"; }; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch b/third_party/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch new file mode 100644 index 0000000000..1cef96ea14 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch @@ -0,0 +1,10 @@ +diff --git a/scripts/makedbh b/scripts/makedbh +index 01e4fa5..d6299c6 100755 +--- a/scripts/makedbh ++++ b/scripts/makedbh +@@ -1,4 +1,4 @@ +-#!/bin/csh -f ++#!/usr/bin/env tcsh + # + # makes the "database.h" (1st argument, $1) file from "database.h.in" + # (2nd argument, $2), setting various mask operation definitions diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch b/third_party/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch new file mode 100644 index 0000000000..37ae351955 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch @@ -0,0 +1,19 @@ +diff --git a/database/DBio.c b/database/DBio.c +index 93c4b0b..292ea5f 100644 +--- a/database/DBio.c ++++ b/database/DBio.c +@@ -2378,12 +2378,12 @@ DBCellWriteFile(cellDef, f) + + #define FPRINTF(f,s)\ + {\ +- if (fprintf(f,s) == EOF) goto ioerror;\ ++ if (fprintf(f,"%s",s) == EOF) goto ioerror;\ + DBFileOffset += strlen(s);\ + } + #define FPRINTR(f,s)\ + {\ +- if (fprintf(f,s) == EOF) return 1;\ ++ if (fprintf(f,"%s",s) == EOF) return 1;\ + DBFileOffset += strlen(s);\ + } + diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix new file mode 100644 index 0000000000..62b830547e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, m4, tcsh, libX11, tcl, tk, cairo, ncurses, mesa_glu, python3 }: + +stdenv.mkDerivation { + pname = "magic-vlsi"; + version = "8.3.5"; + + src = fetchurl { + url = "http://opencircuitdesign.com/magic/archive/magic-8.3.5.tgz"; + sha256 = "0wv4zmxlqjfaakgp802icn0cd9f8ylkz2sppix83axq8p5cg90yq"; + }; + + buildInputs = [ m4 tcsh libX11 tcl tk cairo ncurses mesa_glu ]; + nativeBuildInputs = [ python3 ]; + + configureFlags = [ + "--with-tcl=${tcl}" + "--with-tk=${tk}" + "--disable-werror" + ]; + + postPatch = '' + patchShebangs scripts/* + ''; + + patches = [ + ./0001-strip-bin-prefix.patch + ./0002-fix-format-security.patch + ]; + + meta = with stdenv.lib; { + description = "VLSI layout tool written in Tcl"; + homepage = "http://opencircuitdesign.com/magic/"; + license = licenses.mit; + maintainers = [ maintainers.dkudriavtsev ]; + }; +} 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 36df6ae065..c80c163562 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.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "0sklw211cmqp4y0c6nycfavpdxdpfwhq9a4sbwdlqd5agyf85h1j"; + sha256 = "0nmh09x3scfqg0bg1qf8b7z67s11hbfd7kr1h6k1zw94fyn2mg8q"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/fasttext/default.nix b/third_party/nixpkgs/pkgs/applications/science/machine-learning/fasttext/default.nix index 2ae5e0eedd..64124594e1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/machine-learning/fasttext/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/machine-learning/fasttext/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fasttext"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "facebookresearch"; repo = "fastText"; rev = "v${version}"; - sha256 = "1cbzz98qn8aypp4r5kwwwc9wiq5bwzv51kcsb15xjfs9lz8h3rii"; + sha256 = "07cz2ghfq6amcljaxpdr5chbd64ph513y8zqmibfx2xwfp74xkhn"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch b/third_party/nixpkgs/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch deleted file mode 100644 index 7bf32df0b7..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 85ede2cf452800710de136f4f864921d3bb9773c Mon Sep 17 00:00:00 2001 -From: Tom Hall -Date: Fri, 21 Feb 2020 22:56:06 +0000 -Subject: [PATCH] Disable test pending upstream fix - -See https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17718 ---- - tests/reg-tests-1d.R | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/reg-tests-1d.R b/tests/reg-tests-1d.R -index 9b551a1fc8..18ce6027ed 100644 ---- a/tests/reg-tests-1d.R -+++ b/tests/reg-tests-1d.R -@@ -3079,7 +3079,7 @@ stopifnot(exprs = { - x[1:52] %% 3 == 2:1 - -x[1:52] %% 3 == 1:2 - }) # larger x suffer from cancellation (well, warning too early now): --tools::assertWarning(x[60:68] %% 3) -+#tools::assertWarning(x[60:68] %% 3) - - - ## Hilmar Berger's on R-devel list: 'data.frame() == NULL' etc --- -2.24.1 - 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 617a182653..52da3b4a1a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng -, libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib +, libtiff, ncurses, pango, pcre2, perl, readline, tcl, texLive, tk, xz, zlib , less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, blas, lapack , curl, Cocoa, Foundation, libobjc, libcxx, tzdata, fetchpatch , withRecommendedPackages ? true @@ -12,27 +12,24 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { - name = "R-3.6.3"; + name = "R-4.0.0"; src = fetchurl { - url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "13xaxwfbzj0bd6rn2n27z0n04lb93mcyq991w4vdbbg8v282jc49"; + url = "https://cran.r-project.org/src/base/R-4/${name}.tar.gz"; + sha256 = "0h1995smlyiyhx7gpg9paxsfqrcn6g9bbp5h9r47i6an3clv1gh6"; }; dontUseImakeConfigure = true; buildInputs = [ bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses - pango pcre perl readline texLive xz zlib less texinfo graphviz icu + pango pcre2 perl readline texLive xz zlib less texinfo graphviz icu pkgconfig bison imake which blas lapack curl tcl tk jdk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ ./no-usr-local-search-paths.patch - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [ - # Remove a test which fails on aarch64. - # See https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17718 - ./0001-Disable-test-pending-upstream-fix.patch + ./fix-failing-test.patch ]; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/third_party/nixpkgs/pkgs/applications/science/math/R/fix-failing-test.patch b/third_party/nixpkgs/pkgs/applications/science/math/R/fix-failing-test.patch new file mode 100644 index 0000000000..5fb3b3b9c3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/math/R/fix-failing-test.patch @@ -0,0 +1,25 @@ +From e8f54bc562eb301d204b5f880614be58a2b39a2b Mon Sep 17 00:00:00 2001 +From: maechler +Date: Mon, 30 Mar 2020 19:15:59 +0000 +Subject: [PATCH] no longer fail in norm() check for broken OpenBLAS Lapack + 3.9.0 + +git-svn-id: https://svn.r-project.org/R/trunk@78112 00db46b3-68df-0310-9c12-caf00c1e9a41 +--- + tests/reg-tests-1d.R | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/reg-tests-1d.R b/tests/reg-tests-1d.R +index 6b7de765a95..fafd6911e7a 100644 +--- a/tests/reg-tests-1d.R ++++ b/tests/reg-tests-1d.R +@@ -3836,7 +3836,8 @@ stopifnot(is.na( norm(diag(c(1, NA)), "2") )) + ## norm(, "F") + (m <- cbind(0, c(NA, 0), 0:-1)) + nTypes <- eval(formals(base::norm)$type) # "O" "I" "F" "M" "2" +-stopifnot(is.na( print(vapply(nTypes, norm, 0., x = m)) )) # print(): show NA *or* NaN ++print( # stopifnot( -- for now, as Lapack is still broken in some OpenBLAS -- FIXME ++ is.na( print(vapply(nTypes, norm, 0., x = m)) )) # print(): show NA *or* NaN + ## "F" gave non-NA with LAPACK 3.9.0, before our patch in R-devel and R-patched + + diff --git a/third_party/nixpkgs/pkgs/applications/science/math/cemu/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/cemu/default.nix index f91e5be517..b41135229d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/cemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/cemu/default.nix @@ -4,7 +4,7 @@ , SDL2 , libGL , libarchive -, libusb +, libusb-compat-0_1 , qtbase , qmake , git @@ -33,7 +33,7 @@ mkDerivation rec { SDL2 libGL libarchive - libusb + libusb-compat-0_1 qtbase libpng_apng ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/mxnet/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/mxnet/default.nix index 87d46850f1..b006a9dd18 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/mxnet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/mxnet/default.nix @@ -8,11 +8,11 @@ assert cudnnSupport -> cudaSupport; stdenv.mkDerivation rec { pname = "mxnet"; - version = "1.4.1"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/apache/incubator-mxnet/releases/download/${version}/apache-mxnet-src-${version}-incubating.tar.gz"; - sha256 = "1d0lhlpdaxycjzpwwrpgjd3v2q2ka89v5rr13ddxayy7ld2hxiaj"; + sha256 = "1vvdb7pfh63kb9fzs6gqp95q550a3ck4cj9mqxlk9wwhkh30dsq1"; }; nativeBuildInputs = [ cmake perl ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix index cd465a8c41..4791d12450 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix @@ -29,6 +29,14 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/patch?id2=8bdc326ba57d1bb9664f63cf165a9e9920cc1afc&id=dc673c17555efca611f68398d5013b66e9825463"; sha256 = "1hhannz7xzprijakn2w2d0rhd5zv2zikik9p51i87bas3nc658f7"; }) + + # `is_unitary` test in `matrix_double_dense.pyx` fails with some BLAS implementations + # https://trac.sagemath.org/ticket/29297 should be included in 9.1 + (fetchpatch { + name = "is_unitary-special-case.patch"; + url = "https://git.sagemath.org/sage.git/patch?id=cc3eb9ffa991e328b09028d32aab7e7cc2ddbb6a"; + sha256 = "0jq4w8hnp5c9q99011ldr4n3knvm1rx2g85z0hidv3i9x868p0ay"; + }) # Unfortunately inclusion in upstream sage was rejected. Instead the bug was # fixed in python, but of course not backported to 2.7. So we'll probably diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/client.nix b/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/client.nix index 9a29fde0a4..74a53902ee 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/client.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/client.nix @@ -10,7 +10,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.5.1"; + version = "7.6.9"; fahclient = stdenv.mkDerivation rec { inherit version; @@ -18,7 +18,7 @@ let src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v${majMin}/fahclient_${version}_amd64.deb"; - hash = "sha256-7+RwYdMoZnJZwYFbmLxsN9ozk2P7jpOGZz9qlvTTfSY="; + sha256 = "1v4yijjjdq9qx1fp60flp9ya6ywl9qdsgkzwmzjzp8sd5gfvhyr6"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix b/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix index e8eba4c2ab..72217689ff 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix @@ -8,7 +8,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.5.1"; + version = "7.6.9"; python = python2.withPackages ( @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahcontrol/debian-stable-64bit/v${majMin}/fahcontrol_${version}-1_all.deb"; - hash = "sha256-ydN4I6vmZpI9kD+/TXxgWc+AQqIIlUvABEycWmY1tNg="; + sha256 = "1fh7ybbp3qlqzh18c4gva3aaymv7d31mqchrv235a1axldha1s9s"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/viewer.nix b/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/viewer.nix index 03fa54cd73..a35df65030 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -11,7 +11,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.5.1"; + version = "7.6.9"; in stdenv.mkDerivation rec { inherit version; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahviewer/debian-stable-64bit/v${majMin}/fahviewer_${version}_amd64.deb"; - hash = "sha256-yH0zGjX8aNBEJ5lq7wWydcpp2rO+9Ah++q9eJ+ldeyk="; + sha256 = "04wr86g11wpmsczzwzak4gvalcihb47rn3zp6qriawhxyac9nf93"; }; nativeBuildInputs = [ 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 839fc8f954..5d592c233b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/rink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/rink/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Unit-aware calculator"; - homepage = "http://rink.tiffnix.com"; + homepage = "https://rink.tiffnix.com"; license = with licenses; [ mpl20 gpl3 ]; maintainers = with maintainers; [ sb0 filalex77 ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix index 34bdaf6bac..af4e225ca3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "5.13.0"; + version = "5.15.0"; propagatedBuildInputs = with python3Packages; [ appdirs @@ -22,13 +22,13 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "11snr7sgv70d3y63s5svijfx8f4xpggh96g8chr6lccl4mi1s9x9"; + sha256 = "10cd1k5vg8ra5fnpqpdbl04qwx6h2mmmqbn71pl8j69w9110dkys"; }; doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json meta = with stdenv.lib; { - homepage = "http://snakemake.bitbucket.io"; + homepage = "https://snakemake.readthedocs.io"; license = licenses.mit; description = "Python-based execution environment for make-like workflows"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix new file mode 100644 index 0000000000..642982830f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, cmake, git, gfortran, openmpi, blas, liblapack, qt4, qwt6_qt4, pkg-config }: + +stdenv.mkDerivation rec { + pname = "elmerfem"; + version = "8.4"; + + src = fetchFromGitHub { + owner = "elmercsc"; + repo = "elmerfem"; + rev = "release-${version}"; + sha256 = "0vk31lplxlng173q8jjcpbyj1gaf98jvkqjvi9077d1nslya7vpm"; + }; + + hardeningDisable = [ "format" ]; + + nativeBuildInputs = [ cmake pkg-config git ]; + buildInputs = [ gfortran openmpi blas liblapack qt4 qwt6_qt4 ]; + + preConfigure = '' + patchShebangs ./ + ''; + + storepath = placeholder "out"; + + cmakeFlags = [ + "-DELMER_INSTALL_LIB_DIR=${storepath}/lib" + "-DWITH_OpenMP:BOOLEAN=TRUE" + "-DWITH_MPI:BOOLEAN=TRUE" + "-DWITH_ELMERGUI:BOOLEAN=TRUE" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_OpenGL_GL_PREFERENCE=GLVND" + ]; + + patches = [ + ./fix-cmake.patch + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://www.elmerfem.org/; + description = "A finite element software for multiphysical problems."; + platforms = platforms.unix; + maintainers = [ maintainers.wulfsta ]; + license = licenses.lgpl21; + }; + +} diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/fix-cmake.patch b/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/fix-cmake.patch new file mode 100644 index 0000000000..098f652073 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/fix-cmake.patch @@ -0,0 +1,13 @@ +diff --exclude '*~' -ruN A/torch/CMakeLists.txt B/torch/CMakeLists.txt +--- A/fem/tests/CMakeLists.txt 2020-04-23 02:35:03.243388917 -0400 ++++ B/fem/tests/CMakeLists.txt 2018-12-19 20:18:40.671857320 -0400 +@@ -14,7 +14,7 @@ + SET(MESH2D_BIN "${CMAKE_BINARY_DIR}/meshgen2d/src/Mesh2D") + + MACRO(SUBDIRLIST result curdir depth) + set(glob_pattern "*") +- FOREACH(D RANGE 1 depth) ++ FOREACH(D RANGE 1 ${depth}) + FILE(GLOB children RELATIVE ${curdir} ${glob_pattern}) + FOREACH(child ${children}) + IF(IS_DIRECTORY ${curdir}/${child}) diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix index 85b2ddd4d0..314fc52250 100644 --- a/third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sherpa"; - version = "2.2.8"; + version = "2.2.9"; src = fetchurl { url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; - sha256 = "1al1imdrknvbcy8k113xysc14lln4msbv281bf0kx7p73wz59mv3"; + sha256 = "1z7vws97k6zfzyqx0dkv2kq8d83dibi73i5jiqk5a22yplp6bnjh"; }; buildInputs = [ gfortran sqlite lhapdf rivet ]; @@ -21,13 +21,11 @@ stdenv.mkDerivation rec { "--enable-rivet=${rivet}" ]; - CXXFLAGS = "-std=c++11"; # needed for rivet on OSX - - meta = { + meta = with stdenv.lib; { description = "Simulation of High-Energy Reactions of PArticles in lepton-lepton, lepton-photon, photon-photon, lepton-hadron and hadron-hadron collisions"; - license = stdenv.lib.licenses.gpl2; - homepage = "https://gitlab.com/sherpa-team/sherpa"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + license = licenses.gpl2; + homepage = "https://gitlab.com/sherpa-team/sherpa"; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/gazebo/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/gazebo/default.nix index aea298b654..86572e73c7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/gazebo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/gazebo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, boost, protobuf, freeimage , boost-build, boost_process , xorg_sys_opengl, tbb, ogre, tinyxml-2 - , libtar, glxinfo, libusb, libxslt, ignition + , libtar, glxinfo, libusb-compat-0_1, libxslt, ignition , pythonPackages, utillinux # these deps are hidden; cmake doesn't catch them @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { tinyxml-2 libtar glxinfo - libusb + libusb-compat-0_1 libxslt ignition.math2 sdformat diff --git a/third_party/nixpkgs/pkgs/applications/version-management/arch/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/arch/default.nix index d41040f49a..c161d8446a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/arch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/arch/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, which, diffutils, gnupatch, gnutar }: stdenv.mkDerivation rec { - name = "tla-1.3.5"; - + pname = "tla"; + version = "1.3.5"; + src = fetchurl { - url = "https://ftp.gnu.org/old-gnu/gnu-arch/" + name + ".tar.gz"; + url = "https://ftp.gnu.org/old-gnu/gnu-arch/tla-${version}.tar.gz"; sha256 = "01mfzj1i6p4s8191cgd5850hds1zls88hkf9rb6qx1vqjv585aj0"; }; patches = [ ./configure-tmpdir.patch ]; - buildInputs = [which]; - - propagatedBuildInputs = [diffutils gnupatch gnutar]; + buildInputs = [ which ]; + + propagatedBuildInputs = [ diffutils gnupatch gnutar ]; # Instead of GNU Autoconf, tla uses Tom Lord's now # defunct `package-framework'. diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix index 4d6b0511a2..c591ef554e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix @@ -173,6 +173,10 @@ let gitstatus = callPackage ./gitstatus { }; + gitui = callPackage ./gitui { + inherit (darwin.apple_sdk.frameworks) Security; + }; + grv = callPackage ./grv { }; hub = callPackage ./hub { }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix index 7bdeae6589..60950dc046 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -1,20 +1,26 @@ -{ lib, fetchFromGitHub, rustPlatform, llvmPackages }: +{ lib, fetchFromGitHub, rustPlatform, llvmPackages, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.0.18"; + version = "0.1.1"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "0cpd60861k9nd2gbzyb2hg5npnkgvsnyrvv7mlm30vb1833gz94z"; + sha256 = "1b5ap468d0gvgwkx6wqxvayzda2xw95lymd0kl38nq1fc0ica6hk"; }; LLVM_CONFIG_PATH = "${llvmPackages.llvm}/bin/llvm-config"; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - cargoSha256 = "12gl50q5hf6nq571fqxfv61z4mwfjyw4jb2yqyqbsinwj2frwaxn"; + cargoSha256 = "07mjl751r9d88fnmnan0ip0m3vxqf51vq2y7k3g3yywcgasj9jgr"; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --bash --name delta.bash completion/bash/completion.sh + ''; meta = with lib; { homepage = "https://github.com/dandavison/delta"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix index 5c3b27ad61..93d152baa0 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, darwin }: +{ stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkgconfig, openssl, darwin }: with rustPlatform; @@ -15,7 +15,7 @@ buildRustPackage rec { cargoSha256 = "0vcg2pl0s329fr8p23pwdx2jy7qahbr7n337ib61f69aaxi1xmq0"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig installShellFiles ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security @@ -23,8 +23,7 @@ buildRustPackage rec { outputs = [ "out" "man" ]; preFixup = '' - mkdir -p "$man/man/man1" - cp target/release/build/git-ignore-*/out/git-ignore.1 "$man/man/man1/" + installManPage $releaseDir/build/git-ignore-*/out/git-ignore.1 ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix index 54f0f744c0..8b8dbef12a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.26.1"; + version = "2.26.2"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0s03ix9j1h0yychkh1l1cgpr1l9lwzn3rprl08rk8ii5ix02i0l8"; + sha256 = "0j685w6pzkn926z5nf5r8fij4ziipvw4c9yb0wc577nzf4j16rbd"; }; outputs = [ "out" ]; @@ -335,6 +335,7 @@ stdenv.mkDerivation { homepage = "https://git-scm.com/"; description = "Distributed version control system"; license = stdenv.lib.licenses.gpl2; + changelog = "https://raw.githubusercontent.com/git/git/${version}/Documentation/RelNotes/${version}.txt"; longDescription = '' Git, a popular distributed version control system designed to 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 26b736b8b6..eab382386e 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 @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "gitstatus"; - version = "unstable-2020-03-15"; + version = "unstable-2020-04-21"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; - rev = "c07996bc3ea1912652f52a816b830a5a3ee9b49c"; - sha256 = "07s8hwx3i5mnafi2xfim44z3q2nsvlcibfdxj17w8mkjhfpywi00"; + rev = "3494f25b0b3b2eac241cf669d1fea2b49ea42fb3"; + sha256 = "0b4g14dkkgih6zps2w1krl9xf44ysj02617zj1k51z127v2lpm1f"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix new file mode 100644 index 0000000000..f215b7986f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -0,0 +1,24 @@ +{ stdenv, rustPlatform, fetchFromGitHub, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "gitui"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "extrawurst"; + repo = pname; + rev = "v${version}"; + sha256 = "06x4a7ynq6vznjwdm0dhzlj9353skxz65xabwr5xxa85zp2a7vcm"; + }; + + cargoSha256 = "08z3z1m0ik62gzj146a4imk4xx5n8sbvjs0w7gkclvlsvm9dp8q4"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + + meta = with stdenv.lib; { + description = "Blazing fast terminal-ui for git written in rust"; + homepage = "https://github.com/extrawurst/gitui"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix index 8890cd5eb2..9dbb497c8c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, groff, utillinux }: +{ stdenv, buildGoPackage, fetchFromGitHub, groff, installShellFiles, utillinux }: buildGoPackage rec { pname = "hub"; @@ -16,7 +16,7 @@ buildGoPackage rec { sha256 = "1qjab3dpia1jdlszz3xxix76lqrm4zbmqzd9ymld7h06awzsg2vh"; }; - nativeBuildInputs = [ groff utillinux ]; + nativeBuildInputs = [ groff installShellFiles utillinux ]; postPatch = '' patchShebangs . @@ -24,13 +24,13 @@ buildGoPackage rec { postInstall = '' cd go/src/${goPackagePath} - install -D etc/hub.zsh_completion "$bin/share/zsh/site-functions/_hub" - install -D etc/hub.bash_completion.sh "$bin/share/bash-completion/completions/hub" - install -D etc/hub.fish_completion "$bin/share/fish/vendor_completions.d/hub.fish" + installShellCompletion --zsh --name _hub etc/hub.zsh_completion + installShellCompletion --bash --name hub etc/hub.bash_completion.sh + installShellCompletion --fish --name hub.fish etc/hub.fish_completion LC_ALL=C.UTF8 \ make man-pages - cp -vr --parents share/man/man[1-9]/*.[1-9] $bin/ + installManPage share/man/man[1-9]/*.[1-9] ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/1.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/1.nix index 0e0d75b091..5b2a9906a4 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/1.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/1.nix @@ -4,7 +4,7 @@ buildGoPackage rec { pname = "git-lfs"; version = "1.5.6"; rev = "0d02fb7d9a1c599bbf8c55e146e2845a908e04e0"; - + goPackagePath = "github.com/git-lfs/git-lfs"; src = fetchFromGitHub { @@ -14,8 +14,7 @@ buildGoPackage rec { sha256 = "0wddry1lqjccf4522fvhx6grx8h57xsz17lkaf5aybnrgw677w3d"; }; - # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block' - excludedPackages = [ "test" ]; + subPackages = [ "." ]; preBuild = '' pushd go/src/github.com/git-lfs/git-lfs @@ -23,9 +22,6 @@ buildGoPackage rec { popd ''; - postInstall = '' - rm -v $bin/bin/{man,script} - ''; meta = with stdenv.lib; { description = "Git extension for versioning large files"; homepage = "https://git-lfs.github.com/"; 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 eca841350d..cdd7cd01d0 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 @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, ronn, installShellFiles }: -buildGoModule rec { +buildGoPackage rec { pname = "git-lfs"; version = "2.10.0"; @@ -11,14 +11,26 @@ buildGoModule rec { sha256 = "1y5ryk0iz5g5sqaw79ml6fr5kvjgzcah481pk5qmnb2ipb1xlng9"; }; - modSha256 = "1rvvgyg4gqbli4pwfnmyz59gf14k7925mdqj6ykp542gwnsjgjp2"; + goPackagePath = "github.com/git-lfs/git-lfs"; + + nativeBuildInputs = [ ronn installShellFiles ]; + + buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/config.Vendor=${version} -X ${goPackagePath}/config.GitCommit=${src.rev}" ]; subPackages = [ "." ]; + postBuild = '' + make -C go/src/${goPackagePath} man + ''; + + postInstall = '' + installManPage go/src/${goPackagePath}/man/*.{1,5} + ''; + meta = with stdenv.lib; { description = "Git extension for versioning large files"; homepage = "https://git-lfs.github.com/"; license = [ licenses.mit ]; - maintainers = [ maintainers.twey ]; + maintainers = [ maintainers.twey maintainers.marsam ]; }; } 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 8da56229a0..d3f2db5e5a 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": "12.8.8", - "repo_hash": "1y8flmssz8bp07v7x9gxazqn5889hvkxk0k6py773gdnna5fd5fb", + "version": "12.8.10", + "repo_hash": "1njkihj66d8fnk1l0r5pys38akf5srqlrgj2hzc68l5m8d51dk15", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.8.8-ee", + "rev": "v12.8.10-ee", "passthru": { - "GITALY_SERVER_VERSION": "12.8.8", + "GITALY_SERVER_VERSION": "12.8.10", "GITLAB_PAGES_VERSION": "1.16.0", "GITLAB_SHELL_VERSION": "11.0.0", - "GITLAB_WORKHORSE_VERSION": "8.21.1" + "GITLAB_WORKHORSE_VERSION": "8.21.2" } } \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index b41c78f3a3..0c125f5a0b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -114,7 +114,7 @@ GEM minitest (5.14.0) msgpack (1.3.1) multipart-post (2.0.0) - nokogiri (1.10.7) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri 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 45e7db5be8..5e3eac19df 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 @@ -28,14 +28,14 @@ let }; }); in buildGoPackage rec { - version = "12.8.8"; + version = "12.8.10"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "182jqglzbzq8jnlq6l634125jkvi67pfr1xck68n4k09gyzqllxv"; + sha256 = "1vhnpyggh2ch93i75np11rjzvq8d6pwv2kzvwh7ak3fa02w9qdfs"; }; # Fix a check which assumes that hook files are writeable by their diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index d91c84b1fa..7719a90abb 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -515,10 +515,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln"; + sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; type = "gem"; }; - version = "1.10.7"; + version = "1.10.9"; }; nokogumbo = { dependencies = ["nokogiri"]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 491dd868dd..dda6783356 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { pname = "gitlab-workhorse"; - version = "8.21.1"; + version = "8.21.2"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1d384xw7hfrph4i61z9z315sik7ja9hgrvmhljirwxrch1fyx3m4"; + sha256 = "065yy8zfxahpybk3mbvc492by1lvssqcbqm8i4yp09m669rk239w"; }; goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 20c713e8c3..e8a58a6d59 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -163,7 +163,7 @@ gem 'diffy', '~> 3.1.0' gem 'diff_match_patch', '~> 0.1.0' # Application server -gem 'rack', '~> 2.0.7' +gem 'rack', '~> 2.0.9' group :unicorn do gem 'unicorn', '~> 5.4.1' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index a808e85e43..4d7b3d32a6 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -173,7 +173,7 @@ GEM concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) connection_pool (2.2.2) contracts (0.11.0) cork (0.3.0) @@ -783,7 +783,7 @@ GEM public_suffix (4.0.3) pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) - rack (2.0.7) + rack (2.0.9) rack-accept (0.4.5) rack (>= 0.4) rack-attack (6.2.0) @@ -854,17 +854,17 @@ GEM json recursive-open-struct (1.1.0) redis (4.1.3) - redis-actionpack (5.1.0) - actionpack (>= 4.0, < 7) - redis-rack (>= 1, < 3) + redis-actionpack (5.2.0) + actionpack (>= 5, < 7) + redis-rack (>= 2.1.0, < 3) redis-store (>= 1.1.0, < 2) redis-activesupport (5.2.0) activesupport (>= 3, < 7) redis-store (>= 1.3, < 2) redis-namespace (1.6.0) redis (>= 3.0.4) - redis-rack (2.0.6) - rack (>= 1.5, < 3) + redis-rack (2.1.2) + rack (>= 2.0.8, < 3) redis-store (>= 1.2, < 2) redis-rails (5.0.2) redis-actionpack (>= 5.0, < 6) @@ -1325,7 +1325,7 @@ DEPENDENCIES prometheus-client-mmap (~> 0.10.0) pry-byebug (~> 3.5.1) pry-rails (~> 0.3.9) - rack (~> 2.0.7) + rack (~> 2.0.9) rack-attack (~> 6.2.0) rack-cors (~> 1.0.6) rack-oauth2 (~> 1.9.3) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index f92b72361d..dec89c43a8 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -763,10 +763,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; type = "gem"; }; - version = "1.1.5"; + version = "1.1.6"; }; connection_pool = { groups = ["default"]; @@ -3501,10 +3501,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i"; + sha256 = "1mxzk12xylrz6d4n9jj5jasfscbf1pbk4idrb0nlf327lx9rwfkk"; type = "gem"; }; - version = "2.0.7"; + version = "2.0.9"; }; rack-accept = { dependencies = ["rack"]; @@ -3803,10 +3803,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hvai5ygkyii9wq8h98wim8shgrm7vkv0js62zpm85vdl1xzvphz"; + sha256 = "0c2276zzc0044zh37a8frx1v7hnra7z7k126154ps7njbqngfdv3"; type = "gem"; }; - version = "5.1.0"; + version = "5.2.0"; }; redis-activesupport = { dependencies = ["activesupport" "redis-store"]; @@ -3836,10 +3836,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pa19ydbk0l6wilwbxcjn6knfs4ffgj0rhaaldrlhf76pjgkaiqb"; + sha256 = "0ldw5sxyd80pv0gr89kvn6ziszlbs8lv1a573fkm6d0f11fps413"; type = "gem"; }; - version = "2.0.6"; + version = "2.1.2"; }; redis-rails = { dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py index a2a3a6d05b..4c7bcefacb 100755 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix +#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.click python3Packages.click-log vgo2nix yarn2nix import click import click_log @@ -13,7 +13,6 @@ from distutils.version import LooseVersion from typing import Iterable import requests -from xml.etree import ElementTree logger = logging.getLogger(__name__) @@ -30,12 +29,11 @@ class GitLabRepo: @property def tags(self) -> Iterable[str]: - r = requests.get(self.url + "/tags?format=atom", stream=True) + r = requests.get(self.url + "/refs?sort=updated_desc&ref=master").json() + tags = r.get("Tags", []) - tree = ElementTree.fromstring(r.content) - versions = [e.text for e in tree.findall('{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}title')] # filter out versions not matching version_regex - versions = list(filter(self.version_regex.match, versions)) + versions = list(filter(self.version_regex.match, tags)) # sort, but ignore v and -ee for sorting comparisons versions.sort(key=lambda x: LooseVersion(x.replace("v", "").replace("-ee", "")), reverse=True) @@ -100,7 +98,7 @@ def cli(): @cli.command('update-data') -@click.option('--rev', default='latest', help='The rev to use, \'latest\' points to the latest (stable) tag') +@click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'') def update_data(rev: str): """Update data.nix""" repo = GitLabRepo() @@ -135,6 +133,7 @@ def update_rubyenv(): with open(rubyenv_dir / fn, 'w') as f: f.write(repo.get_file(fn, rev)) + subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir) subprocess.check_output(['bundix'], cwd=rubyenv_dir) @@ -174,6 +173,7 @@ def update_gitaly(): with open(gitaly_dir / fn, 'w') as f: f.write(repo.get_file(fn, f"v{gitaly_server_version}")) + subprocess.check_output(['bundle', 'lock'], cwd=gitaly_dir) subprocess.check_output(['bundix'], cwd=gitaly_dir) os.environ['GOROOT'] = "" @@ -227,10 +227,11 @@ def update_gitlab_workhorse(): os.unlink(gitlab_workhorse_dir / fn) @cli.command('update-all') +@click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'') @click.pass_context -def update_all(ctx): +def update_all(ctx, rev: str): """Update all gitlab components to the latest stable release""" - ctx.invoke(update_data, rev='latest') + ctx.invoke(update_data, rev=rev) ctx.invoke(update_rubyenv) ctx.invoke(update_yarnpkgs) ctx.invoke(update_gitaly) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix index 85c5461474..ffbd987913 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix @@ -8,11 +8,11 @@ let in python3Packages.buildPythonApplication rec { pname = "mercurial"; - version = "5.3"; + version = "5.3.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "1fgr8k2ra7hs2dm8048pw01anmd41as246a5vm4m2sb7dcfzczz5"; + sha256 = "1nbjpzjrzgql4hrvslpxwbcgn885ikq6ba1yb4w6p78rw9nzkhgp"; }; format = "other"; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix index c83705ac41..e4da20c848 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix @@ -25,7 +25,7 @@ , rtmpSupport ? true, rtmpdump ? null , sambaSupport ? true, samba ? null , udevSupport ? true, udev ? null -, usbSupport ? false, libusb ? null +, usbSupport ? false, libusb-compat-0_1 ? null , vdpauSupport ? true, libvdpau ? null , useWayland ? false, wayland ? null, wayland-protocols ? null , waylandpp ? null, libxkbcommon ? null @@ -39,7 +39,7 @@ assert pulseSupport -> libpulseaudio != null; assert rtmpSupport -> rtmpdump != null; assert sambaSupport -> samba != null; assert udevSupport -> udev != null; -assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable +assert usbSupport -> libusb-compat-0_1 != null && ! udevSupport; # libusb-compat-0_1 won't be used if udev is avaliable assert vdpauSupport -> libvdpau != null; assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null; @@ -189,7 +189,7 @@ in stdenv.mkDerivation { ++ lib.optional rtmpSupport rtmpdump ++ lib.optional sambaSupport samba ++ lib.optional udevSupport udev - ++ lib.optional usbSupport libusb + ++ lib.optional usbSupport libusb-compat-0_1 ++ lib.optional vdpauSupport libvdpau ++ lib.optionals useWayland [ wayland diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch b/third_party/nixpkgs/pkgs/applications/video/obs-studio/0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch deleted file mode 100644 index b642fbc3ad..0000000000 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5798a2691467604e89fd9fb1cd5289ebd1b1d7b8 Mon Sep 17 00:00:00 2001 -From: Graham Christensen -Date: Fri, 20 Mar 2020 22:32:02 -0400 -Subject: [PATCH] find ObsPluginHelpers.cmake in the obs src - ---- - external/FindLibObs.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/external/FindLibObs.cmake b/external/FindLibObs.cmake -index ab0a3de..53a46b8 100644 ---- a/external/FindLibObs.cmake -+++ b/external/FindLibObs.cmake -@@ -95,7 +95,7 @@ if(LIBOBS_FOUND) - - set(LIBOBS_INCLUDE_DIRS ${LIBOBS_INCLUDE_DIR} ${W32_PTHREADS_INCLUDE_DIR}) - set(LIBOBS_LIBRARIES ${LIBOBS_LIB} ${W32_PTHREADS_LIB}) -- include(${LIBOBS_INCLUDE_DIR}/../cmake/external/ObsPluginHelpers.cmake) -+ include(${OBS_SRC}/cmake/external/ObsPluginHelpers.cmake) - - # allows external plugins to easily use/share common dependencies that are often included with libobs (such as FFmpeg) - if(NOT DEFINED INCLUDED_LIBOBS_CMAKE_MODULES) --- -2.25.0 - 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 19cfbf1407..97eae68b6e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/v4l2sink.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/v4l2sink.nix @@ -1,42 +1,55 @@ -{ stdenv, fetchFromGitHub -, cmake, pkgconfig, wrapQtAppsHook -, obs-studio }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, qtbase +, obs-studio +}: -stdenv.mkDerivation { - pname = "obs-v4l2sink-unstable"; - version = "20181012"; +stdenv.mkDerivation rec { + pname = "obs-v4l2sink"; + version = "0.1.0"; src = fetchFromGitHub { owner = "CatxFish"; repo = "obs-v4l2sink"; - rev = "1ec3c8ada0e1040d867ce567f177be55cd278378"; - sha256 = "03ah91cm1qz26k90mfx51l0d598i9bcmw39lkikjs1msm4c9dfxx"; + rev = version; + sha256 = "0l4lavaywih5lzwgxcbnvdrxhpvkrmh56li06s3aryikngxwsk3z"; }; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; - buildInputs = [ obs-studio ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase obs-studio ]; patches = [ - ./0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch + # Fixes the segfault when stopping the plugin + (fetchpatch { + url = "https://github.com/CatxFish/obs-v4l2sink/commit/6604f01796d1b84a95714730ea51a6b8ac0e450b.diff"; + sha256 = "0crcvw02dj0aqy7hnhizjdsnhiw03zmg6cbdkasxz2mrrbyc3s88"; + }) ]; - cmakeFlags = [ - "-DLIBOBS_INCLUDE_DIR=${obs-studio}/include/obs" - "-DLIBOBS_LIBRARIES=${obs-studio}/lib" - "-DCMAKE_CXX_FLAGS=-I${obs-studio.src}/UI/obs-frontend-api" - "-DOBS_SRC=${obs-studio.src}" + cmakeFlags = with lib; [ + "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs" ]; - installPhase = '' - mkdir -p $out/share/obs/obs-plugins/v4l2sink/bin/64bit - cp ./v4l2sink.so $out/share/obs/obs-plugins/v4l2sink/bin/64bit/ + # obs-studio expects the shared object to be located in bin/32bit or bin/64bit + # https://github.com/obsproject/obs-studio/blob/d60c736cb0ec0491013293c8a483d3a6573165cb/libobs/obs-nix.c#L48 + postInstall = let + pluginPath = { + i686-linux = "bin/32bit"; + x86_64-linux = "bin/64bit"; + }.${stdenv.targetPlatform.system} or (throw "Unsupported system: ${stdenv.targetPlatform.system}"); + in '' + mkdir -p $out/share/obs/obs-plugins/v4l2sink/${pluginPath} + ln -s $out/lib/obs-plugins/v4l2sink.so $out/share/obs/obs-plugins/v4l2sink/${pluginPath} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "obs studio output plugin for Video4Linux2 device"; homepage = "https://github.com/CatxFish/obs-v4l2sink"; - maintainers = with maintainers; [ colemickens ]; + maintainers = with maintainers; [ colemickens peelz ]; license = licenses.gpl2; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/qstopmotion/default.nix b/third_party/nixpkgs/pkgs/applications/video/qstopmotion/default.nix index 4a6d2a05a6..98af60c493 100644 --- a/third_party/nixpkgs/pkgs/applications/video/qstopmotion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/qstopmotion/default.nix @@ -1,6 +1,26 @@ -{ mkDerivation, stdenv, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2 -, gettext, pkgconfig, libgphoto2, gphoto2, v4l-utils, libv4l, pcre -, qwt, extra-cmake-modules }: +{ stdenv +, mkDerivation +, fetchurl +, qtbase +, qtmultimedia +, qtquickcontrols +, qtimageformats +, qtxmlpatterns +, ffmpeg +, guvcview +, cmake +, ninja +, libxml2 +, gettext +, pkgconfig +, libgphoto2 +, gphoto2 +, v4l-utils +, libv4l +, pcre +, qwt +, extra-cmake-modules +}: mkDerivation rec { pname = "qstopmotion"; @@ -11,11 +31,31 @@ mkDerivation rec { sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh"; }; - buildInputs = with qt5; [ v4l-utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview - qwt qtquickcontrols qtimageformats qtxmlpatterns ]; + buildInputs = [ + qtbase + qtmultimedia + qtquickcontrols + qtimageformats + qtxmlpatterns + v4l-utils + libv4l + pcre + ffmpeg + guvcview + qwt + ]; - nativeBuildInputs = [ pkgconfig cmake extra-cmake-modules ninja - gettext libgphoto2 gphoto2 libxml2 libv4l ]; + nativeBuildInputs = [ + pkgconfig + cmake + extra-cmake-modules + ninja + gettext + libgphoto2 + gphoto2 + libxml2 + libv4l + ]; patchPhase = '' substituteInPlace CMakeLists.txt \ @@ -36,6 +76,7 @@ mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ maintainers.leenaars ]; + broken = stdenv.isAarch64; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/tartube/default.nix b/third_party/nixpkgs/pkgs/applications/video/tartube/default.nix new file mode 100644 index 0000000000..ae222ae05a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/tartube/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, lib +, fetchFromGitHub +, gdk-pixbuf +, gobject-introspection +, gtk3 +, libnotify +, pango +, python3Packages +, wrapGAppsHook +, youtube-dl +, glib +}: + +python3Packages.buildPythonApplication rec { + pname = "tartube"; + version = "2.0.016"; + + src = fetchFromGitHub { + owner = "axcore"; + repo = "tartube"; + rev = "v${version}"; + sha256 = "1y77ykihyi4v6xlsm5xldbs9lzq229l574rxz6qfvrjcbbwajfj9"; + }; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + + strictDeps = false; + + propagatedBuildInputs = with python3Packages; [ + moviepy + pygobject3 + pyxdg + requests + ]; + + buildInputs = [ + gdk-pixbuf + gtk3 + glib + libnotify + pango + ]; + + postInstall = '' + mkdir -p $out/share/{man/man1,applications,pixmaps} + cp pack/tartube.1 $out/share/man/man1 + cp pack/tartube.desktop $out/share/applications + cp pack/tartube.{png,xpm} $out/share/pixmaps + ''; + + doCheck = false; + + makeWrapperArgs = [ + "--prefix PATH : ${stdenv.lib.makeBinPath [ youtube-dl ]}" + ]; + + meta = with lib; { + description = "A GUI front-end for youtube-dl"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ mkg20001 luc65r ]; + homepage = "https://tartube.sourceforge.io/"; + }; +} 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 74a316ef52..7d866cd71b 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix @@ -16,11 +16,9 @@ , which }: -let - buildTags = "apparmor seccomp selinux containers_image_ostree_stub"; -in buildGoPackage rec { +buildGoPackage rec { project = "cri-o"; - version = "1.17.3"; + version = "1.18.0"; name = "${project}-${version}${flavor}"; goPackagePath = "github.com/${project}/${project}"; @@ -29,7 +27,7 @@ in buildGoPackage rec { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "1cy2lqasfn5n20vlm3ckb6myci8ya6qv08dw8fq7z4ycnm39r1a6"; + sha256 = "142flmv54pj48rjqkd26fbxrcbx2cv6pdmrc33jgyvn6r99zliah"; }; outputs = [ "bin" "out" ]; @@ -38,13 +36,11 @@ in buildGoPackage rec { libseccomp libselinux lvm2 ] ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ]; + BUILDTAGS = "apparmor seccomp selinux containers_image_ostree_stub"; buildPhase = '' pushd go/src/${goPackagePath} - make BUILDTAGS='${buildTags}' \ - bin/crio \ - bin/crio-status \ - bin/pinns + make binaries BUILDTAGS="$BUILDTAGS" ''; installPhase = '' install -Dm755 bin/crio $bin/bin/crio${flavor} diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch b/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch index 043c1efade..9ae8d6b5e7 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch +++ b/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch @@ -71,10 +71,10 @@ index 33d78dd..2b087db 100644 #endif /* HEADER_LDCACHE_H */ diff --git a/src/nvc_info.c b/src/nvc_info.c -index cc96542..3fe7612 100644 +index 30e3cfd..6d12a50 100644 --- a/src/nvc_info.c +++ b/src/nvc_info.c -@@ -163,15 +163,13 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * +@@ -167,15 +167,13 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * if (path_resolve_full(err, path, root, ldcache) < 0) return (-1); ldcache_init(&ld, err, path); @@ -91,7 +91,7 @@ index cc96542..3fe7612 100644 goto fail; info->nlibs32 = size; -@@ -179,13 +177,11 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * +@@ -183,13 +181,11 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * if (info->libs32 == NULL) goto fail; if (ldcache_resolve(&ld, LIB32_ARCH, root, libs, @@ -106,7 +106,7 @@ index cc96542..3fe7612 100644 return (rv); } -@@ -199,7 +195,7 @@ find_binary_paths(struct error *err, struct nvc_driver_info *info, const char *r +@@ -203,7 +199,7 @@ find_binary_paths(struct error *err, struct nvc_driver_info *info, const char *r char path[PATH_MAX]; int rv = -1; @@ -116,10 +116,10 @@ index cc96542..3fe7612 100644 return (-1); } diff --git a/src/nvc_ldcache.c b/src/nvc_ldcache.c -index d41a24d..65b7878 100644 +index 6ff380f..cbe6a69 100644 --- a/src/nvc_ldcache.c +++ b/src/nvc_ldcache.c -@@ -331,7 +331,7 @@ nvc_ldcache_update(struct nvc_context *ctx, const struct nvc_container *cnt) +@@ -340,7 +340,7 @@ nvc_ldcache_update(struct nvc_context *ctx, const struct nvc_container *cnt) if (validate_args(ctx, cnt != NULL) < 0) return (-1); diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc.nix index f2c9eda75f..5b97d7fffa 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, libelf, libcap, libseccomp }: +{ stdenv, lib, fetchFromGitHub, pkgconfig, libelf, libcap, libseccomp }: with lib; let @@ -13,13 +13,13 @@ with lib; let in stdenv.mkDerivation rec { pname = "libnvidia-container"; - version = "1.0.0"; + version = "1.0.6"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "libnvidia-container"; rev = "v${version}"; - sha256 = "1ws6mfsbgxhzlb5w1r8qqg2arvxkr21n59i4cqsyz3h5jsqsflbw"; + sha256 = "1pnpc9knwh8d1zqb28zc3spkjc00w0z10vd3jna8ksvpl35jl7w3"; }; # locations of nvidia-driver libraries are not resolved via ldconfig which @@ -42,6 +42,8 @@ in stdenv.mkDerivation rec { touch deps/src/nvidia-modprobe-${modp-ver}/.download_stamp ''; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libelf libcap libseccomp ]; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix index 2c1ad0b429..8ca193194b 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -14,13 +14,13 @@ buildGoPackage rec { pname = "podman"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "containers"; repo = "libpod"; rev = "v${version}"; - sha256 = "19y48lpf7pvw5f5pzpknn92rq9xwbrpvi8mj7mc4dby6skqadrk4"; + sha256 = "0dr5vd52fnjwx3zn2nj2nlvkbvh5bg579nf3qw8swrn8i1jwxd6j"; }; goPackagePath = "github.com/containers/libpod"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix new file mode 100644 index 0000000000..0b905c0c70 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix @@ -0,0 +1,48 @@ +{ podman-unwrapped +, runCommand +, makeWrapper +, lib +, extraPackages ? [] +, podman # Docker compat +, runc # Default container runtime +, crun # Default container runtime (cgroups v2) +, conmon # Container runtime monitor +, slirp4netns # User-mode networking for unprivileged namespaces +, fuse-overlayfs # CoW for images, much faster than default vfs +, utillinux # nsenter +, cni-plugins +, iptables +}: + +let + podman = podman-unwrapped; + + binPath = lib.makeBinPath ([ + runc + crun + conmon + slirp4netns + fuse-overlayfs + utillinux + iptables + ] ++ extraPackages); + +in runCommand podman.name { + inherit (podman) name pname version meta outputs; + nativeBuildInputs = [ + makeWrapper + ]; + +} '' + # Symlink everything but $bin from podman-unwrapped + ${ + lib.concatMapStringsSep "\n" + (o: "ln -s ${podman.${o}} ${placeholder o}") + (builtins.filter (o: o != "bin") + podman.outputs)} + + mkdir -p $bin/bin + ln -s ${podman-unwrapped}/share $bin/share + makeWrapper ${podman-unwrapped}/bin/podman $bin/bin/podman \ + --prefix PATH : ${binPath} +'' diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix index 39a1f6faea..8738502496 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix @@ -24,8 +24,6 @@ buildGoPackage rec { goPackagePath = "github.com/opencontainers/runc"; outputs = [ "bin" "out" "man" ]; - hardeningDisable = [ "fortify" ]; - nativeBuildInputs = [ go-md2man installShellFiles pkg-config which ]; buildInputs = [ libseccomp libapparmor apparmor-parser ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/spike/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/spike/default.nix index 4dbb7fbe4a..0f397bc272 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/spike/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/spike/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, dtc }: +{ stdenv, fetchgit, dtc, nixosTests }: stdenv.mkDerivation rec { pname = "spike"; @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests = { + can-run-hello-world = nixosTests.spike; + }; + meta = with stdenv.lib; { description = "A RISC-V ISA Simulator"; homepage = "https://github.com/riscv/riscv-isa-sim"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix index df7b81a43c..7b7929d9f1 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix @@ -3,6 +3,9 @@ , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras , qttools, qtsvg, qtwayland, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 , alsaLib, curl, libvpx, nettools, dbus, substituteAll, fetchpatch +# If open-watcom-bin is not passed, VirtualBox will fall back to use +# the shipped alternative sources (assembly). +, open-watcom-bin ? null , makeself, perl , javaBindings ? true, jdk ? null # Almost doesn't affect closure size , pythonBindings ? false, python3 ? null @@ -148,6 +151,7 @@ in stdenv.mkDerivation { ${optionalString (!pulseSupport) "--disable-pulse"} \ ${optionalString (!enableHardening) "--disable-hardening"} \ ${optionalString (!enable32bitGuests) "--disable-vmmraw"} \ + ${optionalString (open-watcom-bin != null) "--with-ow-dir=${open-watcom-bin}"} \ --disable-kmods sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \ -i AutoConfig.kmk diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix index 8c4f6e452f..47541a3fdb 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,27 +1,46 @@ -{ stdenv, fetchurl, pkgconfig, glib, libX11, libXext, libXinerama }: +{ stdenv, fetchurl, cmake, pkgconfig, glib, libX11, libXext, libXinerama, libXrandr +, withDoc ? stdenv.buildPlatform == stdenv.targetPlatform, asciidoc ? null }: + +# Doc generation is disabled by default when cross compiling because asciidoc +# does not cross compile for now + +assert withDoc -> asciidoc != null; stdenv.mkDerivation rec { - name = "herbstluftwm-0.7.2"; + pname = "herbstluftwm"; + version = "0.8.1"; src = fetchurl { - url = "https://herbstluftwm.org/tarballs/${name}.tar.gz"; - sha256 = "1kc18aj9j3nfz6fj4qxg9s3gg4jvn6kzi3ii24hfm0vqdpy17xnz"; + url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"; + sha256 = "0c1lf82z6a56g8asin91cmqhzk3anw0xwc44b31bpjixadmns57y"; }; - patchPhase = '' - substituteInPlace config.mk \ - --replace "/usr/local" "$out" \ - --replace "/etc" "$out/etc" \ - --replace "/zsh/functions/Completion/X" "/zsh/site-functions" \ - --replace "/usr/share" "\$(PREFIX)/share" - ''; + outputs = [ + "out" + ] ++ stdenv.lib.optionals withDoc [ + "doc" + "man" + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libX11 libXext libXinerama ]; + cmakeFlags = [ + "-DCMAKE_INSTALL_SYSCONF_PREFIX=${placeholder "out"}/etc" + ] ++ stdenv.lib.optional (!withDoc) "-DWITH_DOCUMENTATION=OFF"; + + nativeBuildInputs = [ + cmake + pkgconfig + ] ++ stdenv.lib.optional withDoc asciidoc; + + buildInputs = [ + libX11 + libXext + libXinerama + libXrandr + ]; meta = { description = "A manual tiling window manager for X"; - homepage = "http://herbstluftwm.org/"; + homepage = "https://herbstluftwm.org/"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix index 731555ce9f..b124ba0ea0 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix @@ -3,12 +3,12 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; - version = "4.18"; + version = "4.18.1"; releaseDate = "2019-01-27"; src = fetchurl { url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; - sha256 = "04sq2sik7j09kgnn1k87yg3vzy56pk4688bmxh49l6drl0wr1m2v"; + sha256 = "07gk5m90v0ih7c18vcwx7p7innsccd09j2vkr99a33wk71xrww1z"; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix index 1eb19e2de6..b38cb99061 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix @@ -1,51 +1,37 @@ -{ fetchurl -, libX11 -, libXrandr -, libXcursor -, libXft -, libXt -, libxcb -, xcbutil -, xcb-util-cursor -, xcbutilkeysyms -, xcbutilwm -, stdenv -}: +{ stdenv, fetchFromGitHub, pkgconfig, xorg }: stdenv.mkDerivation { pname = "spectrwm"; - version = "2.7.2"; + version = "3.3.0"; - src = fetchurl { - url = "https://github.com/conformal/spectrwm/archive/SPECTRWM_2_7_2.tar.gz"; - sha256 = "1yssqnhxlfl1b60gziqp8c5pzs1lr8p6anrnp9ga1zfdql3b7993"; + src = fetchFromGitHub { + owner = "conformal"; + repo = "spectrwm"; + rev = "SPECTRWM_3_3_0"; + sha256 = "139mswlr0z5dbp5migm98qqg84syq0py1qladp3226xy6q3bnn08"; }; - - buildInputs = [ - libX11 - libxcb + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with xorg; [ libXrandr libXcursor libXft libXt xcbutil - xcb-util-cursor xcbutilkeysyms xcbutilwm ]; sourceRoot = let subdir = if stdenv.isDarwin then "osx" else "linux"; - in "spectrwm-SPECTRWM_2_7_2/${subdir}"; + in "source/${subdir}"; - makeFlags = [ "PREFIX=$(out)" ]; - installPhase = "PREFIX=$out make install"; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { description = "A tiling window manager"; homepage = "https://github.com/conformal/spectrwm"; - maintainers = with maintainers; [ jb55 ]; + maintainers = with maintainers; [ christianharke ]; license = licenses.isc; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/build-support/alternatives/lapack/default.nix b/third_party/nixpkgs/pkgs/build-support/alternatives/lapack/default.nix index 5a19916f83..98b458b778 100644 --- a/third_party/nixpkgs/pkgs/build-support/alternatives/lapack/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/alternatives/lapack/default.nix @@ -54,10 +54,6 @@ stdenv.mkDerivation { '' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' patchelf --set-soname liblapack${canonicalExtension} $out/lib/liblapack${canonicalExtension} patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapack${canonicalExtension}):${lapackProvider}/lib" $out/lib/liblapack${canonicalExtension} -'' else if stdenv.hostPlatform.isDarwin then '' - install_name_tool -id liblapack${canonicalExtension} \ - -add_rpath ${lib.getLib lapackProvider}/lib \ - $out/lib/liblapack${canonicalExtension} '' else "") + '' if [ "$out/lib/liblapack${canonicalExtension}" != "$out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then @@ -87,10 +83,6 @@ EOF '' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' patchelf --set-soname liblapacke${canonicalExtension} $out/lib/liblapacke${canonicalExtension} patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapacke${canonicalExtension}):${lib.getLib lapackProvider}/lib" $out/lib/liblapacke${canonicalExtension} -'' else if stdenv.hostPlatform.isDarwin then '' - install_name_tool -id liblapacke${canonicalExtension} \ - -add_rpath ${lib.getLib lapackProvider}/lib \ - $out/lib/liblapacke${canonicalExtension} '' else "") + '' if [ -f "$out/lib/liblapacke.so.3" ]; then diff --git a/third_party/nixpkgs/pkgs/build-support/appimage/appimage-exec.sh b/third_party/nixpkgs/pkgs/build-support/appimage/appimage-exec.sh index 1273effe5f..15eafc58a1 100755 --- a/third_party/nixpkgs/pkgs/build-support/appimage/appimage-exec.sh +++ b/third_party/nixpkgs/pkgs/build-support/appimage/appimage-exec.sh @@ -17,7 +17,7 @@ unpack() { local appimageType=0 # https://github.com/AppImage/libappimage/blob/ca8d4b53bed5cbc0f3d0398e30806e0d3adeaaab/src/libappimage/utils/MagicBytesChecker.cpp#L45-L63 - eval "$(r2 "$src" -nn -Nqc "p8j 3 @ 8" | + eval "$(r2 -nn -Nqc "p8j 3 @ 8" "$src"| jq -r '{appimageSignature: (.[:-1]|implode), appimageType: .[-1]}| @sh "appimageSignature=\(.appimageSignature) appimageType=\(.appimageType)"')" @@ -38,7 +38,7 @@ unpack() { # multiarch offset one-liner using same method as AppImage # see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93 - offset=$(r2 "$src" -nn -Nqc "pfj.elf_header @ 0" |\ + offset=$(r2 -nn -Nqc "pfj.elf_header @ 0" "$src"|\ jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)') echo "Uncompress $(basename "$src") of type $appimageType @ offset $offset." diff --git a/third_party/nixpkgs/pkgs/build-support/docker/default.nix b/third_party/nixpkgs/pkgs/build-support/docker/default.nix index 28c0d2dfca..bee6e37ccc 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/docker/default.nix @@ -32,7 +32,29 @@ }: # WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future. +let + mkDbExtraCommand = contents: let + contentsList = if builtins.isList contents then contents else [ contents ]; + in '' + echo "Generating the nix database..." + echo "Warning: only the database of the deepest Nix layer is loaded." + echo " If you want to use nix commands in the container, it would" + echo " be better to only have one layer that contains a nix store." + + export NIX_REMOTE=local?root=$PWD + # A user is required by nix + # https://github.com/NixOS/nix/blob/9348f9291e5d9e4ba3c4347ea1b235640f54fd79/src/libutil/util.cc#L478 + export USER=nobody + ${nix}/bin/nix-store --load-db < ${closureInfo {rootPaths = contentsList;}}/registration + + mkdir -p nix/var/nix/gcroots/docker/ + for i in ${lib.concatStringsSep " " contentsList}; do + ln -s $i nix/var/nix/gcroots/docker/$(basename $i) + done; + ''; + +in rec { examples = callPackage ./examples.nix { @@ -874,25 +896,16 @@ rec { # contents. The main purpose is to be able to use nix commands in # the container. # Be careful since this doesn't work well with multilayer. - buildImageWithNixDb = args@{ contents ? null, extraCommands ? "", ... }: - let contentsList = if builtins.isList contents then contents else [ contents ]; - in buildImage (args // { - extraCommands = '' - echo "Generating the nix database..." - echo "Warning: only the database of the deepest Nix layer is loaded." - echo " If you want to use nix commands in the container, it would" - echo " be better to only have one layer that contains a nix store." + buildImageWithNixDb = args@{ contents ? null, extraCommands ? "", ... }: ( + buildImage (args // { + extraCommands = (mkDbExtraCommand contents) + extraCommands; + }) + ); - export NIX_REMOTE=local?root=$PWD - # A user is required by nix - # https://github.com/NixOS/nix/blob/9348f9291e5d9e4ba3c4347ea1b235640f54fd79/src/libutil/util.cc#L478 - export USER=nobody - ${nix}/bin/nix-store --load-db < ${closureInfo {rootPaths = contentsList;}}/registration + buildLayeredImageWithNixDb = args@{ contents ? null, extraCommands ? "", ... }: ( + buildLayeredImage (args // { + extraCommands = (mkDbExtraCommand contents) + extraCommands; + }) + ); - mkdir -p nix/var/nix/gcroots/docker/ - for i in ${lib.concatStringsSep " " contentsList}; do - ln -s $i nix/var/nix/gcroots/docker/$(basename $i) - done; - '' + extraCommands; - }); } diff --git a/third_party/nixpkgs/pkgs/build-support/docker/nix-prefetch-docker.nix b/third_party/nixpkgs/pkgs/build-support/docker/nix-prefetch-docker.nix index c1d86adc6d..6341eb0154 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/nix-prefetch-docker.nix +++ b/third_party/nixpkgs/pkgs/build-support/docker/nix-prefetch-docker.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, nix, skopeo }: +{ stdenv, makeWrapper, nix, skopeo, jq }: with stdenv.lib; @@ -12,7 +12,7 @@ stdenv.mkDerivation { installPhase = '' install -vD ${./nix-prefetch-docker} $out/bin/$name; wrapProgram $out/bin/$name \ - --prefix PATH : ${makeBinPath [ nix skopeo ]} \ + --prefix PATH : ${makeBinPath [ nix skopeo jq ]} \ --set HOME /homeless-shelter ''; diff --git a/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix b/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix index 435bbe89c1..b134effab8 100644 --- a/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix +++ b/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix @@ -1,6 +1,6 @@ { stdenv, ocaml, findlib, dune, dune_2, opaline }: -{ pname, version, buildInputs ? [], ... }@args: +{ pname, version, buildInputs ? [], enableParallelBuilding ? true, ... }@args: let Dune = if args.useDune2 or false then dune_2 else dune; in @@ -11,14 +11,16 @@ else stdenv.mkDerivation ({ + inherit enableParallelBuilding; + buildPhase = '' runHook preBuild - dune build -p ${pname} + dune build -p ${pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} runHook postBuild ''; checkPhase = '' runHook preCheck - dune runtest -p ${pname} + dune runtest -p ${pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} runHook postCheck ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/build-support/src-only/default.nix b/third_party/nixpkgs/pkgs/build-support/src-only/default.nix index a93b364809..c721fdf40c 100644 --- a/third_party/nixpkgs/pkgs/build-support/src-only/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/src-only/default.nix @@ -1,6 +1,31 @@ -{stdenv, name, src, patches ? [], buildInputs ? [], ...}: +{ stdenv }@orig: +# srcOnly is a utility builder that only fetches and unpacks the given `src`, +# maybe pathings it in the process with the optional `patches` and +# `buildInputs` attributes. +# +# It can be invoked directly, or be used to wrap an existing derivation. Eg: +# +# > srcOnly pkgs.hello +# +{ name +, src +, stdenv ? orig.stdenv +, patches ? [] +, # deprecated, use the nativeBuildInputs + buildInputs ? [] +, # used to pass extra unpackers + nativeBuildInputs ? [] +, # needed when passing an existing derivation + ... +}: stdenv.mkDerivation { - inherit src buildInputs patches name; + inherit + buildInputs + name + nativeBuildInputs + patches + src + ; installPhase = "cp -r . $out"; phases = ["unpackPhase" "patchPhase" "installPhase"]; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix index 4297d15da9..718b6b218d 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "1.0.5"; + version = "1.0.6"; in fetchzip rec { name = "JetBrainsMono-${version}"; url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; - sha256 = "1iqqix7rr22ij0cn7vg812qs4gbjpphndgbzm57abqk658lra4kl"; + sha256 = "1198k5zw91g85h6n7rg3y7wcj1nrbby9zlr6zwlmiq0nb37n0d3g"; postFetch = '' mkdir -p $out/share/fonts diff --git a/third_party/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix index a26064cdfa..ab80305d52 100644 --- a/third_party/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix @@ -1,20 +1,25 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome3, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "${package-name}-${version}"; - package-name = "arc-icon-theme"; + pname = "arc-icon-theme"; version = "2016-11-22"; src = fetchFromGitHub { owner = "horst3180"; - repo = package-name; + repo = pname; rev = "55a575386a412544c3ed2b5617a61f842ee4ec15"; sha256 = "1ch3hp08qri93510hypzz6m2x4xgg2h15wvnhjwh1x1s1b7jvxjd"; }; - nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ]; + nativeBuildInputs = [ + autoreconfHook + gtk3 + ]; propagatedBuildInputs = [ + moka-icon-theme + gnome3.adwaita-icon-theme + gnome-icon-theme hicolor-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 3aebf09554..3a82c31329 100644 --- a/third_party/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; @@ -11,9 +11,18 @@ stdenv.mkDerivation rec { sha256 = "1f6qvpzxz759znishmr4b22n540y18glv41wmy91r78sa4g6x4sh"; }; - nativeBuildInputs = [ pkgconfig gdk-pixbuf librsvg optipng gtk3 ]; + nativeBuildInputs = [ + pkgconfig + gdk-pixbuf + librsvg + optipng + gtk3 + ]; propagatedBuildInputs = [ + pantheon.elementary-icon-theme + gnome3.adwaita-icon-theme + gnome-icon-theme hicolor-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix index e1e070c58b..9df47f8faa 100644 --- a/third_party/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "${package-name}-${version}"; @@ -12,9 +12,16 @@ stdenv.mkDerivation rec { sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n"; }; - nativeBuildInputs = [ meson ninja python3 gtk3 pantheon.elementary-icon-theme ]; + nativeBuildInputs = [ + meson + ninja + python3 + gtk3 + ]; propagatedBuildInputs = [ + pantheon.elementary-icon-theme + gnome-icon-theme hicolor-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix b/third_party/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix index 19d58eeff6..e403ba753e 100644 --- a/third_party/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, faba-icon-theme, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "faba-mono-icons"; @@ -11,15 +11,21 @@ stdenv.mkDerivation rec { sha256 = "0nisfl92y6hrbakp9qxi0ygayl6avkzrhwirg6854bwqjy2dvjv9"; }; - nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ]; + nativeBuildInputs = [ + autoreconfHook + gtk3 + ]; propagatedBuildInputs = [ + moka-icon-theme + faba-icon-theme + gnome-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; - postFixup = '' + postInstall = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done diff --git a/third_party/nixpkgs/pkgs/data/icons/flat-remix-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/flat-remix-icon-theme/default.nix index 90c14ef7d0..b0b115f096 100644 --- a/third_party/nixpkgs/pkgs/data/icons/flat-remix-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/flat-remix-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub , gtk3 }: +{ stdenv, fetchFromGitHub , gtk3, breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "flat-remix-icon-theme"; @@ -11,14 +11,23 @@ stdenv.mkDerivation rec { sha256 = "14n5wydhd5ifmsbj770s2qg2ksd3xa3m61qxydid6jq39k0lxbd8"; }; - nativeBuildInputs = [ gtk3 ]; + nativeBuildInputs = [ + gtk3 + ]; + + propagatedBuildInputs = [ + breeze-icons + pantheon.elementary-icon-theme + gnome-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; installPhase = '' mkdir -p $out/share/icons mv Flat-Remix* $out/share/icons/ - ''; - postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done @@ -31,4 +40,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ mschneider ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh b/third_party/nixpkgs/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh index f7c9941814..0fd9bf85d8 100644 --- a/third_party/nixpkgs/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh @@ -11,3 +11,43 @@ hicolorIconThemeHook() { # I think this is meant to be a runtime dep addEnvHooks "${targetOffset:?}" hicolorIconThemeHook + +# Make symbolic links of parent icon themes that are inherited in the +# icon themes installed by the package. +symlinkParentIconThemes() { + if [ -e $out/share/icons ]; then + echo Symlinking parent icon themes... + local theme + local theme_name + local inheritance + local parent + local parent_theme + local dir + local parent_path + for theme in $out/share/icons/*/index.theme; do + theme_name="${theme%/*}" + theme_name="${theme_name##*/}" + echo " theme: $theme_name" + inheritance=$(sed -rne 's,^Inherits=(.*)$,\1,p' $theme) + IFS=',' read -ra parent_themes <<< "$inheritance" + for parent_theme in "${parent_themes[@]}"; do + parent_path="" + if [ -e "$out/share/icons/$parent_theme" ]; then + parent_path="$(realpath $out/share/icons/$parent_theme)" + else + IFS=':' read -ra dirs <<< $XDG_ICON_DIRS + for parent_dir in "${dirs[@]}"; do + if [ -e "$parent_dir/icons/$parent_theme/index.theme" ]; then + parent_path=$(realpath "$parent_dir/icons/$parent_theme") + ln -s "$parent_path" "$out/share/icons/" + break + fi + done + fi + echo " parent: $parent_theme -> $parent_path" + done + done + fi +} + +preFixupHooks+=(symlinkParentIconThemes) diff --git a/third_party/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix b/third_party/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix index 1b42c1af61..1bfa8092a3 100644 --- a/third_party/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "iconpack-jade"; @@ -13,16 +13,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; installPhase = '' - mkdir -p $out/share/icons - cp -a Jade* $out/share/icons - ''; + mkdir -p $out/share/icons + cp -a Jade* $out/share/icons - postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done diff --git a/third_party/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix b/third_party/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix index c954af9e83..ae8c127381 100644 --- a/third_party/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "iconpack-obsidian"; @@ -13,16 +13,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; + # still missing parent themes: Ambiant-MATE, Mint-X, Faenza-Dark, KFaenza dontDropIconThemeCache = true; installPhase = '' - mkdir -p $out/share/icons - mv Obsidian* $out/share/icons - ''; + mkdir -p $out/share/icons + mv Obsidian* $out/share/icons - postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done diff --git a/third_party/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix index fbde3a428c..ee539981fb 100644 --- a/third_party/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { dontDropIconThemeCache = true; - postFixup = '' + postInstall = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done diff --git a/third_party/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix index 33798f7b01..d481f2df8d 100644 --- a/third_party/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix @@ -11,9 +11,15 @@ stdenv.mkDerivation rec { sha256 = "015l02im4mha5z91dbchxf6xkp66d346bg3xskwg0rh3lglhjsrd"; }; - nativeBuildInputs = [ meson ninja gtk3 python3 faba-icon-theme ]; + nativeBuildInputs = [ + meson + ninja + gtk3 + python3 + ]; propagatedBuildInputs = [ + faba-icon-theme hicolor-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix index a22b97ec1e..3c991cf1fc 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -13,18 +13,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; - buildInputs = [ numix-icon-theme ]; - - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ numix-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; installPhase = '' - install -dm 755 $out/share/icons - cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/share/icons/ - ''; + runHook preInstall + + mkdir -p $out/share/icons + cp -a Numix-Circle{,-Light} $out/share/icons - postFixup = '' for panel in $out/share/icons/*/*/panel; do ln -sf $(realpath ${numix-icon-theme}/share/icons/Numix/16/$(readlink $panel)) $panel done @@ -32,6 +30,8 @@ stdenv.mkDerivation rec { for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done + + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix index 92a3ce9091..9cebdc3310 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -13,18 +13,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; - buildInputs = [ numix-icon-theme ]; - - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ numix-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; installPhase = '' - mkdir -p $out/share/icons - cp -a Numix-Square{,-Light} $out/share/icons/ - ''; + runHook preInstall + + mkdir -p $out/share/icons + cp -a Numix-Square{,-Light} $out/share/icons - postFixup = '' for panel in $out/share/icons/*/*/panel; do ln -sf $(realpath ${numix-icon-theme}/share/icons/Numix/16/$(readlink $panel)) $panel done @@ -32,6 +30,8 @@ stdenv.mkDerivation rec { for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done + + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix index 46c61d861a..56bb2f3808 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "numix-icon-theme"; @@ -13,18 +13,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; - propagatedBuildInputs = [ - hicolor-icon-theme - ]; + propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; installPhase = '' mkdir -p $out/share/icons cp -a Numix{,-Light} $out/share/icons/ - ''; - postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done diff --git a/third_party/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix index 1531bdf2af..585190a7b3 100644 --- a/third_party/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, gnome3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "paper-icon-theme"; @@ -11,9 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0x45zkjnmbz904df63ph06npbm3phpgck4xwyymx8r8jgrfplk6v"; }; - nativeBuildInputs = [ meson ninja gtk3 python3 ]; + nativeBuildInputs = [ + meson + ninja + gtk3 + python3 + ]; propagatedBuildInputs = [ + gnome3.adwaita-icon-theme + gnome-icon-theme hicolor-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix index d01410f28d..b47c01d973 100644 --- a/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "papirus-icon-theme"; @@ -11,18 +11,23 @@ stdenv.mkDerivation rec { sha256 = "0qv4340avm5s0640r8aznbfwjzvm6k64840qggyg9jfcy6223pdy"; }; - nativeBuildInputs = [ gtk3 ]; + nativeBuildInputs = [ + gtk3 + ]; - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ + pantheon.elementary-icon-theme + breeze-icons + gnome-icon-theme + hicolor-icon-theme + ]; dontDropIconThemeCache = true; installPhase = '' - mkdir -p $out/share/icons - mv {,e}Papirus* $out/share/icons - ''; + mkdir -p $out/share/icons + mv {,e}Papirus* $out/share/icons - postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done diff --git a/third_party/nixpkgs/pkgs/data/icons/papirus-maia-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/papirus-maia-icon-theme/default.nix index a90182cc8d..4cfe50d783 100644 --- a/third_party/nixpkgs/pkgs/data/icons/papirus-maia-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/papirus-maia-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gtk3 }: +{ stdenv, fetchFromGitHub, cmake, gtk3, breeze-icons, gnome-icon-theme, papirus-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "papirus-maia-icon-theme"; @@ -16,11 +16,20 @@ stdenv.mkDerivation rec { gtk3 ]; + propagatedBuildInputs = [ + breeze-icons + gnome-icon-theme + papirus-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + postPatch = '' substituteInPlace CMakeLists.txt --replace /usr "$out" ''; - postFixup = '' + postInstall = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done diff --git a/third_party/nixpkgs/pkgs/data/icons/pop-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/pop-icon-theme/default.nix new file mode 100644 index 0000000000..76b393dcf7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/icons/pop-icon-theme/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, gtk3 +, breeze-icons +, gnome3 +, pantheon +, hicolor-icon-theme +}: + +stdenv.mkDerivation rec { + pname = "pop-icon-theme"; + version = "2020-03-04"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "icon-theme"; + rev = "11f18cb48455b47b6535018f1968777100471be1"; + sha256 = "1s4pjwv2ynw400gnzgzczlxzw3gxh5s8cxxbi9zpxq4wzjg6jqyv"; + }; + + nativeBuildInputs = [ + meson + ninja + gtk3 + ]; + + propagatedBuildInputs = [ + breeze-icons + gnome3.adwaita-icon-theme + pantheon.elementary-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + + meta = with stdenv.lib; { + description = "Icon theme for Pop!_OS with a semi-flat design and raised 3D motifs"; + homepage = "https://github.com/pop-os/icon-theme"; + license = with licenses; [ cc-by-sa-40 gpl3 ]; + platforms = platforms.unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix index 641b3da883..fa52ad176d 100644 --- a/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3 }: +{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "qogir-icon-theme"; @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; + propagatedBuildInputs = [ hicolor-icon-theme ]; + dontDropIconThemeCache = true; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/icons/tango-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/tango-icon-theme/default.nix index fe74959849..f1b59c2f53 100644 --- a/third_party/nixpkgs/pkgs/data/icons/tango-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/tango-icon-theme/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg -, gtk/*any version*/, hicolor-icon-theme +, gtk/*any version*/, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -14,10 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool iconnamingutils imagemagick librsvg ]; - - propagatedBuildInputs = [ - hicolor-icon-theme - ]; + propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; + # still missing parent icon themes: cristalsvg dontDropIconThemeCache = true; diff --git a/third_party/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix b/third_party/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix index 5bd61b0866..a8dc4539a7 100644 --- a/third_party/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, numix-icon-theme, numix-icon-theme-circle, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "zafiro-icons"; @@ -11,10 +11,17 @@ stdenv.mkDerivation rec { sha256 = "05h8qm9izjbp8pnl9jpbw3y9sddhp0zmg94fm1k4d4hhdqnakqhv"; }; - nativeBuildInputs = [ gtk3 ]; + nativeBuildInputs = [ + gtk3 + ]; propagatedBuildInputs = [ + breeze-icons + gnome-icon-theme + numix-icon-theme + numix-icon-theme-circle hicolor-icon-theme + # still missing parent icon themes: Surfn ]; dontDropIconThemeCache = true; diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix b/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix index ca54d972ea..3c1b436fe3 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3e87a900a11faa97a8a068874c932f3172d0aa76.tar.gz"; - sha256 = "0cf35vics1211pr1g8a804zm3w4lsdacqkgw3hqk7wdrrbasb8ip"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/9d50cd974714cdcfdaabd089923b571a66bae55a.tar.gz"; + sha256 = "1hv4pxp47850l36ci2ywmc75c95fvdqr3swz9qymy25gd6rbfs9f"; } diff --git a/third_party/nixpkgs/pkgs/data/themes/arc/default.nix b/third_party/nixpkgs/pkgs/data/themes/arc/default.nix index 53e81b323d..14e1b24826 100644 --- a/third_party/nixpkgs/pkgs/data/themes/arc/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/arc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20190917"; + version = "20200416"; src = fetchFromGitHub { - owner = "arc-design"; + owner = "jnsh"; repo = pname; - rev = version; - sha256 = "1qgpk4p2hi5hd4yy0hj93kq1vs0b32wb8qkaj1wi90c8gwddq5wa"; + rev = "0779e1ca84141d8b443cf3e60b85307a145169b6"; + sha256 = "1ddyi8g4rkd4mxadjvl66wc0lxpa4qdr98nbbhm5abaqfs2yldd4"; }; nativeBuildInputs = [ @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-gnome-shell" # 3.36 not supported + "--disable-cinnamon" # not equipped to test "--disable-unity" ]; @@ -44,10 +45,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flat theme with transparent elements for GTK 3, GTK 2 and Gnome Shell"; - homepage = "https://github.com/arc-design/arc-theme"; + homepage = "https://github.com/jnsh/arc-theme"; license = licenses.gpl3; maintainers = with maintainers; [ simonvandel romildo ]; platforms = platforms.linux; - broken = true; # since libsass 3.6.3 }; } diff --git a/third_party/nixpkgs/pkgs/data/themes/pop-gtk/default.nix b/third_party/nixpkgs/pkgs/data/themes/pop-gtk/default.nix index 9bb2beae4d..730f7754d8 100644 --- a/third_party/nixpkgs/pkgs/data/themes/pop-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/pop-gtk/default.nix @@ -9,17 +9,18 @@ , gtk-engine-murrine , gdk-pixbuf , librsvg +, python3 }: stdenv.mkDerivation rec { pname = "pop-gtk-theme"; - version = "2020-02-10"; + version = "2020-04-22"; src = fetchFromGitHub { owner = "pop-os"; repo = "gtk-theme"; - rev = "ed888e9dd5de142cb899e362beedaf694594cc7e"; - sha256 = "0ryr1jx9pzij6pkv7sam07f90w5lbrzx0fj5vdxl94612mh76aad"; + rev = "b3f98dfd61cfff81f69cdc7f57bce7a9efaa36f4"; + sha256 = "0vhcc694x33sgcpbqkrc5bycbd7017k4iii0mjjxgd22jd5lzgkb"; }; nativeBuildInputs = [ @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { gtk3 inkscape optipng + python3 ]; buildInputs = [ @@ -41,9 +43,9 @@ stdenv.mkDerivation rec { ]; postPatch = '' - for file in $(find -name render-\*.sh); do - patchShebangs "$file" + patchShebangs . + for file in $(find -name render-\*.sh); do substituteInPlace "$file" \ --replace 'INKSCAPE="/usr/bin/inkscape"' \ 'INKSCAPE="inkscape"' \ diff --git a/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix b/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix index 6033d64d79..665452a91d 100644 --- a/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix @@ -1,22 +1,25 @@ { stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, - python3, gtk3, gnome3, gtk-engine-murrine }: + python3, gtk3, gnome3, gtk-engine-murrine, humanity-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "yaru"; - version = "20.04.1"; + version = "20.04.6"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - sha256 = "0c9az0bmnrnkgxfifp6nkan5bvjrkqrpg38zsp2vg493bm3bpbg1"; + sha256 = "04z16bcv1xdq4acnchd6cq9a8j46zl2bjp50cj90qmd6plpiiz50"; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; buildInputs = [ gtk3 gnome3.gnome-themes-extra ]; + propagatedBuildInputs = [ humanity-icon-theme hicolor-icon-theme ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + dontDropIconThemeCache = true; + postPatch = "patchShebangs ."; meta = with stdenv.lib; { @@ -25,6 +28,5 @@ stdenv.mkDerivation rec { license = with licenses; [ cc-by-sa-40 gpl3 ]; platforms = platforms.linux; maintainers = [ maintainers.jD91mZM2 ]; - broken = true; # since libsass 3.6.3 }; } diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix index d4415c4bf0..a7e22dc3d0 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -1,6 +1,7 @@ { fetchFromGitHub , stdenv , gnome3 +, gnome-icon-theme , hicolor-icon-theme , gtk3 }: @@ -16,8 +17,9 @@ stdenv.mkDerivation rec { sha256 = "1c2a79ylk363i982czwwqcwc7cw6dyzlqphcypqm6nll7xlafq8s"; }; - propagatedUserEnvPkgs = [ + propagatedBuildInputs = [ gnome3.adwaita-icon-theme + gnome-icon-theme hicolor-icon-theme ]; @@ -25,15 +27,19 @@ stdenv.mkDerivation rec { gtk3 ]; - postFixup = '' - gtk-update-icon-cache $out/share/icons/* - ''; - dontDropIconThemeCache = true; installPhase = '' + runHook preInstall + mkdir -p $out mv usr/share $out + + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix index 5845e77f57..b6eb3cce26 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -13,9 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 xcursorgen ]; - buildInputs = [ papirus-icon-theme ]; - propagatedBuildInputs = [ + papirus-icon-theme hicolor-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/efl.nix b/third_party/nixpkgs/pkgs/desktops/enlightenment/efl.nix index 7bf280cb99..d3b0e43e47 100644 --- a/third_party/nixpkgs/pkgs/desktops/enlightenment/efl.nix +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/efl.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, SDL, SDL2, alsaLib, avahi, bullet, check, curl, dbus, doxygen, expat, fontconfig, freetype, fribidi, ghostscript, giflib, glib, gst_all_1, gtk3, - harfbuzz, ibus, jbig2dec, libGL, libdrm, libinput, libjpeg, libpng, - libpulseaudio, libraw, librsvg, libsndfile, libspectre, libtiff, - libwebp, libxkbcommon, luajit, lz4, mesa, openjpeg, openssl, - poppler, python27Packages, systemd, udev, utillinux, writeText, - xorg, zlib -}: + harfbuzz, hicolor-icon-theme, ibus, jbig2dec, libGL, libdrm, + libinput, libjpeg, libpng, libpulseaudio, libraw, librsvg, + libsndfile, libspectre, libtiff, libwebp, libxkbcommon, luajit, lz4, + mesa, openjpeg, openssl, poppler, python27Packages, systemd, udev, + utillinux, writeText, xorg, zlib }: stdenv.mkDerivation rec { pname = "efl"; @@ -51,6 +50,7 @@ stdenv.mkDerivation rec { xorg.libXcursor xorg.xorgproto zlib + # still missing parent icon themes: Mint-X, RAVE-X, Faenza ]; propagatedBuildInputs = [ @@ -95,6 +95,8 @@ stdenv.mkDerivation rec { xorg.xcbutilkeysyms ]; + dontDropIconThemeCache = true; + mesonFlags = [ "--buildtype=release" "-D build-tests=false" # disable build tests, which are not working diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index 6eafa874b8..827fd1cd96 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk3 ]; + dontDropIconThemeCache = true; + # remove a tree of dirs with no files within postInstall = '' rm -rf "$out/locale" ''; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index c298d8b337..a501f91227 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0fah7cc22g55w6w7ia3kr2wpdrc45h83xw4pimi54mhggmx9466y"; + sha256 = "0gq0z0k02b5cfaqrikk2hzbqzjkb6qwcanaqi2jh7nswa7g050lp"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 46a50c3455..d3fb419aab 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -17,11 +17,11 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0696qw6bmbga30qlvh1k6bkiajl7877j8yis4bwmi1wxkcmkh854"; + sha256 = "0lqpxhvn073bshnzarnisym3da3k3awsi3h906hm85hz3wm9n4iv"; }; LANG = "en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix index 9cbac8c742..fa2f4921fd 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 -, gdk-pixbuf }: +, gdk-pixbuf, hicolor-icon-theme }: let pname = "gnome-themes-extra"; @@ -19,9 +19,12 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf ]; + propagatedBuildInputs = [ gnome3.adwaita-icon-theme hicolor-icon-theme ]; - postFixup = '' + dontDropIconThemeCache = true; + + postInstall = '' gtk-update-icon-cache "$out"/share/icons/HighContrast ''; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix index 51d3c4115d..8769698785 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "mutter"; - version = "3.34.4"; + version = "3.34.5"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18hbw98p4h3d4qz57415smwmfg72s9a0nk8mb04ds1gn2lsm2d01"; + sha256 = "1i3r51ghfld1rf1rczzi3jhybz3mhywqcj2jyiqhfcyp1svlklfi"; }; mesonFlags = [ @@ -111,6 +111,13 @@ stdenv.mkDerivation rec { sha256 = "0imy2j8af9477jliwdq4jc40yw1cifsjjf196gnmwxr9rkj0hbrd"; }) + # gnome-3-34 2020-04-24 + # also fixes https://mail.gnome.org/archives/distributor-list/2020-April/msg00001.html + (fetchpatch { + url = "https://github.com/GNOME/mutter/compare/3.34.5..3bafd234248fdcd84bc62fef5e31c29fbb613909.patch"; + sha256 = "1a7krbdfmvx204p6av44rbp4ckp6ddg1mms8wkixxh2p871zq1pi"; + }) + # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 ./drop-inheritable.patch diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix index 9edb36156d..3274044bde 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation rec { pname = "mutter"; - version = "3.36.1"; + version = "3.36.2"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "09fqs9805d07c60a2ibskqffsb5wn72l8grwzb9fic5sl574b0im"; + sha256 = "1x6svmd1k6w6a2m6ssq4hi997nxyq6z64fjjaid97z2rn177dcvm"; }; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix new file mode 100644 index 0000000000..3ddd5c1028 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-window-is-ready-remover"; + version = "unstable-2020-03-25"; + + src = fetchFromGitHub { + owner = "nunofarruca"; + repo = "WindowIsReady_Remover"; + rev = "a9f9b3a060a6ba8eec71332f39dc2569b6e93761"; + sha256 = "0l6cg9kz2plbvsqhgwfajknzw9yv3mg9gxdbsk147gbh2arnp6v3"; + }; + + uuid = "windowIsReady_Remover@nunofarruca@gmail.com"; + + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions/ + cp -r ${uuid} $out/share/gnome-shell/extensions/${uuid} + ''; + + meta = with stdenv.lib; { + description = "GNOME Shell extension removing window is ready notification"; + homepage = "https://github.com/nunofarruca/WindowIsReady_Remover"; + license = licenses.unfree; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/update.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/update.nix index 555504086a..1bceddf77e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/update.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/update.nix @@ -5,14 +5,14 @@ let python = python3.withPackages (p: [ p.requests ]); upperBoundFlag = let - package = lib.getAttrFromPath (lib.splitString "." attrPath) pkgs; + package = lib.attrByPath (lib.splitString "." attrPath) (throw "Cannot find attribute ‘${attrPath}’.") pkgs; packageVersion = lib.getVersion package; versionComponents = lib.versions.splitVersion packageVersion; minorVersion = lib.versions.minor packageVersion; minorAvailable = builtins.length versionComponents > 1 && builtins.match "[0-9]+" minorVersion != null; nextMinor = builtins.fromJSON minorVersion + 1; upperBound = "${lib.versions.major packageVersion}.${builtins.toString nextMinor}"; - in lib.optionalString (minorAvailable && freeze) ''--upper-bound="${upperBound}"''; + in lib.optionalString (freeze && minorAvailable) ''--upper-bound="${upperBound}"''; updateScript = writeScript "gnome-update-script" '' #!${stdenv.shell} set -o errexit diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix index fe44b707f7..b41d766c1a 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix @@ -1,15 +1,23 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt, - libconfig }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, qtbase +, qttools +, lxqt +, libconfig +}: mkDerivation rec { pname = "compton-conf"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0bx21r83ahmsqf7bm1h17pi4y9js1iqsv7nwnlq58rc0ddkkhcdb"; + sha256 = "1wqnajarkrpmc60jr1zw5w39lvlf9ii4ri9wgyn55hh1rkbzi7py"; }; nativeBuildInputs = [ @@ -27,7 +35,9 @@ mkDerivation rec { preConfigure = '' substituteInPlace autostart/CMakeLists.txt \ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \ - ''; + ''; + + passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; }; meta = with lib; { description = "GUI configuration tool for compton X composite manager"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/default.nix index 6b03c2a6c9..4571426038 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/default.nix @@ -1,48 +1,55 @@ { pkgs, makeScope, libsForQt5 }: - let packages = self: with self; { + # Update script tailored to LXQt packages from git repository + lxqtUpdateScript = { pname, version, src }: + pkgs.genericUpdater { + inherit pname version; + attrPath = "lxqt.${pname}"; + versionLister = "${pkgs.common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; + }; + # For compiling information, see: # - https://github.com/lxqt/lxqt/wiki/Building-from-source ### BASE - libqtxdg = callPackage ./libqtxdg { }; - lxqt-build-tools = callPackage ./lxqt-build-tools { }; - libsysstat = callPackage ./libsysstat { }; - liblxqt = callPackage ./liblxqt { }; + libqtxdg = callPackage ./libqtxdg {}; + lxqt-build-tools = callPackage ./lxqt-build-tools {}; + libsysstat = callPackage ./libsysstat {}; + liblxqt = callPackage ./liblxqt {}; ### CORE 1 - libfm-qt = callPackage ./libfm-qt { }; - lxqt-about = callPackage ./lxqt-about { }; - lxqt-admin = callPackage ./lxqt-admin { }; - lxqt-config = callPackage ./lxqt-config { }; - lxqt-globalkeys = callPackage ./lxqt-globalkeys { }; - lxqt-notificationd = callPackage ./lxqt-notificationd { }; - lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass { }; - lxqt-policykit = callPackage ./lxqt-policykit { }; - lxqt-powermanagement = callPackage ./lxqt-powermanagement { }; - lxqt-qtplugin = callPackage ./lxqt-qtplugin { }; - lxqt-session = callPackage ./lxqt-session { }; - lxqt-sudo = callPackage ./lxqt-sudo { }; - lxqt-themes = callPackage ./lxqt-themes { }; - pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt { }; - qtermwidget = callPackage ./qtermwidget { }; + libfm-qt = callPackage ./libfm-qt {}; + lxqt-about = callPackage ./lxqt-about {}; + lxqt-admin = callPackage ./lxqt-admin {}; + lxqt-config = callPackage ./lxqt-config {}; + lxqt-globalkeys = callPackage ./lxqt-globalkeys {}; + lxqt-notificationd = callPackage ./lxqt-notificationd {}; + lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass {}; + lxqt-policykit = callPackage ./lxqt-policykit {}; + lxqt-powermanagement = callPackage ./lxqt-powermanagement {}; + lxqt-qtplugin = callPackage ./lxqt-qtplugin {}; + lxqt-session = callPackage ./lxqt-session {}; + lxqt-sudo = callPackage ./lxqt-sudo {}; + lxqt-themes = callPackage ./lxqt-themes {}; + pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt {}; + qtermwidget = callPackage ./qtermwidget {}; ### CORE 2 - lxqt-panel = callPackage ./lxqt-panel { }; - lxqt-runner = callPackage ./lxqt-runner { }; - pcmanfm-qt = callPackage ./pcmanfm-qt { }; + lxqt-panel = callPackage ./lxqt-panel {}; + lxqt-runner = callPackage ./lxqt-runner {}; + pcmanfm-qt = callPackage ./pcmanfm-qt {}; ### OPTIONAL - qterminal = callPackage ./qterminal { }; - compton-conf = pkgs.qt5.callPackage ./compton-conf { }; - obconf-qt = callPackage ./obconf-qt { }; - lximage-qt = callPackage ./lximage-qt { }; - qps = callPackage ./qps { }; - screengrab = callPackage ./screengrab { }; - qlipper = callPackage ./qlipper { }; - lxqt-archiver = callPackage ./lxqt-archiver { }; + qterminal = callPackage ./qterminal {}; + compton-conf = pkgs.qt5.callPackage ./compton-conf {}; + obconf-qt = callPackage ./obconf-qt {}; + lximage-qt = callPackage ./lximage-qt {}; + qps = callPackage ./qps {}; + screengrab = callPackage ./screengrab {}; + qlipper = callPackage ./qlipper {}; + lxqt-archiver = callPackage ./lxqt-archiver {}; preRequisitePackages = [ pkgs.gvfs # virtual file systems support for PCManFM-QT @@ -107,5 +114,5 @@ let ]; }; - -in makeScope libsForQt5.newScope packages +in +makeScope libsForQt5.newScope packages diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix index d383b46a9a..ba83f0e316 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -1,18 +1,28 @@ -{ - lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, - pcre, libexif, xorg, libfm, menu-cache, - qtx11extras, qttools +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, pcre +, libexif +, xorg +, libfm +, menu-cache +, qtx11extras +, qttools +, lxqtUpdateScript }: mkDerivation rec { - pname = "libfm-qt-unstable"; - version = "2019-09-22"; + pname = "libfm-qt"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "libfm-qt"; - rev = "7c94e9efb996df0602f1f2b34b0216ba9b6df498"; - sha256 = "1fnli2kh7n4hxmqwcb1n06lyk67d9a2fx6z70gas5jzym7r2h5vw"; + rev = version; + sha256 = "0isshh627zr69kdmjxsy75i1nh95ky2wfhgy90g8j4zijpkdrd3l"; }; nativeBuildInputs = [ @@ -33,6 +43,8 @@ mkDerivation rec { menu-cache ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Core library of PCManFM-Qt (Qt binding for libfm)"; homepage = "https://github.com/lxqt/libfm-qt"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/liblxqt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/liblxqt/default.nix index ec7fe0a766..e72593548c 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/liblxqt/default.nix @@ -1,15 +1,27 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, - qttools, qtsvg, libqtxdg, polkit-qt, kwindowsystem, xorg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtx11extras +, qttools +, qtsvg +, libqtxdg +, polkit-qt +, kwindowsystem +, xorg +, lxqtUpdateScript +}: mkDerivation rec { pname = "liblxqt"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0g2502lcws5j74p82qhfryz9n51cvi85hb50r5s227xhkv91q65k"; + sha256 = "1dqxsz8fy6xyzbkxhsymmr71yw4d5dwjgqd4rdjn0r9gk8ajrfzp"; }; nativeBuildInputs = [ @@ -31,6 +43,8 @@ mkDerivation rec { sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt ''; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Core utility library for all LXQt components"; homepage = "https://github.com/lxqt/liblxqt"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix index 14bb21e146..526da0d84a 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -1,28 +1,42 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtsvg, lxqt-build-tools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qtbase +, qtsvg +, lxqt-build-tools +, lxqtUpdateScript +}: mkDerivation rec { pname = "libqtxdg"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "16jqnpc740a6phq7vcgy85hl7253yzyw4m5h71r0vijk79ir73b5"; + sha256 = "00dzs6zc8prc0mxmvq0pmpy1qi8rysg97as7jfd0ndk5jii0nd85"; }; - nativeBuildInputs = [ cmake lxqt-build-tools ]; + nativeBuildInputs = [ + cmake + lxqt-build-tools + ]; - buildInputs = [ qtbase qtsvg ]; + buildInputs = [ + qtbase + qtsvg + ]; preConfigure = '' cmakeFlagsArray+=( - "-DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" + "-DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix/iconengines" ) ''; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Qt implementation of freedesktop.org xdg specs"; homepage = "https://github.com/lxqt/libqtxdg"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix index 0e63d32c74..642b57fe0d 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix @@ -1,19 +1,33 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, lxqt-build-tools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qtbase +, lxqt-build-tools +, lxqtUpdateScript +}: mkDerivation rec { pname = "libsysstat"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "10h9n7km7yx8bnmzxi4nn1yqq03hizjkrx4745j0mczy7niiffsz"; + sha256 = "1dlshyv7pd7gwl55rd3msppjdpz2pwp5f4da9a9wapg7kiskqahf"; }; - nativeBuildInputs = [ cmake lxqt-build-tools ]; + nativeBuildInputs = [ + cmake + lxqt-build-tools + ]; - buildInputs = [ qtbase ]; + buildInputs = [ + qtbase + ]; + + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { description = "Library used to query system info and statistics"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix index e47a9ec1b4..22ce26526a 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -1,15 +1,28 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, - qtx11extras, qtsvg, xorg, lxqt-build-tools, libfm-qt, libexif }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, qtbase +, qttools +, qtx11extras +, qtsvg +, xorg +, lxqt-build-tools +, libfm-qt +, libexif +, lxqtUpdateScript +}: mkDerivation rec { pname = "lximage-qt"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "175l2w5w6iag01v05jq90pxx0al24wpw3mgsbcgqhl4z6h860r32"; + sha256 = "1pz0ird5vyrz1xycfn2vqh628f2mzwrx0psnp4hqdmj1xk9bjkbp"; }; nativeBuildInputs = [ @@ -29,6 +42,8 @@ mkDerivation rec { libexif ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "The image viewer and screenshot tool for lxqt"; homepage = "https://github.com/lxqt/lximage-qt"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix index 19a06925b3..0136512946 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -1,14 +1,26 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtx11extras +, qttools +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-about"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0dj2rhbhnkzmv1iqqyq0bcp03imwnvxdr7rnpqnrs9kkjacm8zvr"; + sha256 = "0bgwh9jbvpnsdcij0bfkgzg0pb0ljjalv65q4q0hlha430pmpv3x"; }; nativeBuildInputs = [ @@ -25,6 +37,8 @@ mkDerivation rec { libqtxdg ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Dialogue window providing information about LXQt and the system it's running on"; homepage = "https://github.com/lxqt/lxqt-about"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix index 0a9ef8cfb8..21a637bc66 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -1,14 +1,27 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit-qt }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtx11extras +, qttools +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +, polkit-qt +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-admin"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "121qj46app2bqdr24g5sz2mdjfd9w86wpgkwap46s0zgxm4li44i"; + sha256 = "16fbnlvla8lq6rkv5gpmkw2jj9h1wzd3jcf8sjrbns6ygyfdxx3a"; }; nativeBuildInputs = [ @@ -31,6 +44,8 @@ mkDerivation rec { -i lxqt-admin-user/CMakeLists.txt ''; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "LXQt system administration tool"; homepage = "https://github.com/lxqt/lxqt-admin"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix index 2c4d040a43..ae772272c4 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -1,15 +1,26 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, json-glib, libfm-qt, qtbase, qttools, qtx11extras }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, json-glib +, libfm-qt +, qtbase +, qttools +, qtx11extras +, lxqtUpdateScript +}: mkDerivation rec { - # pname = "lxqt-archiver"; - pname = "lxqt-archiver-unstable"; - version = "2019-09-25"; + pname = "lxqt-archiver"; + version = "0.1.1"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-archiver"; - rev = "62501255434b2ba6a8fd043a5af13dc0df038a5b"; - sha256 = "1af58k68karmnay7xgngzlmcgkmvx6hay5m1xbl5id9hh16n20in"; + rev = version; + sha256 = "0c0y8sy12laqyanvy6mmnpjvy1yb8k3241pbxhc3nyl5zrq3hzdh"; }; nativeBuildInputs = [ @@ -26,10 +37,10 @@ mkDerivation rec { qtx11extras ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - hardeningDisable = [ "format" ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Archive tool for the LXQt desktop environment"; homepage = "https://github.com/lxqt/lxqt-archiver/"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index d06cb7be92..92ce3c2fe5 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -1,19 +1,36 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, glib }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, pcre +, qtbase +, glib +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-build-tools"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0i7m9s4g5rsw28vclc9nh0zcapx85cqfwxkx7rrw7wa12svy7pm2"; + sha256 = "18l1w9lyf3nyj05wjhaj4lclak6qydlhw9bqi6kxgr1bv8k709lf"; }; - nativeBuildInputs = [ cmake pkgconfig setupHook ]; + nativeBuildInputs = [ + cmake + pkgconfig + setupHook + ]; - buildInputs = [ qtbase glib pcre ]; + buildInputs = [ + qtbase + glib + pcre + ]; setupHook = ./setup-hook.sh; @@ -24,6 +41,8 @@ mkDerivation rec { cp ${./LXQtConfigVars.cmake} $out/share/cmake/lxqt-build-tools/modules/LXQtConfigVars.cmake ''; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Various packaging tools and scripts for LXQt applications"; homepage = "https://github.com/lxqt/lxqt-build-tools"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix index 41fe965161..677b90b25c 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -1,16 +1,30 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, - qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, - libqtxdg, xorg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, qtbase +, qtx11extras +, qttools +, qtsvg +, kwindowsystem +, libkscreen +, liblxqt +, libqtxdg +, xorg +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-config"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0x1k08587i2pakxlrj2n0l82r179sfywnzn2cphxiy89r5zpn7vi"; + sha256 = "1nqkc716rl4c0rad4vqlqadm6lljrhwpdflaa5k9lrdiingr0s7s"; }; nativeBuildInputs = [ @@ -41,6 +55,8 @@ mkDerivation rec { sed -i "/\''${XORG_LIBINPUT_INCLUDE_DIRS}/a ${xorg.xf86inputlibinput.dev}/include/xorg" lxqt-config-input/CMakeLists.txt ''; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Tools to configure LXQt and the underlying operating system"; homepage = "https://github.com/lxqt/lxqt-config"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index ca760d2a09..59e2096dea 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -1,14 +1,27 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qttools +, qtx11extras +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-globalkeys"; - version = "0.14.3"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1ij9abjnqbnkcb7qqk3x7y4amr6l7kkmwhdpc0x2qk4yikn5ijdg"; + sha256 = "09vib713zbmnwicijycl3n9q35l45lrcw129lf9z95s3ch81x1hm"; }; nativeBuildInputs = [ @@ -26,6 +39,8 @@ mkDerivation rec { libqtxdg ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "LXQt service for global keyboard shortcuts registration"; homepage = "https://github.com/lxqt/lxqt-globalkeys"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 5790be3c77..43f9bf3193 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -1,14 +1,27 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qttools +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +, qtx11extras +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-notificationd"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1ihaf2i361j2snyy6kg8ccpfnc8hppvacmxjqzb1lpyaf1ajd139"; + sha256 = "0vqk1rc4fn2s0ls6sl03vzsb16xczrxab4rzjim3azm4pwsxjd1k"; }; nativeBuildInputs = [ @@ -26,6 +39,8 @@ mkDerivation rec { qtx11extras ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "The LXQt notification daemon"; homepage = "https://github.com/lxqt/lxqt-notificationd"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index 26730f57b4..a164571800 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -1,14 +1,27 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qttools +, qtsvg +, qtx11extras +, kwindowsystem +, liblxqt +, libqtxdg +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-openssh-askpass"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "04jmvhhlhhspwzj4hfq7fnaa3h7h02z3rlq8p55hzlzkvshqqh1q"; + sha256 = "056bj3ssp4vqapzqg3da3m95vi92043j7mv70lmpznxdwyjwgxc3"; }; nativeBuildInputs = [ @@ -26,6 +39,8 @@ mkDerivation rec { libqtxdg ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "GUI to query passwords on behalf of SSH agents"; homepage = "https://github.com/lxqt/lxqt-openssh-askpass"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix index 57938a5f52..705d6aec79 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -1,21 +1,42 @@ -{ - lib, mkDerivation, fetchFromGitHub, - cmake, pkgconfig, lxqt-build-tools, - qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid, - kguiaddons, liblxqt, libqtxdg, lxqt-globalkeys, libsysstat, - xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache, - lxmenu-data, pcre, libXdamage +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, qtbase +, qttools +, qtx11extras +, qtsvg +, libdbusmenu +, kwindowsystem +, solid +, kguiaddons +, liblxqt +, libqtxdg +, lxqt-globalkeys +, libsysstat +, xorg +, libstatgrab +, lm_sensors +, libpulseaudio +, alsaLib +, menu-cache +, lxmenu-data +, pcre +, libXdamage +, lxqtUpdateScript }: mkDerivation rec { pname = "lxqt-panel"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1py3i7qgm6h2iwjwqfjml1rp06s7ls1d7z5i9iizsmfshdzkaq86"; + sha256 = "0k2gqf9f4g8fpny8p5m1anzk7mdxm9dgh6xlngz25nj4mshnq3xs"; }; nativeBuildInputs = [ @@ -49,6 +70,8 @@ mkDerivation rec { libXdamage ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "The LXQt desktop panel"; homepage = "https://github.com/lxqt/lxqt-panel"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 33a2d517fa..7575c805a3 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -1,18 +1,30 @@ -{ - lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, - qtbase, qttools, qtx11extras, qtsvg, polkit-qt, kwindowsystem, liblxqt, - libqtxdg, pcre +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, qtbase +, qttools +, qtx11extras +, qtsvg +, polkit-qt +, kwindowsystem +, liblxqt +, libqtxdg +, pcre +, lxqtUpdateScript }: mkDerivation rec { pname = "lxqt-policykit"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0mh9jw09r0mk8xmgvmzk3yyfix0pzqya28rcx71fqjpbdv1sc44l"; + sha256 = "001zgjxgvzp7clfqr46sx8m3a7v38xxgxjqrpz01lxx18zik3d9h"; }; nativeBuildInputs = [ @@ -33,6 +45,8 @@ mkDerivation rec { pcre ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "The LXQt PolicyKit agent"; homepage = "https://github.com/lxqt/lxqt-policykit"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index 997a9cda3d..2b48a2a04b 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -1,14 +1,29 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, solid, kidletime, liblxqt, libqtxdg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qttools +, qtx11extras +, qtsvg +, kwindowsystem +, solid +, kidletime +, liblxqt +, libqtxdg +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-powermanagement"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1nhp4a28bpczhwz8b8da355zsxr1qwmkrm3bwllwp39liw947clx"; + sha256 = "0gqxy4d05gibsvq27qdfwp5v19310l0ln4bvwaan6ailbyyya90f"; }; nativeBuildInputs = [ @@ -28,6 +43,8 @@ mkDerivation rec { libqtxdg ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Power management module for LXQt"; homepage = "https://github.com/lxqt/lxqt-powermanagement"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index abb09aae83..02a43b4a8c 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -1,18 +1,27 @@ -{ - lib, mkDerivation, fetchFromGitHub, - cmake, lxqt-build-tools, - qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg, libfm-qt +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qtx11extras +, qttools +, qtsvg +, libdbusmenu +, libqtxdg +, libfm-qt +, lxqtUpdateScript }: mkDerivation rec { pname = "lxqt-qtplugin"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "16n50lxnya03zcviw65sy5dyg9dsrn64k91mrqfvraf6d90md4al"; + sha256 = "17x5jr78rbsf4pbvc4y3wwkpvsmynzkxy2ifvwhqyc2gmjspp8il"; }; nativeBuildInputs = [ @@ -35,6 +44,8 @@ mkDerivation rec { --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix" ''; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "LXQt Qt platform integration plugin"; homepage = "https://github.com/lxqt/lxqt-qtplugin"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix index e4f39184ff..8a27ef4161 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -1,15 +1,32 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-globalkeys, qtx11extras, -menu-cache, muparser, pcre }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, qtbase +, qttools +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +, lxqt-globalkeys +, qtx11extras +, menu-cache +, muparser +, pcre +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-runner"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "01a8ycpkzcbh85y4025pd3nbpnzxh98ll1xwz4ykz13yvm0l2n1w"; + sha256 = "1x6s4k27cvj2k51hwpcp3l686c2am504ckry4fm76h0mlnkffjm5"; }; nativeBuildInputs = [ @@ -32,6 +49,8 @@ mkDerivation rec { pcre ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Tool used to launch programs quickly by typing their names"; homepage = "https://github.com/lxqt/lxqt-runner"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix index 0493dd9fbb..2e513b2398 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -1,14 +1,30 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, xorg, xdg-user-dirs }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, qtbase +, qttools +, qtsvg +, qtx11extras +, kwindowsystem +, liblxqt +, libqtxdg +, xorg +, xdg-user-dirs +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-session"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0s6b0lblb795zz1p7sy677c1iznhmdzc4vw3jkc2agmsrhm7if7s"; + sha256 = "0kbk13dpmr75yd905n30k51cl7srrxz31ma4kacx450qgr5rwawn"; }; nativeBuildInputs = [ @@ -30,6 +46,8 @@ mkDerivation rec { xdg-user-dirs ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "An alternative session manager ported from the original razor-session"; homepage = "https://github.com/lxqt/lxqt-session"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix index 9c76f0383b..5f8fbcd2a6 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -1,14 +1,28 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg, sudo }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qttools +, qtx11extras +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +, sudo +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-sudo"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1my0wpic20493rdlabp9ghag1g3nhwafk2yklkgczlajmarakgpc"; + sha256 = "1j8pxqxb2c10hrfq34nfx75pc0cz6044j4w458nnxbgvl5b8cdcb"; }; nativeBuildInputs = [ @@ -27,6 +41,8 @@ mkDerivation rec { sudo ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "GUI frontend for sudo/su"; homepage = "https://github.com/lxqt/lxqt-sudo"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix index 1cc56d62a0..4613017b8a 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -1,14 +1,20 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, lxqtUpdateScript +}: mkDerivation rec { pname = "lxqt-themes"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "09dkcgnf3lmfly8v90p6wjlj5rin83pbailvvpx2jr8a48a8zb9f"; + sha256 = "1magzckhgrac2b5jm83hj3s8x4hyfnbh2v86lfa4c36whnfvsz29"; }; nativeBuildInputs = [ @@ -16,6 +22,8 @@ mkDerivation rec { lxqt-build-tools ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Themes, graphics and icons for LXQt"; homepage = "https://github.com/lxqt/lxqt-themes"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix index 1b1e2e92b0..91baba60d8 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -1,15 +1,27 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, qttools, - qtx11extras, xorg, lxqt-build-tools, openbox }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, pcre +, qtbase +, qttools +, qtx11extras +, xorg +, lxqt-build-tools +, openbox +, lxqtUpdateScript +}: mkDerivation rec { pname = "obconf-qt"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "15dizs072ylmld1lxwgqkvybqy8ms8zki5586xm305jnlmrkb4lq"; + sha256 = "13bah70k78kscrr01z7dwdzwhay8mz0f7gfsg2a6w113mgqkn7ib"; }; nativeBuildInputs = [ @@ -29,6 +41,8 @@ mkDerivation rec { openbox ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "The Qt port of obconf, the Openbox configuration tool"; homepage = "https://github.com/lxqt/obconf-qt"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index 308077bc09..24343d4237 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -1,15 +1,25 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio, - pcre, qtbase, qttools, qtx11extras }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt +, libpulseaudio +, pcre +, qtbase +, qttools +, qtx11extras +}: mkDerivation rec { pname = "pavucontrol-qt"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "124dk41v8l5pv7afi1h7fgbhm8zj605yfd8b769sn7id2bqj7bis"; + sha256 = "0ppm79c6pkz2hvs1rri55d3s46j6r0vhiv634wzap9qshjb1j367"; }; nativeBuildInputs = [ @@ -26,6 +36,8 @@ mkDerivation rec { pcre ]; + passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "A Pulseaudio mixer in Qt (port of pavucontrol)"; homepage = "https://github.com/lxqt/pavucontrol-qt"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index b294cdf52a..f5a5b18cfc 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -1,15 +1,27 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt, qtbase, qttools, - qtx11extras, libfm-qt, menu-cache, lxmenu-data }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt +, qtbase +, qttools +, qtx11extras +, libfm-qt +, menu-cache +, lxmenu-data +, lxqtUpdateScript +}: mkDerivation rec { pname = "pcmanfm-qt"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1zchxlbyiifing94mqwh45pp7z3ihldknqiaz0kanq1cnma1jj6k"; + sha256 = "16zwd2jfrmsnzfpywirkrpyilq1jj99liwvg77l20b1dbql9dc0q"; }; nativeBuildInputs = [ @@ -28,6 +40,8 @@ mkDerivation rec { lxmenu-data ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)"; homepage = "https://github.com/lxqt/pcmanfm-qt"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/qlipper/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/qlipper/default.nix index d5da4737f8..fca585c459 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/qlipper/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/qlipper/default.nix @@ -1,19 +1,33 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qttools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qtbase +, qttools +, lxqtUpdateScript +}: mkDerivation rec { pname = "qlipper"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "pvanek"; repo = pname; rev = version; - sha256 = "0vlm4ab9isi7i2bimnyrk6083j2dfdrs14qj59vjcjri7mcwmf76"; + sha256 = "0zpkcqfylcfwvadp1bidcrr64d8ls5c7bdnkfqwjjd32sd35ly60"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; - buildInputs = [ qtbase qttools ]; + buildInputs = [ + qtbase + qttools + ]; + + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { description = "Cross-platform clipboard history applet"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/qps/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/qps/default.nix index cba01522de..7ef9db40f7 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/qps/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/qps/default.nix @@ -1,26 +1,49 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtx11extras, qttools, - lxqt-build-tools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, kwindowsystem +, liblxqt +, libqtxdg +, lxqt-build-tools +, lxqtUpdateScript +, qtbase +, qttools +, qtx11extras +}: mkDerivation rec { pname = "qps"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "03rl59yk3b24j0y0k8dpdpb3yi4f1l642zn5pp5br3s2vwx1vzkg"; + sha256 = "0jg7sfhdm5xsahzcw8hc2vpp5p3sqzdqwp4my65nj85i7wzgxmva"; }; - nativeBuildInputs = [ cmake lxqt-build-tools ]; + nativeBuildInputs = [ + cmake + lxqt-build-tools + ]; - buildInputs = [ qtbase qtx11extras qttools ]; + buildInputs = [ + kwindowsystem + liblxqt + libqtxdg + qtbase + qttools + qtx11extras + ]; + + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { description = "Qt based process manager"; homepage = "https://github.com/lxqt/qps"; license = licenses.gpl2; - platforms = with platforms; linux; # does not build on darwin + platforms = with platforms; linux; # does not build on darwin maintainers = with maintainers; [ romildo ]; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix index 2b4844654b..c7bcf6dad3 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix @@ -1,15 +1,24 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtermwidget, - qtbase, qttools, qtx11extras }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtermwidget +, qtbase +, qttools +, qtx11extras +, lxqtUpdateScript +}: mkDerivation rec { pname = "qterminal"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0bq6lvns56caijdmjm05nsj9vg69v9x5vid24bfxasck6q8nw24w"; + sha256 = "1vna0fvdasrdx7l5zxaaxi1v9fy34g2qblgkdhpczxivnmmxm5a3"; }; nativeBuildInputs = [ @@ -24,6 +33,8 @@ mkDerivation rec { qtermwidget ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "A lightweight Qt-based terminal emulator"; homepage = "https://github.com/lxqt/qterminal"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix index d20d4445c2..fc3fb4a5db 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -1,19 +1,35 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qttools, lxqt-build-tools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qtbase +, qttools +, lxqt-build-tools +, lxqtUpdateScript +}: mkDerivation rec { pname = "qtermwidget"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1pz8dwb86jpga4vfyn5v9n2s6dx3zh74yfp1kjsmsmhf878zs6lv"; + sha256 = "07wvcc650998yav9hr4hpm842j0iqdvls3mn9n2n4v8xvm7cii2m"; }; - nativeBuildInputs = [ cmake lxqt-build-tools ]; + nativeBuildInputs = [ + cmake + lxqt-build-tools + ]; - buildInputs = [ qtbase qttools ]; + buildInputs = [ + qtbase + qttools + ]; + + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { description = "A terminal emulator widget for Qt 5"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix index 7eff539091..6a2e14fa50 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix @@ -1,14 +1,28 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg, autoPatchelfHook }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, qtbase +, qttools +, qtx11extras +, qtsvg +, kwindowsystem +, libqtxdg +, xorg +, autoPatchelfHook +, lxqtUpdateScript +}: mkDerivation rec { pname = "screengrab"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1syvdqq45dr8hwigl9ax1wxr33m8z23nh6xzzlqbflyyd93xzjmn"; + sha256 = "07wm9q0nkrvmyb12kvh0709qrwizlxgy6i5j2czhb4giljrpr4x6"; }; nativeBuildInputs = [ @@ -28,6 +42,8 @@ mkDerivation rec { xorg.libXdmcp ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Crossplatform tool for fast making screenshots"; homepage = "https://github.com/lxqt/screengrab"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/update.sh b/third_party/nixpkgs/pkgs/desktops/lxqt/update.sh deleted file mode 100755 index 47d3dfb3d5..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/update.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p libarchive curl common-updater-scripts - -set -eu -o pipefail - -cd "$(dirname "${BASH_SOURCE[0]}")" -root=../../.. -export NIXPKGS_ALLOW_UNFREE=1 - -lxqt_version=0.14.1 -lxqtrepo=https://downloads.lxqt.org/${lxqt_version}.html - -version() { - (cd "$root" && nix-instantiate --eval --strict -A "$1.version" 2>/dev/null | tr -d '"') -} - -update_lxqt() { - local pname - local pversion - curl -sS ${lxqtrepo} | sed -rne 's|.*(.+) (.+)
|\1 \2|p' | - while read pname pversion; do - local pversionold=$(version lxqt.$pname) - if [[ "$pversion" = "$pversionold" ]]; then - echo "nothing to do, $pname $pversion is current" - else - echo "$pname: $pversionold -> $pversion" - (cd "$root" - local pfile=$(EDITOR=echo nix edit -f. lxqt.$pname 2>/dev/null) - update-source-version lxqt.$pname "$pversion" - git add $pfile - git commit -m "lxqt.$pname: $pversionold -> $pversion" - ) - fi - echo - done - echo DONE -} - -update_lxqt diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 26d8f86985..a429e1e66e 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -11,11 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gtk3 ]; - buildInputs = [ mate.mate-icon-theme ]; - - propagatedBuildInputs = [ - hicolor-icon-theme - ]; + propagatedBuildInputs = [ mate.mate-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index c448752595..a70fee6309 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-pantheon-shell"; - version = "2.8.3"; + version = "2.8.4"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0ypyppxx51l3r3fgxrvjdwnz33lpbfh1bf27fww9fx9520wixnx8"; + sha256 = "1nnsv745inbdqk3xnbcaqmj87vr3kzh5hazbh8v3ib33cpi7wy88"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix index 9db8baa4e9..9b370847fc 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "02g6x190lylng8d07pwx2bqcc71rq48f0dxh30mgndfii6k21qgs"; + sha256 = "03cq9ihgjasnv1n4v3dn1m3ypzj26k2ybd5b1a7yrbprb35zbrs4"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/third_party/nixpkgs/pkgs/desktops/xfce/art/xfce4-icon-theme.nix index e614bb1db9..526b703059 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/art/xfce4-icon-theme.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/art/xfce4-icon-theme.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, xfce }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome-icon-theme, tango-icon-theme, hicolor-icon-theme, xfce }: let category = "art"; @@ -19,6 +19,15 @@ stdenv.mkDerivation rec { gtk3 ]; + buildInputs = [ + gnome-icon-theme + tango-icon-theme + hicolor-icon-theme + # missing parent icon theme Industrial + ]; + + dontDropIconThemeCache = true; + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix index ffd42e4a2c..b7bede9e27 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.14.3"; + version = "4.14.4"; - sha256 = "0h8cqs2bghmyp0jihjm2wc7j14k271j178vllin271xrl7kzmvzv"; + sha256 = "1srzgb9vsvfrbhym74zkz9hdhxcrvbffxpfgv5vprhlwxw3vk3fq"; nativeBuildInputs = [ gobject-introspection ]; buildInputs = [ exo garcon gtk2 gtk3 glib glib-networking libxfce4ui libxfce4util libwnck3 xfconf ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index 262093af69..859a580bb7 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -1,15 +1,20 @@ -{ mkXfceDerivation, gtk3, glib, cmake, exo, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: +{ mkXfceDerivation, gettext, gtk3, glib, cmake, exo, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.4.3"; + version = "2.4.4"; rev-prefix = "v"; - sha256 = "1cs3fps1bj0dd5az7fwrvw1xl3y621qk4dma3n73p7rr19j7fpsn"; + sha256 = "08b82j9xp3vzjlc740s9svcjkbsal71ggp23y7dvjqppch7sdxzw"; nativeBuildInputs = [ cmake ]; - buildInputs = [ exo garcon gtk3 glib libxfce4ui libxfce4util xfce4-panel xfconf ]; + buildInputs = [ gettext exo garcon gtk3 glib libxfce4ui libxfce4util xfce4-panel xfconf ]; + + postPatch = '' + substituteInPlace panel-plugin/xfce4-popup-whiskermenu.in \ + --replace gettext ${gettext}/bin/gettext + ''; postInstall = '' substituteInPlace $out/bin/xfce4-popup-whiskermenu \ diff --git a/third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix b/third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix index aa472512d1..3512dcbd2b 100644 --- a/third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchurl, jdk, ant -, libusb, libusb1, unzip, zlib, ncurses, readline +, libusb-compat-0_1, libusb1, unzip, zlib, ncurses, readline , withGui ? false, gtk2 ? null, withTeensyduino ? false /* Packages needed for Teensyduino */ , upx, fontconfig, xorg, gcc @@ -42,7 +42,7 @@ let glib gtk2 libpng12 - libusb + libusb-compat-0_1 pango udev xorg.libSM @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { }; - buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline + buildInputs = [ jdk ant libusb-compat-0_1 libusb1 unzip zlib ncurses5 readline ] ++ stdenv.lib.optionals withTeensyduino [ upx ]; downloadSrcList = builtins.attrValues externalDownloads; downloadDstList = builtins.attrNames externalDownloads; @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { javaPath = lib.makeBinPath [jdk]; # Everything else will be patched into rpath - rpath = (lib.makeLibraryPath [zlib libusb libusb1 readline ncurses5 stdenv.cc.cc]); + rpath = (lib.makeLibraryPath [zlib libusb-compat-0_1 libusb1 readline ncurses5 stdenv.cc.cc]); installPhase = '' mkdir -p $out/share/arduino diff --git a/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix b/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix index 023c567638..3a03f633ff 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix @@ -1,11 +1,11 @@ { stdenv, cmake, python3, fetchFromGitHub, emscriptenRev ? null, substituteAll }: let - defaultVersion = "91"; + defaultVersion = "93"; # Map from git revs to SHA256 hashes sha256s = { - version_91 = "1qsjqnzc5w9ny9v01bxkdvhh4kgbsia01x5vvac72m075v4mpgs4"; + version_93 = "15y3703ha6mxcq168br0wlydas5rq66msrcsd650zrjz0ndxwsfx"; "1.39.1" = "0ygm9m5322h4vfpf3j63q32qxk2l26yk62hh7dkb49j51zwl1y3y"; }; in diff --git a/third_party/nixpkgs/pkgs/development/compilers/dmd/binary.nix b/third_party/nixpkgs/pkgs/development/compilers/dmd/binary.nix new file mode 100644 index 0000000000..cd3a15889b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/dmd/binary.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, glibc +, version, hashes }: +with stdenv; +let + OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; + MODEL = toString hostPlatform.parsed.cpu.bits; +in mkDerivation { + pname = "dmd-bootstrap"; + inherit version; + + src = fetchurl rec { + name = "dmd.${version}.${OS}.tar.xz"; + url = "http://downloads.dlang.org/releases/2.x/${version}/${name}"; + sha256 = hashes.${OS} or (throw "missing bootstrap sha256 for OS ${OS}"); + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ fixDarwinDylibNames autoPatchelfHook ]; + propagatedBuildInputs = [ curl tzdata ] ++ lib.optional hostPlatform.isLinux glibc; + + installPhase = '' + mkdir -p $out + + # try to copy model-specific binaries into bin first + mv ${OS}/bin${MODEL} $out/bin || true + + mv src license.txt ${OS}/* $out/ + + # move man into place + mkdir -p $out/share + mv man $out/share/ + + # move docs into place + mkdir -p $out/share/doc + mv html/d $out/share/doc/ + + # fix paths in dmd.conf (one level less) + substituteInPlace $out/bin/dmd.conf --replace "/../../" "/../" + ''; + + meta = with lib; { + inherit version; + description = "Digital Mars D Compiler Package"; + # As of 2.075 all sources and binaries use the boost license + license = licenses.boost; + maintainers = [ maintainers.lionello ]; + homepage = "https://dlang.org/"; + platforms = [ "x86_64-darwin" "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/dmd/bootstrap.nix b/third_party/nixpkgs/pkgs/development/compilers/dmd/bootstrap.nix new file mode 100644 index 0000000000..087781ae2c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/dmd/bootstrap.nix @@ -0,0 +1,9 @@ +{ callPackage }: +callPackage ./binary.nix { + version = "2.090.1"; + hashes = { + # Get these from `nix-prefetch-url http://downloads.dlang.org/releases/2.x/2.090.1/dmd.2.090.1.linux.tar.xz` etc.. + osx = "0rbn7j4dr3q0y09fblpj999bi063pi4230rqd5xgd3gwxxa0cz7l"; + linux = "1vk6lsvd6y7ccvffd23yial4ig90azaxf2rxc6yvidqd1qhan807"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/dmd/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dmd/default.nix index 9281e01ad3..a6d4f7e1e2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dmd/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dmd/default.nix @@ -1,11 +1,13 @@ { stdenv, lib, fetchFromGitHub , makeWrapper, unzip, which, writeTextFile -, curl, tzdata, gdb, darwin, git -, targetPackages, ldc -, version ? "2.085.1" -, dmdSha256 ? "0ccidfcawrcwdpfjwjiln5xwr4ffp8i2hwx52p8zn3xmc5yxm660" -, druntimeSha256 ? "109f2glsqrlshk06761xlw4r5v22mivp873cq9g5gcax3g00k617" -, phobosSha256 ? "0giispqqx8j8xg6c0hm7nx77bcahiwic8rvf12sws3sv5pizv8pr" +, curl, tzdata, gdb, darwin, git, callPackage +, targetPackages, fetchpatch, bash +, dmdBootstrap ? callPackage ./bootstrap.nix { } +, HOST_DMD ? "${dmdBootstrap}/bin/dmd" +, version ? "2.091.1" +, dmdSha256 ? "0brz0n84jdkhr4sq4k91w48p739psbhbb1jk2pi9q60psmx353yr" +, druntimeSha256 ? "0smgpmfriffh110ksski1s5j921kmxbc2zjy0dyj9ksyrxbzklbl" +, phobosSha256 ? "1n00anajgibrfs1xzvrmag28hvbvkc0w1fwlimqbznvhf28rhrxs" }: let @@ -51,7 +53,17 @@ stdenv.mkDerivation rec { }) ]; - patchFlags = [ "--directory=dmd" "-p1" ]; + patchFlags = [ "--directory=dmd" "-p1" "-F3" ]; + patches = [ + (fetchpatch { + url = "https://github.com/dlang/dmd/commit/4157298cf04f7aae9f701432afd1de7b7e05c30f.patch"; + sha256 = "0v4xgqmrx5r8vbx5a4v88s0xnm23mam9nm99yfga7s2sxr0hi5p2"; + }) + (fetchpatch { + url = "https://github.com/dlang/dmd/commit/1b8a4c90b040bf2f0b68a2739de4991315580b13.patch"; + sha256 = "1iih6aalv4fsw9mbrlrybhngkkchzzrzg7q8zl047w36c0x397cs"; + }) + ]; sourceRoot = "."; @@ -62,15 +74,17 @@ stdenv.mkDerivation rec { patchShebangs . ''; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + postPatch = '' + substituteInPlace dmd/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash" + '' + + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" '' - + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" ''; - nativeBuildInputs = [ ldc makeWrapper unzip which gdb git ] + nativeBuildInputs = [ makeWrapper unzip which gdb git ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Foundation @@ -89,7 +103,7 @@ stdenv.mkDerivation rec { # Buid and install are based on http://wiki.dlang.org/Building_DMD buildPhase = '' cd dmd - make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=ldmd2 + make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=${HOST_DMD} cd ../druntime make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} cd ../phobos @@ -147,8 +161,7 @@ stdenv.mkDerivation rec { # Everything is now Boost licensed, even the backend. # https://github.com/dlang/dmd/pull/6680 license = licenses.boost; - maintainers = with maintainers; [ ThomasMader ]; + maintainers = with maintainers; [ ThomasMader lionello ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; } - diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/buildDotnet.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/buildDotnet.nix index 1017c8b497..6f4237d2dc 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/buildDotnet.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/buildDotnet.nix @@ -13,10 +13,14 @@ assert builtins.elem type [ "aspnetcore" "netcore" "sdk"]; , curl }: let pname = if type == "aspnetcore" then "aspnetcore-runtime" else if type == "netcore" then "dotnet-runtime" else "dotnet-sdk"; + suffix = { + x86_64-linux = "x64"; + aarch64-linux = "arm64"; + }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); urls = { - aspnetcore = "https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/${version}/${pname}-${version}-linux-x64.tar.gz"; - netcore = "https://dotnetcli.azureedge.net/dotnet/Runtime/${version}/${pname}-${version}-linux-x64.tar.gz"; - sdk = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-linux-x64.tar.gz"; + aspnetcore = "https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/${version}/${pname}-${version}-linux-${suffix}.tar.gz"; + netcore = "https://dotnetcli.azureedge.net/dotnet/Runtime/${version}/${pname}-${version}-linux-${suffix}.tar.gz"; + sdk = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-linux-${suffix}.tar.gz"; }; descriptions = { aspnetcore = "ASP .NET Core runtime ${version}"; @@ -30,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = builtins.getAttr type urls; - inherit sha512; + sha512 = sha512."${stdenv.hostPlatform.system}" or (throw "Missing hash for host system: ${stdenv.hostPlatform.system}"); }; sourceRoot = "."; @@ -61,7 +65,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://dotnet.github.io/"; description = builtins.getAttr type descriptions; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ kuznero ]; license = licenses.mit; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix index 7b7a564ba3..6497e8bdf9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix @@ -5,27 +5,37 @@ dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_2_2 sdk_ { callPackage }: let buildDotnet = attrs: callPackage (import ./buildDotnet.nix attrs) {}; - buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; } ); - buildNetCore = attrs: buildDotnet (attrs // { type = "netcore"; } ); - buildNetCoreSdk = attrs: buildDotnet (attrs // { type = "sdk"; } ); -in rec { + buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); + buildNetCore = attrs: buildDotnet (attrs // { type = "netcore"; }); + buildNetCoreSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); +in +rec { combinePackages = attrs: callPackage (import ./combinePackages.nix attrs) {}; # v2.1.15 (LTS) aspnetcore_2_1 = buildAspNetCore { version = "2.1.16"; - sha512 = "0awdzi8dysbg8xcy4l8wx2sb8gaaklphmwv61qxh7dj6ih4nla34l02xdax1l8nw41znnnqzsa77avglnrz36pckm9mc52m7wc7877h"; + sha512 = { + x86_64-linux = "0awdzi8dysbg8xcy4l8wx2sb8gaaklphmwv61qxh7dj6ih4nla34l02xdax1l8nw41znnnqzsa77avglnrz36pckm9mc52m7wc7877h"; + aarch64-linux = null; # no aarch64 version of this package is available + }; }; netcore_2_1 = buildNetCore { version = "2.1.16"; - sha512 = "07vvmza32hsblpw4zpcksm2gicy4agh0d1fwradqj16y6xbh3frdp87mqgbj5m54mmyfp5bc8c46v1w6dfm1w3y80v2y46aynild45l"; + sha512 = { + x86_64-linux = "07vvmza32hsblpw4zpcksm2gicy4agh0d1fwradqj16y6xbh3frdp87mqgbj5m54mmyfp5bc8c46v1w6dfm1w3y80v2y46aynild45l"; + aarch64-linux = "27ab982vz9rn2vzpq68dqfzhryfixq3s0apx7vi0cwiray3scgfmf45fm7qj63k9mvaqnk5g69i339109yasw3q5vpvpyjc1ykbi710"; + }; }; sdk_2_1 = buildNetCoreSdk { version = "2.1.804"; - sha512 = "1kbzxcdgyvs94kkm6ikr1j0p0k3zq30d10sl69ig0rgbqbqm4rpqi6dq94jjbw7q3jlwz83vgq3549q38d2s9kalmzv9lmddn2kkc42"; + sha512 = { + x86_64-linux = "1kbzxcdgyvs94kkm6ikr1j0p0k3zq30d10sl69ig0rgbqbqm4rpqi6dq94jjbw7q3jlwz83vgq3549q38d2s9kalmzv9lmddn2kkc42"; + aarch64-linux = "2d97xvhxnkdgghqlichkwdxxh641dzkd9hq5xgffgvbqv1qsh31k9yib2q1nsarpnbx0d758bdn2jm2wvsj7nx0gpxlb3nab0b3hc2g"; + }; }; # v2.2 @@ -36,33 +46,51 @@ in rec { aspnetcore_3_0 = buildAspNetCore { version = "3.0.3"; - sha512 = "342v6kxxbxky09d1c392vvr9rm30lf75wccka1bk2h4advlcga5nlgv93g7vrq48bsyxfi5gc36r3b0dlwl1g409g5mlk1042n6d0yq"; + sha512 = { + x86_64-linux = "342v6kxxbxky09d1c392vvr9rm30lf75wccka1bk2h4advlcga5nlgv93g7vrq48bsyxfi5gc36r3b0dlwl1g409g5mlk1042n6d0yq"; + aarch64-linux = "2xkg4q88q5jw6jdz6cxj8vsjr475nd0fcvifkv1shdm2j9dsjy233hwpxbr140m5n5ggyh6z99238z9j4kp2az977y8y8irz8m8ppvf"; + }; }; netcore_3_0 = buildNetCore { version = "3.0.3"; - sha512 = "32ykpcw2xx708r2lxcwcbxnmy4sk159rlfjfvkw990qh7n79pm3lm2qwa3zhqcslznmpg18kwxz8qb5fgsa0h49g843xx4kyai0n7rx"; + sha512 = { + x86_64-linux = "32ykpcw2xx708r2lxcwcbxnmy4sk159rlfjfvkw990qh7n79pm3lm2qwa3zhqcslznmpg18kwxz8qb5fgsa0h49g843xx4kyai0n7rx"; + aarch64-linux = "1lp8din7d5jv5fkyq1a7m01i1xg9jwpiljvam1kcyzsnwzvi0cb4ji336cfx4lqrn95gvc75gkzi6q8b4fz0h21gvk6z6kmlcr63nyg"; + }; }; sdk_3_0 = buildNetCoreSdk { version = "3.0.103"; - sha512 = "2diiplgxs92fkb6ym68b02d79z4qn63x5qlky5lvr757c1zkh0vfpk3khawdg94kdn4qkn6dmyqr0msxqgmiqyhp63cadzqq4vx7b12"; + sha512 = { + x86_64-linux = "2diiplgxs92fkb6ym68b02d79z4qn63x5qlky5lvr757c1zkh0vfpk3khawdg94kdn4qkn6dmyqr0msxqgmiqyhp63cadzqq4vx7b12"; + aarch64-linux = "32843q2lj7dgciq62g9v1q31vwfjyv5vaxrz712d942mcg5lyzjygwri106bv4naq3a22131ldzwnsifbdn2vq1iz60raqdb7ss9vnf"; + }; }; # v3.1.1 (LTS) aspnetcore_3_1 = buildAspNetCore { version = "3.1.2"; - sha512 = "27708bk5liz8r39p4dzs41clgq298d49g8ipzdj56pz613vkfyv7bp91666ydz36aazm265j2g9ji3sk1f9kbgv6024zwrly5w9vqrm"; + sha512 = { + x86_64-linux = "27708bk5liz8r39p4dzs41clgq298d49g8ipzdj56pz613vkfyv7bp91666ydz36aazm265j2g9ji3sk1f9kbgv6024zwrly5w9vqrm"; + aarch64-linux = "2sm5yf376w5dm0za3gbcj251kc909fmlasmlyn70zhqp2jiii075vcqh40racjlwlhsfydx32cw7kgnv238lad5mw5jxy143zql5xl3"; + }; }; netcore_3_1 = buildNetCore { version = "3.1.2"; - sha512 = "3zwg1anrcni9kagmjxn485bpjvb146hkm7irmikq3v879gjhd2fgpscg226ds83l4pxll3r7lwris6ij952xmy8lsqraapd9111ba14"; + sha512 = { + x86_64-linux = "3zwg1anrcni9kagmjxn485bpjvb146hkm7irmikq3v879gjhd2fgpscg226ds83l4pxll3r7lwris6ij952xmy8lsqraapd9111ba14"; + aarch64-linux = "3hf61d5adlfffy51627ypp36qc5r55g9xwgfxqd0c7vj9bqmpiph673bvqqpr189df9shxr21p94cwrc5n36z72a37vw4ic8ks2yayx"; + }; }; sdk_3_1 = buildNetCoreSdk { version = "3.1.102"; - sha512 = "0lmz8ac5j0i4zcq4904kr6qibvyjcm2ckfg27kqyqfii00qmm80xb5sk3i7f06xqkbgkrqkbg9rsldk75akw6m5dxg932j602bxrb4w"; + sha512 = { + x86_64-linux = "0lmz8ac5j0i4zcq4904kr6qibvyjcm2ckfg27kqyqfii00qmm80xb5sk3i7f06xqkbgkrqkbg9rsldk75akw6m5dxg932j602bxrb4w"; + aarch64-linux = "34k6cm69gxm7vcd9m6bp47sdx96j32z6lfhb2vjcdznc6xgs2wy8zcang3b1mjm5919dq7v6iysm6ffcpgjhhphy7prlnaqa69q5mks"; + }; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix index 069769dbd5..625d7adab4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix @@ -39,7 +39,7 @@ let # Tests are failing after upgrade to ghc881. # Cause is probably just a minor change in stdout output # see https://github.com/avh4/elm-format/pull/640 - # doCheck = false; + doCheck = false; jailbreak = true; })); diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix index 54077994fb..4d7efcf108 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix @@ -28,7 +28,7 @@ mkDerivation { quickcheck-io split tasty tasty-golden tasty-hunit tasty-quickcheck text ]; - homepage = "http://elm-lang.org"; + homepage = "https://elm-lang.org"; description = "Instrumentation library for Elm"; license = stdenv.lib.licenses.bsd3; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix b/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix index b8864584ee..548abeff78 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper }: +{ stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles }: stdenv.mkDerivation rec { pname = "fstar"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0wix7l229afkn6c6sk4nwkfq0nznsiqdkds4ixi2yyf72immwmmb"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; buildInputs = with ocamlPackages; [ z3 ocaml findlib batteries menhir stdint @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { installFlags = [ "-C" "src/ocaml-output" ]; postInstall = '' wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin" + installShellCompletion --bash .completion/bash/fstar.exe.bash + installShellCompletion --fish .completion/fish/fstar.exe.fish + installShellCompletion --zsh --name _fstar.exe .completion/zsh/__fstar.exe ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.12.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.12.nix deleted file mode 100644 index 65e97d4e92..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.12.nix +++ /dev/null @@ -1,247 +0,0 @@ -{ stdenv, fetchurl, tzdata, iana-etc, runCommand -, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation -, mailcap, runtimeShell -, buildPackages, pkgsTargetTarget -}: - -let - - inherit (stdenv.lib) optionals optionalString; - - goBootstrap = runCommand "go-bootstrap" {} '' - mkdir $out - cp -rf ${buildPackages.go_bootstrap}/* $out/ - chmod -R u+w $out - find $out -name "*.c" -delete - cp -rf $out/bin/* $out/share/go/bin/ - ''; - - goarch = platform: { - i686 = "386"; - x86_64 = "amd64"; - aarch64 = "arm64"; - arm = "arm"; - armv5tel = "arm"; - armv6l = "arm"; - armv7l = "arm"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system"); - -in - -stdenv.mkDerivation rec { - pname = "go"; - version = "1.12.17"; - - src = fetchurl { - url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "09cbl90maxry713wd18jdqrms3ivbvcm472csnxc78rsqhc851yy"; - }; - - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch procps ]; - buildInputs = [ cacert pcre ] - ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] - ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; - - hardeningDisable = [ "all" ]; - - prePatch = '' - patchShebangs ./ # replace /bin/bash - - # This source produces shell script at run time, - # and thus it is not corrected by patchShebangs. - substituteInPlace misc/cgo/testcarchive/carchive_test.go \ - --replace '#!/usr/bin/env bash' '#!${runtimeShell}' - - # Patch the mimetype database location which is missing on NixOS. - substituteInPlace src/mime/type_unix.go \ - --replace '/etc/mime.types' '${mailcap}/etc/mime.types' - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{listen,parse}_test.go - rm src/syscall/exec_linux_test.go - - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/areturn' src/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/areturn' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/areturn' src/time/format_test.go - # Remove the api check as it never worked - sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go - # Remove the coverage test as we have removed this utility - sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go - # Remove the timezone naming test - sed -i '/TestLoadFixed/areturn' src/time/time_test.go - # Remove disable setgid test - sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go - # Remove cert tests that conflict with NixOS's cert resolution - sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go - # TestWritevError hangs sometimes - sed -i '/TestWritevError/areturn' src/net/writev_test.go - # TestVariousDeadlines fails sometimes - sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go - - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go - - # Disable cgo lookup tests not works, they depend on resolver - rm src/net/cgo_unix_test.go - - # Disable TestGcSys because it's flakey in our tests, but the failure is not - # reproducible by multiple people in other environments. - # See https://github.com/NixOS/nixpkgs/issues/68361#issuecomment-537849272 and following - # NOTE: Try re-enabling for releases newer than 1.12.9 - sed -i '/TestGcSys/areturn' src/runtime/gc_test.go - - '' + optionalString stdenv.isLinux '' - sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + optionalString stdenv.isAarch32 '' - echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash - '' + optionalString stdenv.isDarwin '' - substituteInPlace src/race.bash --replace \ - "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true - sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - - sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go - sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go - sed -i '/TestRead0/areturn' src/os/os_test.go - sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go - - sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go - sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go - - sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go - - sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go - - # TestCurrent fails because Current is not implemented on Darwin - sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go - sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - ''; - - patches = [ - ./remove-tools-1.11.patch - ./ssl-cert-file-1.12.1.patch - ./remove-test-pie.patch - ./creds-test.patch - ./go-1.9-skip-flaky-19608.patch - ./go-1.9-skip-flaky-20072.patch - ./skip-external-network-tests.patch - ./skip-nohup-tests.patch - ] ++ [ - # breaks under load: https://github.com/golang/go/issues/25628 - (if stdenv.isAarch32 - then ./skip-test-extra-files-on-aarch32.patch - else ./skip-test-extra-files-on-386.patch) - ]; - - postPatch = '' - find . -name '*.orig' -exec rm {} ';' - ''; - - GOOS = stdenv.targetPlatform.parsed.kernel.name; - GOARCH = goarch stdenv.targetPlatform; - # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. - # Go will nevertheless build a for host system that we will copy over in - # the install phase. - GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; - GOHOSTARCH = goarch stdenv.buildPlatform; - - # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those - # to be different from CC/CXX - CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" - else - null; - CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" - else - null; - - GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - # Hopefully avoids test timeouts on Hydra - GO_TEST_TIMEOUT_SCALE = 3; - - # Indicate that we are running on build infrastructure - # Some tests assume things like home directories and users exists - GO_BUILDER_NAME = "nix"; - - GOROOT_BOOTSTRAP="${goBootstrap}/share/go"; - - postConfigure = '' - export GOCACHE=$TMPDIR/go-cache - # this is compiled into the binary - export GOROOT_FINAL=$out/share/go - - export PATH=$(pwd)/bin:$PATH - - # Independent from host/target, CC should produce code for the building system. - export CC=${buildPackages.stdenv.cc}/bin/cc - ulimit -a - ''; - - postBuild = '' - (cd src && ./make.bash) - ''; - - doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; - - checkPhase = '' - runHook preCheck - (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) - runHook postCheck - ''; - - preInstall = '' - rm -r pkg/{bootstrap,obj} - # Contains the wrong perl shebang when cross compiling, - # since it is not used for anything we can deleted as well. - rm src/regexp/syntax/make_perl_groups.pl - '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' - mv bin/*_*/* bin - rmdir bin/*_* - ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} - ''} - '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' - rm -rf bin/*_* - ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} - ''} - '' else ""); - - installPhase = '' - runHook preInstall - mkdir -p $GOROOT_FINAL - cp -a bin pkg src lib misc api doc $GOROOT_FINAL - ln -s $GOROOT_FINAL/bin $out/bin - runHook postInstall - ''; - - setupHook = ./setup-hook.sh; - - disallowedReferences = [ goBootstrap ]; - - meta = with stdenv.lib; { - branch = "1.12"; - homepage = "http://golang.org/"; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs Frostman ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.13.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.13.nix deleted file mode 100644 index 8fee93cc4a..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.13.nix +++ /dev/null @@ -1,244 +0,0 @@ -{ stdenv, fetchurl, tzdata, iana-etc, runCommand -, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation -, mailcap, runtimeShell -, buildPackages, pkgsTargetTarget -}: - -let - - inherit (stdenv.lib) optionals optionalString; - - goBootstrap = runCommand "go-bootstrap" {} '' - mkdir $out - cp -rf ${buildPackages.go_bootstrap}/* $out/ - chmod -R u+w $out - find $out -name "*.c" -delete - cp -rf $out/bin/* $out/share/go/bin/ - ''; - - goarch = platform: { - "i686" = "386"; - "x86_64" = "amd64"; - "aarch64" = "arm64"; - "arm" = "arm"; - "armv5tel" = "arm"; - "armv6l" = "arm"; - "armv7l" = "arm"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system"); - -in - -stdenv.mkDerivation rec { - pname = "go"; - version = "1.13.8"; - - src = fetchurl { - url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0d7cxffk72568h46srzswrxd0bsdip7amgkf499wzn6l6d3g0fxi"; - }; - - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch procps ]; - buildInputs = [ cacert pcre ] - ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] - ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; - - hardeningDisable = [ "all" ]; - - prePatch = '' - patchShebangs ./ # replace /bin/bash - - # This source produces shell script at run time, - # and thus it is not corrected by patchShebangs. - substituteInPlace misc/cgo/testcarchive/carchive_test.go \ - --replace '#!/usr/bin/env bash' '#!${runtimeShell}' - - # Patch the mimetype database location which is missing on NixOS. - # but also allow static binaries built with NixOS to run outside nix - sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{listen,parse}_test.go - rm src/syscall/exec_linux_test.go - - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go - # Remove the api check as it never worked - sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go - # Remove the coverage test as we have removed this utility - sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go - # Remove the timezone naming test - sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go - # Remove disable setgid test - sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go - # Remove cert tests that conflict with NixOS's cert resolution - sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go - # TestWritevError hangs sometimes - sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go - # TestVariousDeadlines fails sometimes - sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go - - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go - - # Disable cgo lookup tests not works, they depend on resolver - rm src/net/cgo_unix_test.go - - '' + optionalString stdenv.isLinux '' - # prepend the nix path to the zoneinfo files but also leave the original value for static binaries - # that run outside a nix server - sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go - - '' + optionalString stdenv.isAarch32 '' - echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash - '' + optionalString stdenv.isDarwin '' - substituteInPlace src/race.bash --replace \ - "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true - sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - - sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go - sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go - sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go - sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go - - sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go - sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go - - sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go - - sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go - - # TestCurrent fails because Current is not implemented on Darwin - sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go - sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - ''; - - patches = [ - ./remove-tools-1.11.patch - ./ssl-cert-file-1.13.patch - ./remove-test-pie-1.13.patch - ./creds-test.patch - ./go-1.9-skip-flaky-19608.patch - ./go-1.9-skip-flaky-20072.patch - ./skip-external-network-tests.patch - ./skip-nohup-tests.patch - ] ++ [ - # breaks under load: https://github.com/golang/go/issues/25628 - (if stdenv.isAarch32 - then ./skip-test-extra-files-on-aarch32.patch - else ./skip-test-extra-files-on-386.patch) - ]; - - postPatch = '' - find . -name '*.orig' -exec rm {} ';' - ''; - - GOOS = stdenv.targetPlatform.parsed.kernel.name; - GOARCH = goarch stdenv.targetPlatform; - # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. - # Go will nevertheless build a for host system that we will copy over in - # the install phase. - GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; - GOHOSTARCH = goarch stdenv.buildPlatform; - - # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those - # to be different from CC/CXX - CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" - else - null; - CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" - else - null; - - GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - # Hopefully avoids test timeouts on Hydra - GO_TEST_TIMEOUT_SCALE = 3; - - # Indicate that we are running on build infrastructure - # Some tests assume things like home directories and users exists - GO_BUILDER_NAME = "nix"; - - GOROOT_BOOTSTRAP="${goBootstrap}/share/go"; - - postConfigure = '' - export GOCACHE=$TMPDIR/go-cache - # this is compiled into the binary - export GOROOT_FINAL=$out/share/go - - export PATH=$(pwd)/bin:$PATH - - # Independent from host/target, CC should produce code for the building system. - export CC=${buildPackages.stdenv.cc}/bin/cc - ulimit -a - ''; - - postBuild = '' - (cd src && ./make.bash) - ''; - - doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; - - checkPhase = '' - runHook preCheck - (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) - runHook postCheck - ''; - - preInstall = '' - rm -r pkg/obj - # Contains the wrong perl shebang when cross compiling, - # since it is not used for anything we can deleted as well. - rm src/regexp/syntax/make_perl_groups.pl - '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' - mv bin/*_*/* bin - rmdir bin/*_* - ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} - ''} - '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' - rm -rf bin/*_* - ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} - ''} - '' else ""); - - installPhase = '' - runHook preInstall - mkdir -p $GOROOT_FINAL - cp -a bin pkg src lib misc api doc $GOROOT_FINAL - ln -s $GOROOT_FINAL/bin $out/bin - runHook postInstall - ''; - - setupHook = ./setup-hook.sh; - - disallowedReferences = [ goBootstrap ]; - - meta = with stdenv.lib; { - branch = "1.13"; - homepage = "http://golang.org/"; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs kalbasit Frostman ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/remove-test-pie.patch b/third_party/nixpkgs/pkgs/development/compilers/go/remove-test-pie.patch deleted file mode 100644 index fb8e116af7..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/go/remove-test-pie.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- source.org/src/cmd/dist/test.go 2018-02-22 10:40:40.089632339 +0000 -+++ source/src/cmd/dist/test.go 2018-02-22 10:56:53.075193788 +0000 -@@ -526,21 +526,6 @@ - }) - } - -- // Test internal linking of PIE binaries where it is supported. -- if goos == "linux" && goarch == "amd64" && !isAlpineLinux() { -- // Issue 18243: We don't have a way to set the default -- // dynamic linker used in internal linking mode. So -- // this test is skipped on Alpine. -- t.tests = append(t.tests, distTest{ -- name: "pie_internal", -- heading: "internal linking of -buildmode=pie", -- fn: func(dt *distTest) error { -- t.addCmd(dt, "src", t.goTest(), "reflect", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60)) -- return nil -- }, -- }) -- } -- - // sync tests - t.tests = append(t.tests, distTest{ - name: "sync_cpu", diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch b/third_party/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch deleted file mode 100644 index aa3116d76c..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -Naur a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go ---- a/src/crypto/x509/root_cgo_darwin.go 2019-03-15 11:33:55.920232337 -0700 -+++ b/src/crypto/x509/root_cgo_darwin.go 2019-03-15 11:34:53.323180897 -0700 -@@ -270,11 +270,20 @@ - import "C" - import ( - "errors" -+ "io/ioutil" -+ "os" - "unsafe" - ) - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - - var data C.CFDataRef = 0 - var untrustedData C.CFDataRef = 0 -diff -Naur a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go ---- a/src/crypto/x509/root_darwin.go 2019-03-15 11:33:55.920232337 -0700 -+++ b/src/crypto/x509/root_darwin.go 2019-03-15 11:36:21.205123541 -0700 -@@ -92,6 +92,14 @@ - verifyCh = make(chan rootCandidate) - ) - -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } -+ - // Using 4 goroutines to pipe into verify-cert seems to be - // about the best we can do. The verify-cert binary seems to - // just RPC to another server with coarse locking anyway, so -diff -Naur a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go ---- a/src/crypto/x509/root_unix.go 2019-03-15 11:33:55.920232337 -0700 -+++ b/src/crypto/x509/root_unix.go 2019-03-15 11:37:15.737326340 -0700 -@@ -38,6 +38,13 @@ - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - - files := certFiles - if f := os.Getenv(certFileEnv); f != "" { diff --git a/third_party/nixpkgs/pkgs/development/compilers/ldc/binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ldc/binary.nix new file mode 100644 index 0000000000..56d40be861 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ldc/binary.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, libxml2 +, version, hashes }: +with stdenv; +let + OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; + ARCH = toString hostPlatform.parsed.cpu.name; +in mkDerivation { + pname = "ldc-bootstrap"; + inherit version; + + src = fetchurl rec { + name = "ldc2-${version}-${OS}-${ARCH}.tar.xz"; + url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/${name}"; + sha256 = hashes."${OS}-${ARCH}" or (throw "missing bootstrap sha256 for ${OS}-${ARCH}"); + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ fixDarwinDylibNames autoPatchelfHook ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxml2 stdenv.cc.cc ]; + + propagatedBuildInputs = [ curl tzdata ]; + + installPhase = '' + mkdir -p $out + + mv bin etc import lib LICENSE README $out/ + ''; + + meta = with lib; { + inherit version; + description = "The LLVM-based D Compiler"; + homepage = "https://github.com/ldc-developers/ldc"; + # from https://github.com/ldc-developers/ldc/blob/master/LICENSE + license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; + maintainers = with maintainers; [ ThomasMader lionello ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/ldc/bootstrap.nix b/third_party/nixpkgs/pkgs/development/compilers/ldc/bootstrap.nix new file mode 100644 index 0000000000..fde4c84268 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ldc/bootstrap.nix @@ -0,0 +1,10 @@ +{ callPackage }: +callPackage ./binary.nix { + version = "1.19.0"; + hashes = { + # Get these from `nix-prefetch-url https://github.com/ldc-developers/ldc/releases/download/v1.19.0/ldc2-1.19.0-osx-x86_64.tar.xz` etc.. + osx-x86_64 = "1bp3xkh9zp64dzq8isanib1gacb3nfbl70qv15qygwk1zan6zgy7"; + linux-x86_64 = "146grr2lwarfk13wgkpyb77xb6b3as1is2rf4s2hipqjmc8biy1h"; + linux-aarch64 = "1fv6jshfvi15m7masgxq1hgp216qjd5amizrqdf26vhrq3a08li3"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/ldc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ldc/default.nix index 19fe2981c8..5a4baabcf8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ldc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ldc/default.nix @@ -1,173 +1,5 @@ -{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata -, libconfig, lit, gdb, unzip, darwin, bash -, callPackage, makeWrapper, runCommand, targetPackages -, bootstrapVersion ? false -, version ? "1.17.0" -, ldcSha256 ? "1aag5jfrng6p4ms0fs90hjbv9bcj3hj8h52r68c3cm6racdajbva" -}: - -let - bootstrapLdc = if !bootstrapVersion then - # LDC 0.17.x is the last version which doesn't need a working D compiler to - # build so we use that version to bootstrap the actual build. - callPackage ./default.nix { - bootstrapVersion = true; - version = "0.17.6"; - ldcSha256 = "0qf5kbxddgmg3kqzi0kf4bgv8vdrnv16y07hcpm0cwv9mc3qr2w6"; - } - else - ""; - - pathConfig = runCommand "ldc-lib-paths" {} '' - mkdir $out - echo ${tzdata}/share/zoneinfo/ > $out/TZDatabaseDirFile - echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > $out/LibcurlPathFile - ''; -in - -stdenv.mkDerivation rec { - pname = "ldc"; - inherit version; - - enableParallelBuilding = true; - - src = fetchurl { - url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; - sha256 = ldcSha256; - }; - - # https://issues.dlang.org/show_bug.cgi?id=19553 - hardeningDisable = [ "fortify" ]; - - postUnpack = '' - patchShebangs . - '' - - + stdenv.lib.optionalString (!bootstrapVersion) '' - rm ldc-${version}-src/tests/d2/dmd-testsuite/fail_compilation/mixin_gc.d - rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/xtest46_gc.d - rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/testptrref_gc.d - - # test depends on current year - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ddocYear.d - '' - - + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' - # https://github.com/NixOS/nixpkgs/issues/34817 - rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall - ''; - - postPatch = '' - # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow - substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" - '' - - + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isLinux) '' - substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" - '' - - + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' - substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" - '' - - + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) '' - # Was not able to compile on darwin due to "__inline_isnanl" - # being undefined. - # TODO Remove with version > 0.17.6 - substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan - ''; - - nativeBuildInputs = [ cmake ninja makeWrapper unzip ] - ++ stdenv.lib.optionals (!bootstrapVersion) [ - bootstrapLdc lit lit.python - ] - ++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin) - # https://github.com/NixOS/nixpkgs/issues/57120 - # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 - llvm_5 - ++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) - llvm_8 - ++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) - # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 - gdb - ++ stdenv.lib.optionals (bootstrapVersion) [ - libconfig llvm_5 - ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin - darwin.apple_sdk.frameworks.Foundation; - - - buildInputs = [ curl tzdata ]; - - cmakeFlags = stdenv.lib.optionals (!bootstrapVersion) [ - "-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J${pathConfig}" - "-DCMAKE_BUILD_TYPE=Release" - ]; - - postConfigure = '' - export DMD=$PWD/bin/ldmd2 - ''; - - makeFlags = [ "DMD=$DMD" ]; - - fixNames = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - fixDarwinDylibNames() { - local flags=() - - for fn in "$@"; do - flags+=(-change "$(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 "$(pwd)/lib" -name "*.dylib") - export DYLD_LIBRARY_PATH=$(pwd)/lib - ''; - - # https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746 - additionalExceptions = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin - "|druntime-test-shared"; - - doCheck = !bootstrapVersion; - - checkPhase = stdenv.lib.optionalString doCheck '' - # Build default lib test runners - ninja -j$NIX_BUILD_CORES all-test-runners - - ${fixNames} - - # Run dmd testsuite - export DMD_TESTSUITE_MAKE_ARGS="-j$NIX_BUILD_CORES DMD=$DMD CC=$CXX" - ctest -V -R "dmd-testsuite" - - # Build and run LDC D unittests. - ctest --output-on-failure -R "ldc2-unittest" - - # Run LIT testsuite. - ctest -V -R "lit-tests" - - # Run default lib unittests - ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${additionalExceptions}" - ''; - - postInstall = '' - wrapProgram $out/bin/ldc2 \ - --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ - --set-default CC "${targetPackages.stdenv.cc}/bin/cc" - ''; - - meta = with stdenv.lib; { - description = "The LLVM-based D compiler"; - homepage = "https://github.com/ldc-developers/ldc"; - # from https://github.com/ldc-developers/ldc/blob/master/LICENSE - license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; - maintainers = with maintainers; [ ThomasMader ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - }; +import ./generic.nix { + version = "1.20.1"; + ldcSha256 = "1bqsgab22v02pc3c9gcyf15y7aimadv24d68icaw5lpgnvzxy89b"; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/ldc/generic.nix b/third_party/nixpkgs/pkgs/development/compilers/ldc/generic.nix new file mode 100644 index 0000000000..c93d423945 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ldc/generic.nix @@ -0,0 +1,143 @@ +{ version, ldcSha256 }: +{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata +, libconfig, lit, gdb, unzip, darwin, bash +, callPackage, makeWrapper, runCommand, targetPackages +, ldcBootstrap ? callPackage ./bootstrap.nix { } +}: + +let + pathConfig = runCommand "ldc-lib-paths" {} '' + mkdir $out + echo ${tzdata}/share/zoneinfo/ > $out/TZDatabaseDirFile + echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > $out/LibcurlPathFile + ''; + +in + +stdenv.mkDerivation rec { + pname = "ldc"; + inherit version; + + enableParallelBuilding = true; + + src = fetchurl { + url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; + sha256 = ldcSha256; + }; + + # https://issues.dlang.org/show_bug.cgi?id=19553 + hardeningDisable = [ "fortify" ]; + + postUnpack = '' + patchShebangs . + '' + + '' + rm ldc-${version}-src/tests/d2/dmd-testsuite/fail_compilation/mixin_gc.d + rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/xtest46_gc.d + rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/testptrref_gc.d + + # test depends on current year + rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ddocYear.d + '' + + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + # https://github.com/NixOS/nixpkgs/issues/34817 + rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall + ''; + + postPatch = '' + # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow + substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" + '' + + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" + '' + + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" + ''; + + nativeBuildInputs = [ + cmake ninja makeWrapper unzip ldcBootstrap lit lit.python + ] + ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + # https://github.com/NixOS/nixpkgs/issues/57120 + # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 + llvm_5 + ] + ++ stdenv.lib.optionals (!stdenv.hostPlatform.isDarwin) [ + llvm_8 + # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 + gdb + ]; + + buildInputs = [ curl tzdata ]; + + cmakeFlags = [ + "-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J${pathConfig}" + "-DCMAKE_BUILD_TYPE=Release" + ]; + + postConfigure = '' + export DMD=$PWD/bin/ldmd2 + ''; + + makeFlags = [ "DMD=$DMD" ]; + + fixNames = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + fixDarwinDylibNames() { + local flags=() + + for fn in "$@"; do + flags+=(-change "$(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 "$(pwd)/lib" -name "*.dylib") + export DYLD_LIBRARY_PATH=$(pwd)/lib + ''; + + # https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746 + additionalExceptions = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin + "|druntime-test-shared"; + + checkPhase = '' + # Build default lib test runners + ninja -j$NIX_BUILD_CORES all-test-runners + + ${fixNames} + + # Run dmd testsuite + export DMD_TESTSUITE_MAKE_ARGS="-j$NIX_BUILD_CORES DMD=$DMD" + ctest -V -R "dmd-testsuite" + + # Build and run LDC D unittests. + ctest --output-on-failure -R "ldc2-unittest" + + # Run LIT testsuite. + ctest -V -R "lit-tests" + + # Run default lib unittests + ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${additionalExceptions}" + ''; + + postInstall = '' + wrapProgram $out/bin/ldc2 \ + --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ + --set-default CC "${targetPackages.stdenv.cc}/bin/cc" + ''; + + meta = with stdenv.lib; { + description = "The LLVM-based D compiler"; + homepage = "https://github.com/ldc-developers/ldc"; + # from https://github.com/ldc-developers/ldc/blob/master/LICENSE + license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; + maintainers = with maintainers; [ ThomasMader lionello ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm.nix index 648c9fdefc..18c25f5181 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm.nix @@ -16,6 +16,7 @@ , enableSharedLibraries ? true , enablePFM ? !(stdenv.isDarwin || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + || stdenv.isAarch32 # broken for the armv7l builder ) , enablePolly ? true }: diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix index 55485418e4..702a0edb66 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix @@ -17,6 +17,7 @@ , enableSharedLibraries ? true , enablePFM ? !(stdenv.isDarwin || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + || stdenv.isAarch32 # broken for the armv7l builder ) , enablePolly ? false }: diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix index 43615fc675..2d996f0dd4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix @@ -16,6 +16,7 @@ , enableSharedLibraries ? true , enablePFM ? !(stdenv.isDarwin || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + || stdenv.isAarch32 # broken for the armv7l builder ) , enablePolly ? false }: diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm.nix index f69f45b858..aa58503a77 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm.nix @@ -16,6 +16,7 @@ , enableSharedLibraries ? true , enablePFM ? !(stdenv.isDarwin || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + || stdenv.isAarch32 # broken for the armv7l builder ) , enablePolly ? false }: diff --git a/third_party/nixpkgs/pkgs/development/compilers/open-watcom-bin/default.nix b/third_party/nixpkgs/pkgs/development/compilers/open-watcom-bin/default.nix new file mode 100644 index 0000000000..0cd80b6e1d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/open-watcom-bin/default.nix @@ -0,0 +1,67 @@ +{ stdenvNoCC, fetchurl, qemu, expect, writeScript, ncurses }: + +let + + # We execute the installer in qemu-user, because otherwise the + # installer fails to open itself due to a failed stat() call. This + # seems like an incompatibility of new Linux kernels to run this + # ancient binary. + performInstall = writeScript "perform-ow-install" '' + #!${expect}/bin/expect -f + + spawn env TERMINFO=${ncurses}/share/terminfo TERM=vt100 ${qemu}/bin/qemu-i386 [lindex $argv 0] + + # Wait for button saying "I agree" with escape sequences. + expect "gree" + + # Navigate to "I Agree!" and hit enter. + send "\t\t\n" + + expect "Install Open Watcom" + + # Where do we want to install to. + send "$env(out)\n" + + expect "will be installed" + + # Select Full Installation, Next + send "fn" + + expect "Setup will now copy" + + # Next + send "n" + + expect "completed successfully" + send "\n" + ''; + +in +stdenvNoCC.mkDerivation rec { + pname = "open-watcom-bin"; + version = "1.9"; + + src = fetchurl { + url = "http://ftp.openwatcom.org/install/open-watcom-c-linux-${version}"; + sha256 = "1wzkvc6ija0cjj5mcyjng5b7hnnc5axidz030c0jh05pgvi4nj7p"; + }; + + dontUnpack = true; + dontBuild = true; + dontConfigure = true; + + installPhase = '' + cp ${src} install-bin + chmod +x install-bin + + ${performInstall} install-bin + ''; + + meta = with stdenvNoCC.lib; { + description = "A C/C++ Compiler (binary distribution)"; + homepage = "http://www.openwatcom.org/"; + license = licenses.watcom; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ maintainers.blitz ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/unison/default.nix b/third_party/nixpkgs/pkgs/development/compilers/unison/default.nix index a8867d3146..c17f85b493 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/unison/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/unison/default.nix @@ -4,18 +4,18 @@ stdenv.mkDerivation rec { pname = "unison-code-manager"; - milestone_id = "M1h"; + milestone_id = "M1l"; version = "1.0.${milestone_id}-alpha"; src = if (stdenv.isDarwin) then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz"; - sha256 = "0iivm5gmbk0fq0zr3lvck6p1c2i7i54l3rf70z677529w9irzchp"; + sha256 = "0qbxakrp3p3k3k8a1m2g24ivs3c8j5rj7ij84i7k548505rva9qr"; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz"; - sha256 = "0fb84c1yn8pidflh7kq696j3v4blkvbk1fsqp36h30p7vv676yci"; + sha256 = "152yzv7j4nyp228ngzbhki9fid1xdqrjvl1rwxc05wq30jwwqx0x"; }; # The tarball is just the prebuilt binary, in the archive root. diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix index 7d9ec5e731..16813ac4f1 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix @@ -13,8 +13,12 @@ let buildInputs = [ coq.ocamlPackages.camlp5 ]; }; "8.10" = { - version = "1.1.1"; - sha256 = "0b6r7bsygl1axbqybkhkr7zlwcd51ski5ql52994klrrxvjd58df"; + version = "1.2"; + sha256 = "1ir313mmkgp2c65wgw8c681a15clvri1wb1hyjqmj7ymx4shkl56"; + }; + "8.11" = { + version = "1.2"; + sha256 = "1w317h7r5llyamzn1kqb8j6p5sxks2j8vq8wnpzrx01jqbyibxgy"; }; }; param = params.${coq.coq-version}; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/equations/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/equations/default.nix index c1177dc978..060fa3b4c8 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/equations/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/equations/default.nix @@ -21,15 +21,21 @@ let }; "8.9" = { - version = "1.2"; - rev = "v1.2-8.9"; - sha256 = "1q3wvicr43bgy7xn1diwh4j43mnrhprrc2xd22qlbz9cl6bhf8bj"; + version = "1.2.1"; + rev = "v1.2.1-8.9"; + sha256 = "0d8ddj6nc6p0k25cd8fs17cq427zhzbc3v9pk2wd2fnvk70nlfij"; }; "8.10" = { - version = "1.2"; - rev = "v1.2-8.10"; - sha256 = "1v5kx0xzxzsbs5r4w08rm1lrmjjggnd3ap0sd1my88ds17jzyasd"; + version = "1.2.1"; + rev = "v1.2.1-8.10-2"; + sha256 = "0j3z4l5nrbyi9zbbyqkc6kassjanwld2188mwmrbqspaypm2ys68"; + }; + + "8.11" = { + version = "1.2.1"; + rev = "v1.2.1-8.11"; + sha256 = "06k0h7lansxs479is3vj5ikg8s5k4c6svnqcwmxbni4wx8bhmg17"; }; }; param = params.${coq.coq-version}; 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 c432d2175e..eb431b9faf 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.1"; + name = "coq${coq.coq-version}-gappalib-1.4.3"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/37917/gappalib-coq-1.4.1.tar.gz"; - sha256 = "0d3f23a871haglg8hq1jgxz3y5nryiwy12b5xfnfjn279jfqqjw4"; + url = "https://gforge.inria.fr/frs/download.php/file/38302/gappalib-coq-1.4.3.tar.gz"; + sha256 = "108k9dks04wbcqz38pf0zz11hz5imbzimpnkgjrk5gp1hifih370"; }; nativeBuildInputs = [ which ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.7" "8.8" "8.9" ]; + compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.8" "8.9" "8.10" "8.11" ]; }; } 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 388280a905..b4ec8bd170 100644 --- a/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix +++ b/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix @@ -242,11 +242,7 @@ let # Add default meta information homepage = "https://${goPackagePath}"; platforms = go.meta.platforms or lib.platforms.all; - } // meta // { - # add an extra maintainer to every package - maintainers = (meta.maintainers or []) ++ - [ lib.maintainers.lethalman ]; - }; + } // meta; }); in if disabled then throw "${package.name} not supported for go ${go.meta.branch}" 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 d6edaa8647..b14c26c694 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -45,12 +45,6 @@ self: super: { # Needs older QuickCheck version attoparsec-varword = dontCheck super.attoparsec-varword; - # http://bugs.darcs.net/issue2642 - darcs = doJailbreak (appendPatches super.darcs [ - ./patches/darcs-setup.patch - ./patches/darcs-2.14.2-Compile-against-GHC-8.8.patch - ]); - # Tests are failing # https://github.com/bos/statistics/issues/123 statistics = dontCheck super.statistics; @@ -1073,35 +1067,8 @@ self: super: { # Generate shell completion. cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; - - stack = - let - stackWithOverrides = - super.stack.override { - # stack-2.1.3.1 requires pantry-0.2.0.0. - pantry = self.pantry_0_2_0_0; - }; - in - generateOptparseApplicativeCompletion - "stack" - (appendPatches stackWithOverrides [ - # This PR fixes stack up to be able to build with Cabal-3. This patch - # can probably be dropped when the next stack release is made after - # 2.1.3.1. - (pkgs.fetchpatch { - url = "https://github.com/commercialhaskell/stack/pull/5156.diff"; - sha256 = "0knk6f9fh1b4fxkhvx5gfrwclal4vi2va4zy34gpmwnjr7knf42y"; - excludes = [ - "snapshot-lts-12.yaml" - "snapshot-nightly.yaml" - "snapshot.yaml" - ]; - }) - # This patch fixes stack up to be able to build various GHC-8.8 changes. - # This can hopefully be dropped when the next stack release is made - # after 2.1.3.1 (assuming the next stack release uses GHC-8.8). - ./patches/stack-ghc882-support.patch - ]); + stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: { http-download = self.http-download_0_2_0_0; })); + http-download_0_2_0_0 = dontCheck super.http-download_0_2_0_0; # musl fixes # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test @@ -1457,11 +1424,8 @@ self: super: { 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, and it is keeping - # up with the most recent Cabal version. - cabal-install-parsers = dontCheck (super.cabal-install-parsers.overrideScope (self: super: { - Cabal = self.Cabal_3_2_0_0; - })); + # $HOME, which we don't have in our build sandbox. + cabal-install-parsers = dontCheck super.cabal-install-parsers; # haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2. haskell-ci = doJailbreak super.haskell-ci; @@ -1519,4 +1483,9 @@ self: super: { sha256 = "sha256:0xbfhzhzg94b4r5qy5dg1c40liswwpqarrc2chcwgfbfnrmwkfc2"; }); + # Depends on selective >= 0.4, but the default of selective is 0.3 + headed-megaparsec = super.headed-megaparsec.override { + selective = self.selective_0_4_1; + }; + } // 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 96ab593cf8..61919055eb 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 @@ -42,13 +42,32 @@ self: super: { unix = null; xhtml = null; + # The proper 3.2.0.0 release does not compile with ghc-8.10.1, so we take the + # hitherto unreleased next version from the '3.2' branch of the upstream git + # repository for the time being. + cabal-install = assert super.cabal-install.version == "3.2.0.0"; + overrideCabal super.cabal-install (drv: { + postUnpack = "sourceRoot+=/cabal-install; echo source root reset to $sourceRoot"; + version = "3.2.0.0-git"; + editedCabalFile = null; + src = pkgs.fetchgit { + url = "git://github.com/haskell/cabal.git"; + rev = "9bd4cc0591616aeae78e17167338371a2542a475"; + sha256 = "005q1shh7vqgykkp72hhmswmrfpz761x0q0jqfnl3wqim4xd9dg0"; + }; + }); + # Deviate from Stackage LTS-15.x to fix the build. haddock-library = self.haddock-library_1_9_0; # Jailbreak to fix the build. async = doJailbreak super.async; ChasingBottoms = doJailbreak super.ChasingBottoms; + ed25519 = doJailbreak super.ed25519; + email-validate = doJailbreak super.email-validate; # https://github.com/Porges/email-validate-hs/issues/51 + feed = doJailbreak super.feed; # https://github.com/bergmark/feed/issues/48 hashable = doJailbreak super.hashable; + pandoc = doJailbreak super.pandoc; parallel = doJailbreak super.parallel; regex-base = doJailbreak super.regex-base; regex-compat = doJailbreak super.regex-compat; @@ -56,16 +75,21 @@ self: super: { regex-posix = doJailbreak super.regex-posix; regex-tdfa = doJailbreak super.regex-tdfa; split = doJailbreak super.split; + system-fileio = doJailbreak super.system-fileio; tar = doJailbreak super.tar; tasty-expected-failure = doJailbreak super.tasty-expected-failure; + tasty-rerun = doJailbreak super.tasty-rerun; # https://github.com/ocharles/tasty-rerun/issues/18 unliftio-core = doJailbreak super.unliftio-core; vector = doJailbreak super.vector; zlib = doJailbreak super.zlib; # Use the latest version to fix the build. + dhall = self.dhall_1_31_1; + ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_4; + lens = self.lens_4_19_2; optics-core = self.optics-core_0_3; repline = self.repline_0_3_0_0; - ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_4; + singletons = self.singletons_2_7; th-desugar = self.th-desugar_1_11; # `ghc-lib-parser-ex` (see conditionals in its `.cabal` file) does not need @@ -77,14 +101,17 @@ self: super: { # Jailbreak to fix the build. aeson-diff = doJailbreak super.aeson-diff; + brick = doJailbreak super.brick; cborg = doJailbreak super.cborg; cborg-json = doJailbreak super.cborg-json; exact-pi = doJailbreak super.exact-pi; + policeman = doJailbreak super.policeman; relude = dontCheck (doJailbreak super.relude); serialise = doJailbreak super.serialise; setlocale = doJailbreak super.setlocale; shellmet = doJailbreak super.shellmet; - brick = doJailbreak super.brick; + weeder = doJailbreak super.weeder; # https://github.com/ocharles/weeder/issues/15 + xmobar = doJailbreak super.xmobar; # The shipped Setup.hs file is broken. csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; }); @@ -98,4 +125,18 @@ self: super: { # Only 0.8 is compatible with ghc 8.10 https://hackage.haskell.org/package/apply-refact/changelog apply-refact = super.apply-refact_0_8_0_0; + + # Apply patch to fix the build. + cabal-plan = appendPatch super.cabal-plan (pkgs.fetchpatch { + name = "cabal-plan-fix-for-ghc-8.10.x.patch"; + url = "https://github.com/haskell-hvr/cabal-plan/pull/55.patch"; + sha256 = "0lhs4vx5qg5ldhnyb9z7k0jmxhmd2f34x4xbwv6vsljs9vr02pd8"; + }); + dbus = appendPatch super.dbus ./patches/fix-dbus-for-ghc-8.10.x.patch; + + # https://github.com/ndmitchell/hlint/issues/959 + hlint = super.hlint.override { + ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex super.ghc-lib-parser; + }; + } 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 bdd5a9007d..7395d059b4 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 @@ -102,4 +102,8 @@ self: super: { # Only 0.7 is compatible with ghc 8.7 https://hackage.haskell.org/package/apply-refact/changelog apply-refact = super.apply-refact_0_7_0_0; + + # The package needs the latest Cabal version. + cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; }); + } 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 d57c49554c..ca05752930 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -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 15.9 + # LTS Haskell 15.10 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -319,7 +319,7 @@ default-package-overrides: - blaze-bootstrap ==0.1.0.1 - blaze-builder ==0.4.1.0 - blaze-html ==0.9.1.2 - - blaze-markup ==0.8.2.4 + - blaze-markup ==0.8.2.5 - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.1.0 - bmp ==1.2.6.3 @@ -437,9 +437,9 @@ default-package-overrides: - codec-rpm ==0.2.2 - code-page ==0.2 - coercible-utils ==0.1.0 - - co-log ==0.4.0.0 - - co-log-core ==0.2.1.0 - - co-log-polysemy ==0.0.1.1 + - co-log ==0.4.0.1 + - co-log-core ==0.2.1.1 + - co-log-polysemy ==0.0.1.2 - Color ==0.1.4 - colorful-monoids ==0.2.1.2 - colorize-haskell ==1.0.1 @@ -859,7 +859,7 @@ default-package-overrides: - gi-glib ==2.0.23 - gi-gobject ==2.0.22 - gi-graphene ==1.0.1 - - gi-gtk ==3.0.32 + - gi-gtk ==3.0.33 - gi-gtk-hs ==0.3.8.1 - gingersnap ==0.3.1.0 - gi-pango ==1.0.22 @@ -889,7 +889,7 @@ default-package-overrides: - graphviz ==2999.20.0.4 - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 - - greskell ==1.0.0.1 + - greskell ==1.0.1.0 - greskell-core ==0.1.3.2 - greskell-websocket ==0.1.2.1 - groom ==0.1.2.1 @@ -932,6 +932,8 @@ default-package-overrides: - HaXml ==1.25.5 - haxr ==3000.11.4 - hdaemonize ==0.5.6 + - HDBC ==2.4.0.3 + - HDBC-session ==0.1.2.0 - headroom ==0.1.3.0 - heap ==1.0.4 - heaps ==0.3.6.1 @@ -958,7 +960,7 @@ default-package-overrides: - highlighting-kate ==0.6.4 - hinfo ==0.0.3.0 - hinotify ==0.4 - - hint ==0.9.0.2 + - hint ==0.9.0.3 - hjsmin ==0.2.0.4 - hkgr ==0.2.5.2 - hlibcpuid ==0.2.0 @@ -1471,7 +1473,7 @@ default-package-overrides: - OneTuple ==0.2.2.1 - Only ==0.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.6.7004.1 + - opaleye ==0.6.7004.2 - OpenAL ==1.7.0.5 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 @@ -1541,6 +1543,7 @@ default-package-overrides: - perfect-vector-shuffle ==0.1.1.1 - persist ==0.1.1.4 - persistable-record ==0.6.0.4 + - persistable-types-HDBC-pg ==0.0.3.5 - persistent ==2.10.5.2 - persistent-mysql ==2.10.2.3 - persistent-pagination ==0.1.1.1 @@ -1625,7 +1628,7 @@ default-package-overrides: - print-console-colors ==0.1.0.0 - process-extras ==0.7.4 - product-isomorphic ==0.0.3.3 - - product-profunctors ==0.10.0.0 + - product-profunctors ==0.10.0.1 - profiterole ==0.1 - profunctors ==5.5.2 - projectroot ==0.2.0.1 @@ -1727,6 +1730,8 @@ default-package-overrides: - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.2.2 + - relational-query-HDBC ==0.7.2.0 + - relational-record ==0.2.2.0 - relational-schemas ==0.1.8.0 - relude ==0.6.0.0 - renderable ==0.2.0.1 @@ -1738,10 +1743,10 @@ default-package-overrides: - rerebase ==1.4.1 - resolv ==0.1.2.0 - resource-pool ==0.2.3.2 - - resourcet ==1.2.3 + - resourcet ==1.2.4 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - - retry ==0.8.1.1 + - retry ==0.8.1.2 - rev-state ==0.1.2 - rfc1751 ==0.1.2 - rfc5051 ==0.1.0.4 @@ -1779,8 +1784,8 @@ default-package-overrides: - sampling ==0.3.3 - say ==0.1.0.1 - sbp ==2.6.3 - - scalpel ==0.6.1 - - scalpel-core ==0.6.1 + - scalpel ==0.6.2 + - scalpel-core ==0.6.2 - scanf ==0.1.0.0 - scanner ==0.3.1 - scheduler ==1.4.2.2 @@ -1844,7 +1849,7 @@ default-package-overrides: - servant-swagger-ui-redoc ==0.3.3.1.22.3 - servant-websockets ==2.0.0 - servant-yaml ==0.1.0.1 - - serverless-haskell ==0.10.2 + - serverless-haskell ==0.10.5 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - ses-html ==0.4.0.0 @@ -1889,7 +1894,7 @@ default-package-overrides: - skip-var ==0.1.1.0 - skylighting ==0.8.3.4 - skylighting-core ==0.8.3.4 - - slist ==0.1.0.0 + - slist ==0.1.1.0 - small-bytearray-builder ==0.3.4.0 - smallcheck ==1.1.5 - smoothie ==0.4.2.10 @@ -1946,7 +1951,7 @@ default-package-overrides: - streaming ==0.2.3.0 - streaming-bytestring ==0.1.6 - streaming-commons ==0.2.1.2 - - streamly ==0.7.1 + - streamly ==0.7.2 - streams ==3.3 - strict ==0.3.2 - strict-base-types ==0.6.1 @@ -1960,8 +1965,8 @@ default-package-overrides: - string-qq ==0.0.4 - stringsearch ==0.3.6.6 - string-transform ==1.1.1 - - stripe-concepts ==1.0.2.0 - - stripe-signature ==1.0.0.1 + - stripe-concepts ==1.0.2.2 + - stripe-signature ==1.0.0.2 - strive ==5.0.10 - structs ==0.1.3 - structured-cli ==2.5.2.0 @@ -2035,7 +2040,7 @@ default-package-overrides: - test-framework-th ==0.2.4 - testing-feat ==1.1.0.0 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.0.1 + - texmath ==0.12.0.2 - text-binary ==0.2.1.1 - text-builder ==0.6.6.1 - text-conversions ==0.3.0 @@ -2131,7 +2136,7 @@ default-package-overrides: - typed-uuid ==0.0.0.2 - type-equality ==1 - type-errors ==0.2.0.0 - - type-errors-pretty ==0.0.1.0 + - type-errors-pretty ==0.0.1.1 - type-fun ==0.1.1 - type-hint ==0.1 - type-level-integers ==0.0.1 @@ -2143,7 +2148,7 @@ default-package-overrides: - type-of-html ==1.5.1.0 - type-of-html-static ==0.1.0.2 - type-operators ==0.2.0.0 - - typerep-map ==0.3.2 + - typerep-map ==0.3.3.0 - type-spec ==0.4.0.0 - tzdata ==0.1.20190911.0 - ua-parser ==0.7.5.1 @@ -2201,7 +2206,7 @@ default-package-overrides: - validity ==0.9.0.3 - validity-aeson ==0.2.0.3 - validity-bytestring ==0.4.1.1 - - validity-containers ==0.5.0.1 + - validity-containers ==0.5.0.3 - validity-path ==0.4.0.1 - validity-primitive ==0.0.0.1 - validity-scientific ==0.2.0.3 @@ -4419,6 +4424,8 @@ broken-packages: - elision - elm-street - elm-websocket + - elynx + - elynx-markov - elynx-seq - elynx-tools - elynx-tree @@ -5333,7 +5340,6 @@ broken-packages: - haddock-leksah - haddock-test - haddocset - - hadolint - hadoop-formats - hadoop-rpc - hadoop-tools @@ -5626,7 +5632,6 @@ broken-packages: - hasql-postgres - hasql-postgres-options - hasql-simple - - hasql-th - hastache - hastache-aeson - haste @@ -5708,7 +5713,6 @@ broken-packages: - hdph-closure - hdr-histogram - HDRUtils - - headed-megaparsec - headergen - heapsort - heart-app @@ -8658,6 +8662,7 @@ broken-packages: - reflex-basic-host - reflex-dom-retractable - reflex-dom-svg + - reflex-dynamic-containers - reflex-fsnotify - reflex-ghci - reflex-gloss @@ -8666,6 +8671,7 @@ broken-packages: - reflex-orphans - reflex-process - reflex-sdl2 + - reflex-test-host - reflex-transformers - reflex-vty - reformat @@ -9151,6 +9157,7 @@ broken-packages: - shake-pack - shake-path - shake-persist + - shakebook - shaker - shakespeare-babel - shakespeare-sass 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 ba885c0ecd..78e44a5ec8 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -628,11 +628,6 @@ self: super: builtins.intersectAttrs super { http-download = dontCheck super.http-download; pantry = dontCheck super.pantry; - # Hadolint wants to build a statically linked binary by default. - hadolint = overrideCabal super.hadolint (drv: { - preConfigure = "sed -i -e /ld-options:/d hadolint.cabal"; - }); - # gtk2hs-buildtools is listed in setupHaskellDepends, but we # need it during the build itself, too. cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools; @@ -720,10 +715,9 @@ self: super: builtins.intersectAttrs super { # break infinite recursion with base-orphans primitive = dontCheck super.primitive; - # dhall-1.29.0 tests access the network. This override can be removed when - # dhall_1_29_0 is no longer used, since more recent versions of dhall don't - # access the network in checks. + # dhall's tests access the network. dhall_1_29_0 = dontCheck super.dhall_1_29_0; + dhall_1_31_1 = dontCheck super.dhall_1_31_1; cut-the-crap = let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg ]; 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 2eca7e4ec5..f3b7392e1d 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -1528,7 +1528,7 @@ self: { base colour diagrams-cairo diagrams-lib directory either-unwrap filepath parsec ParsecTools StockholmAlignment SVGFonts text vector ]; - description = "Libary for Hidden Markov Models in HMMER3 format"; + description = "Libary for Hidden Markov Models in HMMER3 format."; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -2511,7 +2511,7 @@ self: { version = "0.3.1.0"; sha256 = "0dlb761kj33v9p53fw44gg4r7j8kcl4jxvvgi7rz0pv8v7nh6255"; libraryHaskellDepends = [ base ]; - description = "Definition of a CSP core-language"; + description = "Definition of a CSP core-language."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -2912,7 +2912,7 @@ self: { version = "0.3"; sha256 = "10m7l701p3a2w0kxi2b93g2ii6s4s71zyjypqk3mi79siv8yilif"; libraryHaskellDepends = [ base mtl ]; - description = "A monad for complex manipulation of a stream"; + description = "A monad for complex manipulation of a stream."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -3639,7 +3639,7 @@ self: { version = "0.1"; sha256 = "027dv53jrfk46dmiidnnrrdvhyin60i862znp414213w72yjrbhh"; libraryHaskellDepends = [ base template-haskell ]; - description = "Practical typed lazy contracts"; + description = "Practical typed lazy contracts."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -5621,7 +5621,7 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers haskell98 ]; - description = "A set of computational morphology tools for Swedish diachronic lexicons"; + description = "A set of computational morphology tools for Swedish diachronic lexicons."; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -6354,8 +6354,8 @@ self: { }: mkDerivation { pname = "Frames"; - version = "0.6.2"; - sha256 = "1pbwrjcd8fm56hnxw6q42adn9n7maj96j3a2qyb6a668pc8q8jyx"; + version = "0.6.3"; + sha256 = "1iqzsx33312m75bprp9i9dr11f9dpa8x02296vgmjskmcblh9as5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6393,7 +6393,7 @@ self: { base beam-core beam-migrate beam-postgres bytestring conduit Frames generics-sop hspec hspec-core QuickCheck text vinyl ]; - description = "A library for accessing Postgres tables as in-memory data structures"; + description = "A library for accessing Postgres tables as in-memory data structures."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -9149,7 +9149,7 @@ self: { base bytestring DebugTraceHelpers directory filepath HSH HStringTemplateHelpers MissingH mtl regex-pcre unix ]; - description = "Convenience functions that use HSH, instances for HSH"; + description = "Convenience functions that use HSH, instances for HSH."; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -19083,7 +19083,7 @@ self: { version = "0.1.4"; sha256 = "0rpjd93lsqg3dqfjndm9l1nzyrbfs5nnvc61lmbmbhg0bcy0jms8"; libraryHaskellDepends = [ base template-haskell ]; - description = "TH implementation of effects"; + description = "TH implementation of effects."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -22480,6 +22480,8 @@ self: { pname = "acme-circular-containers"; version = "0.1.0.0"; sha256 = "1xngqlx0avn84qx696hjm8cdqqs9p0ls90kklkz5rs48fbcma3pr"; + revision = "2"; + editedCabalFile = "0zshb422bmcjisa1hq2mfvmijcsgk9lyi3f5wai62ydablxqdhbm"; libraryHaskellDepends = [ base containers graph-wrapper ]; testHaskellDepends = [ base containers doctest doctest-discover graph-wrapper @@ -34402,6 +34404,8 @@ self: { pname = "authenticate-oauth"; version = "1.6.0.1"; sha256 = "1hry1zbi7gbyfi94w9cyg6m7ii7xm68jnsph63zxdj2s4ns0ylp0"; + revision = "1"; + editedCabalFile = "0pyivmsmlzhpnzpi3jcmqyjjx5a1p7cl1grjyw8571pmxz6735w3"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring crypto-pubkey-types data-default http-client http-types random RSA SHA time @@ -34473,6 +34477,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "autoapply" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, logict, mtl + , template-haskell, th-desugar, transformers, unification-fd + }: + mkDerivation { + pname = "autoapply"; + version = "0.2.0.0"; + sha256 = "0dcndh1rjxyx7889d8n52hngariq6lnidwpjxyhsxd30xb4lwij2"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base logict mtl template-haskell th-desugar transformers + unification-fd + ]; + testHaskellDepends = [ base doctest ]; + description = "Template Haskell to automatically pass values to functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "autoexporter" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { @@ -36434,16 +36456,16 @@ self: { }) {}; "barbies" = callPackage - ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit + ({ mkDerivation, base, distributive, QuickCheck, tasty, tasty-hunit , tasty-quickcheck, transformers }: mkDerivation { pname = "barbies"; - version = "2.0.0.0"; - sha256 = "0rbwdx9s940wfrlkay772i0q11rbywnhzigh5wy8sppx19pgfq9z"; - libraryHaskellDepends = [ base transformers ]; + version = "2.0.1.0"; + sha256 = "0d2a1d9w8xlviarlrrnlrfs82zf6gzxv09i6sa4ci1bl8df64wmj"; + libraryHaskellDepends = [ base distributive transformers ]; testHaskellDepends = [ - base QuickCheck tasty tasty-hunit tasty-quickcheck + base distributive QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "Classes for working with types that can change clothes"; license = stdenv.lib.licenses.bsd3; @@ -36656,10 +36678,8 @@ self: { }: mkDerivation { pname = "base-encoding"; - version = "0.1.0.0"; - sha256 = "1chmx5qvglf91i0c9ih9xydzb37v8j4bykvmb2g6pyg7wdq0s8si"; - revision = "2"; - editedCabalFile = "0flfvs03zs7k04x7yhsc3jiw3zpnx7n3637jyy10flpqv90fy6sx"; + version = "0.2.0.0"; + sha256 = "028b7pbpbnph2k4jzvp9kyn2s7d0zd62panh21digwn4nnc3hbp1"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring text ]; @@ -36758,13 +36778,15 @@ self: { "base16" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, criterion , deepseq, memory, primitive, random-bytestring, tasty, tasty-hunit - , text + , text, text-short }: mkDerivation { pname = "base16"; - version = "0.2.0.1"; - sha256 = "1y7ighqi1id57kh04ks8bg8b2vvzmy25p4qgdq26y0ydfz33gmsh"; - libraryHaskellDepends = [ base bytestring primitive text ]; + version = "0.2.1.0"; + sha256 = "192wnfqb97qhpjrjlq2da5jrjz9zjqjp57rgh1xdvdrnp7900r0s"; + libraryHaskellDepends = [ + base bytestring primitive text text-short + ]; testHaskellDepends = [ base base16-bytestring bytestring memory random-bytestring tasty tasty-hunit text @@ -37566,6 +37588,21 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "bazel-runfiles_0_12" = callPackage + ({ mkDerivation, base, directory, filepath, transformers }: + mkDerivation { + pname = "bazel-runfiles"; + version = "0.12"; + sha256 = "1x9w6j5yb0rxaaymzvv2hr5g00cy4zhkv79xgb8ns9frnv2bx2km"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath transformers ]; + executableHaskellDepends = [ base filepath ]; + description = "Locate Bazel runfiles location"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bbdb" = callPackage ({ mkDerivation, base, hspec, parsec }: mkDerivation { @@ -38330,7 +38367,7 @@ self: { ghc-paths haskeline haskell-src-exts language-python monads-tf parseargs process transformers ]; - description = "An implementation of Python 3"; + description = "An implementation of Python 3."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -39474,6 +39511,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "binaryen" = callPackage + ({ mkDerivation, base, binaryen }: + mkDerivation { + pname = "binaryen"; + version = "0.0.1.0"; + sha256 = "01fiq7q9iw6lipvwpr7bfsqw337ncxagd04g62h8qgvlgysh7vvh"; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ binaryen ]; + description = "Haskell bindings to binaryen"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) binaryen;}; + "bind-marshal" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim , monads-tf, mtl, numeric-prelude, random, stm, strict @@ -39948,7 +39997,7 @@ self: { license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) libftdi; inherit (pkgs) libusb;}; + }) {inherit (pkgs) libftdi; libusb = null;}; "bindings-libg15" = callPackage ({ mkDerivation, base, bindings-DSL, g15 }: @@ -40006,7 +40055,7 @@ self: { libraryPkgconfigDepends = [ libusb ]; description = "Low level bindings to libusb"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libusb;}; + }) {libusb = null;}; "bindings-libv4l2" = callPackage ({ mkDerivation, base, bindings-DSL, v4l2 }: @@ -40232,7 +40281,7 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ sipc ]; executableHaskellDepends = [ base ]; - description = "Low level bindings to SIPC"; + description = "Low level bindings to SIPC."; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -41510,8 +41559,8 @@ self: { }: mkDerivation { pname = "bitwise-enum"; - version = "1.0.0"; - sha256 = "11klr2qxbly9ppcv7b1pcrvqfw6h0l3qqwy0wzlv05jqhaywjxwc"; + version = "1.0.0.1"; + sha256 = "0y7x2yyvbdvwg5g5rrl9dbh2syvl1y74pwlccq2w2v5rhr8ql2cb"; libraryHaskellDepends = [ aeson array base deepseq mono-traversable vector ]; @@ -42115,23 +42164,6 @@ self: { }) {}; "blaze-markup" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text - }: - mkDerivation { - pname = "blaze-markup"; - version = "0.8.2.4"; - sha256 = "0xb2hd5n6ymax6yw5hyi05lgllq5ldw28mgfxjpljrws9m8i078w"; - libraryHaskellDepends = [ base blaze-builder bytestring text ]; - testHaskellDepends = [ - base blaze-builder bytestring containers HUnit QuickCheck tasty - tasty-hunit tasty-quickcheck text - ]; - description = "A blazingly fast markup combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "blaze-markup_0_8_2_5" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text }: @@ -42146,7 +42178,6 @@ self: { ]; description = "A blazingly fast markup combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blaze-shields" = callPackage @@ -43636,8 +43667,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "box-tuples"; - version = "0.1.1.0"; - sha256 = "1j0s7pb9milrz5spqsxwwhva1zwa7ywwd8nbb5y0z97p84wvyy7k"; + version = "0.2.0.3"; + sha256 = "12a3jj3z1gni8925n16ipqyah8vg244lx88v289f2rldiyvh3bvf"; libraryHaskellDepends = [ base ghc-prim ]; description = "A hack to use GHC.Prim primitives in GHCi"; license = stdenv.lib.licenses.mit; @@ -43853,6 +43884,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "brick_0_53" = callPackage + ({ mkDerivation, base, bytestring, config-ini, containers + , contravariant, data-clist, deepseq, directory, dlist, exceptions + , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm + , template-haskell, text, text-zipper, transformers, unix, vector + , vty, word-wrap + }: + mkDerivation { + pname = "brick"; + version = "0.53"; + sha256 = "15k9sc5y3xcjd3kfjs0rnsqxbiy9k34khncbi7jyyl3khq7rhw5n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring config-ini containers contravariant data-clist + deepseq directory dlist exceptions filepath microlens microlens-mtl + microlens-th stm template-haskell text text-zipper transformers + unix vector vty word-wrap + ]; + testHaskellDepends = [ + base containers microlens QuickCheck vector + ]; + description = "A declarative terminal user interface library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "brick-dropdownmenu" = callPackage ({ mkDerivation, base, brick, containers, microlens, microlens-ghc , microlens-th, pointedlist, vector, vty @@ -44321,8 +44379,8 @@ self: { pname = "brotli-streams"; version = "0.0.0.0"; sha256 = "14jc1nhm50razsl99d95amdf4njf75dnzx8vqkihgrgp7qisyz3z"; - revision = "1"; - editedCabalFile = "1mpd5wf027g1f46a9a2g1wvsaxhr1asyj5f3k69vq3226dfisnn7"; + revision = "2"; + editedCabalFile = "0xp1raxz3ddaq4hvpsw9yqwdfy51wwjiirh51nnxdgxqcwpy5w8s"; libraryHaskellDepends = [ base brotli bytestring io-streams ]; testHaskellDepends = [ base bytestring HUnit io-streams QuickCheck test-framework @@ -45436,6 +45494,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytebuild_0_3_5_0" = callPackage + ({ mkDerivation, base, byteslice, bytestring, gauge + , integer-logarithms, natural-arithmetic, primitive + , primitive-offset, primitive-unlifted, QuickCheck + , quickcheck-classes, quickcheck-instances, run-st, tasty + , tasty-hunit, tasty-quickcheck, text, text-short, vector + , wide-word + }: + mkDerivation { + pname = "bytebuild"; + version = "0.3.5.0"; + sha256 = "15ccfbhrvb6pj9py99qpbdrrfla83797ywmxjry2c7raaz3kpr73"; + libraryHaskellDepends = [ + base byteslice bytestring integer-logarithms natural-arithmetic + primitive primitive-offset primitive-unlifted run-st text-short + wide-word + ]; + testHaskellDepends = [ + base byteslice bytestring natural-arithmetic primitive + primitive-unlifted QuickCheck quickcheck-classes + quickcheck-instances tasty tasty-hunit tasty-quickcheck text vector + wide-word + ]; + benchmarkHaskellDepends = [ + base byteslice gauge natural-arithmetic primitive text-short + ]; + description = "Serialize to a small byte arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bytedump" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -45450,6 +45539,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytehash" = callPackage + ({ mkDerivation, base, byte-order, byteslice, bytesmith, bytestring + , entropy, gauge, hedgehog, primitive, primitive-checked + , primitive-unlifted, split, tasty, tasty-hedgehog, tasty-hunit + , transformers, unordered-containers + }: + mkDerivation { + pname = "bytehash"; + version = "0.1.0.0"; + sha256 = "1jc8fz8rv7072is0srcp730ff37xkb68xl6s6yssba4anxc8s5nm"; + libraryHaskellDepends = [ + base byte-order byteslice bytestring entropy primitive + primitive-unlifted transformers + ]; + testHaskellDepends = [ + base byteslice entropy hedgehog primitive-checked tasty + tasty-hedgehog tasty-hunit + ]; + benchmarkHaskellDepends = [ + base byteslice bytesmith bytestring entropy gauge primitive + primitive-unlifted split unordered-containers + ]; + description = "Universal hashing of bytes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bytelog" = callPackage ({ mkDerivation, base, bytebuild, byteslice, natural-arithmetic , posix-api, primitive @@ -45533,6 +45648,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "byteslice_0_2_3_0" = callPackage + ({ mkDerivation, base, bytestring, gauge, primitive, primitive-addr + , primitive-unlifted, quickcheck-classes, run-st, tasty + , tasty-hunit, tasty-quickcheck, tuples, vector + }: + mkDerivation { + pname = "byteslice"; + version = "0.2.3.0"; + sha256 = "1xbsnlryx9ggvp46kv6m0f4hf9vs0bc2ia13jym9aji5rd7qvyfp"; + libraryHaskellDepends = [ + base primitive primitive-addr primitive-unlifted run-st tuples + vector + ]; + testHaskellDepends = [ + base bytestring primitive quickcheck-classes tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base gauge primitive ]; + description = "Slicing managed and unmanaged memory"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bytesmith" = callPackage ({ mkDerivation, base, byte-order, byteslice, bytestring , contiguous, gauge, primitive, run-st, tasty, tasty-hunit @@ -46531,6 +46669,8 @@ self: { pname = "cabal-cache"; version = "1.0.1.8"; sha256 = "0yxq73bdw1ai0yv54prcxpm1ygkpa8m0jnznwm975b82qlmplynw"; + revision = "1"; + editedCabalFile = "1rikn1g6v8yga0cs031ckxywfcf9g21ww9s5rkjf6lr4xvfqps2s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47481,8 +47621,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.15.1"; - sha256 = "1gdwri0x7kw96y0c6j9rdqa68arrxkpisq43ld58applxcvr1cs7"; + version = "2.15.3"; + sha256 = "1l4jhl842g5jmwhmi1gqljkxa8ia80xbk2vmlhg6hlw1nkl9wfrz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48115,8 +48255,8 @@ self: { "calamity" = callPackage ({ mkDerivation, aeson, async, base, bytestring, concurrent-extra - , data-default-class, deepseq, deque, df1, di-polysemy, exceptions - , fmt, focus, generic-lens, generic-override + , containers, data-default-class, deepseq, deque, df1, di-polysemy + , exceptions, fmt, focus, generic-lens, generic-override , generic-override-aeson, hashable, http-date, http-types, lens , lens-aeson, mtl, polysemy, polysemy-plugin, reflection , scientific, stm, stm-chans, stm-containers, text, text-show, time @@ -48125,16 +48265,16 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.0.0"; - sha256 = "0cpx7v210gyh3r5qzh704wx4fgrb913b5g4rys76jhnmp77a79wc"; + version = "0.1.4.1"; + sha256 = "1acaqiaws9g65kiznqrgng0fxnlglanz44psl0syrpmw7jmvdwmq"; libraryHaskellDepends = [ - aeson async base bytestring concurrent-extra data-default-class - deepseq deque df1 di-polysemy exceptions fmt focus generic-lens - generic-override generic-override-aeson hashable http-date - http-types lens lens-aeson mtl polysemy polysemy-plugin reflection - scientific stm stm-chans stm-containers text text-show time - typerep-map unordered-containers vector websockets wreq-patchable - wuss + aeson async base bytestring concurrent-extra containers + data-default-class deepseq deque df1 di-polysemy exceptions fmt + focus generic-lens generic-override generic-override-aeson hashable + http-date http-types lens lens-aeson mtl polysemy polysemy-plugin + reflection scientific stm stm-chans stm-containers text text-show + time typerep-map unordered-containers vector websockets + wreq-patchable wuss ]; description = "A library for writing discord bots"; license = stdenv.lib.licenses.mit; @@ -48846,6 +48986,27 @@ self: { broken = true; }) {}; + "cardano-coin-selection" = callPackage + ({ mkDerivation, base, bytestring, containers, cryptonite, deepseq + , fmt, hspec, memory, QuickCheck, quiet, random, text, transformers + , vector + }: + mkDerivation { + pname = "cardano-coin-selection"; + version = "1.0.0"; + sha256 = "0s0b2bbczsjq31h3xpyvingwpgpzgh3x2sw6bvryyn13wy717hbk"; + libraryHaskellDepends = [ + base bytestring containers cryptonite deepseq quiet text + transformers + ]; + testHaskellDepends = [ + base bytestring containers cryptonite deepseq fmt hspec memory + QuickCheck quiet random text transformers vector + ]; + description = "Algorithms for coin selection and fee balancing"; + license = stdenv.lib.licenses.asl20; + }) {}; + "cardano-transactions" = callPackage ({ mkDerivation, ansi-terminal, base, base58-bytestring, bytestring , cardano-binary, cardano-crypto, cardano-crypto-wrapper @@ -50874,7 +51035,7 @@ self: { array base binary bytestring Codec-Image-DevIL containers data-reify directory GLUT OpenGLRaw process time ]; - description = "Combinators for building and processing 2D images"; + description = "Combinators for building and processing 2D images."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -50887,7 +51048,7 @@ self: { version = "0.1"; sha256 = "1gvnp176j8gd0s6wzq10zpiqkn3wma99pwn3f78wgxm9rh588gh2"; libraryHaskellDepends = [ array base chalkboard GLUT OpenGL time ]; - description = "OpenGL based viewer for chalkboard rendered images"; + description = "OpenGL based viewer for chalkboard rendered images."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -54886,34 +55047,6 @@ self: { }) {}; "co-log" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, chronos - , co-log-core, containers, contravariant, directory, filepath - , hedgehog, markdown-unlit, mtl, stm, text, transformers - , typerep-map, vector - }: - mkDerivation { - pname = "co-log"; - version = "0.4.0.0"; - sha256 = "1ayxsxw96yy72h6bsy6vwi4xwdawcq1hgsyc0s626bp84is7fm5c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base bytestring chronos co-log-core containers - contravariant directory filepath mtl stm text transformers - typerep-map vector - ]; - executableHaskellDepends = [ - base bytestring co-log-core mtl text typerep-map - ]; - executableToolDepends = [ markdown-unlit ]; - testHaskellDepends = [ base co-log-core hedgehog ]; - description = "Composable Contravariant Comonadic Logging Library"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "co-log_0_4_0_1" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, chronos , co-log-core, containers, contravariant, directory, filepath , hedgehog, markdown-unlit, mtl, stm, text, transformers @@ -54945,26 +55078,14 @@ self: { ({ mkDerivation, base, co-log-core, stm }: mkDerivation { pname = "co-log-concurrent"; - version = "0.4.0.0"; - sha256 = "1gnfqg6c290ain7v06clxga6jj46bdry6vvsrk1dhcdqv1rvkfwz"; + version = "0.5.0.0"; + sha256 = "07z4aklk7dc2fhbc30kd9hbdvq71sa4ip6r2pyifcpn3p2pr3mna"; libraryHaskellDepends = [ base co-log-core stm ]; description = "Asynchronous backend for co-log library"; license = stdenv.lib.licenses.mpl20; }) {}; "co-log-core" = callPackage - ({ mkDerivation, base, doctest, Glob }: - mkDerivation { - pname = "co-log-core"; - version = "0.2.1.0"; - sha256 = "1jfdjcbhd4mjj00fr2xk7g220kxz4jzbv84j32sqkjnrx49cziz0"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest Glob ]; - description = "Composable Contravariant Comonadic Logging Library"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "co-log-core_0_2_1_1" = callPackage ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "co-log-core"; @@ -54974,24 +55095,9 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Composable Contravariant Comonadic Logging Library"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "co-log-polysemy" = callPackage - ({ mkDerivation, base, co-log-core, polysemy }: - mkDerivation { - pname = "co-log-polysemy"; - version = "0.0.1.1"; - sha256 = "0wm5zcn3df4hc5rbbj1mlm9y1fs5pkpvvm1c98r5dnvs7lfmnzpd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base co-log-core polysemy ]; - executableHaskellDepends = [ base co-log-core polysemy ]; - description = "Composable Contravariant Comonadic Logging Library"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "co-log-polysemy_0_0_1_2" = callPackage ({ mkDerivation, base, co-log-core, polysemy }: mkDerivation { pname = "co-log-polysemy"; @@ -55003,7 +55109,6 @@ self: { executableHaskellDepends = [ base co-log-core polysemy ]; description = "Composable Contravariant Comonadic Logging Library"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "co-log-sys" = callPackage @@ -55055,8 +55160,8 @@ self: { }: mkDerivation { pname = "cobot"; - version = "0.1.1.2"; - sha256 = "0454y6hlf32c8x6rjzjp0594ikgnvamngz7k6cgfsyssx1fkz2sk"; + version = "0.1.1.4"; + sha256 = "0sskb87cjq6b6splwyl4dc11vwyx4jqp4xwdsgk78awfl1zcqhxd"; libraryHaskellDepends = [ array base bytestring containers deepseq lens linear megaparsec mtl split template-haskell text @@ -57343,8 +57448,8 @@ self: { ({ mkDerivation, base, base-prelude }: mkDerivation { pname = "compound-types"; - version = "0.1.4"; - sha256 = "1lnmlql90v66vs2dr5lqg2lzfvf7m3z8naazfzj7zdyqjf9jnpkc"; + version = "0.1.4.1"; + sha256 = "0rlmpyx6h8mhzlr6falqh8kd6nm5nqgkhb9vh1znnqwrb3lzzi0x"; libraryHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base-prelude ]; description = "Sum and Product types and such"; @@ -58069,8 +58174,8 @@ self: { pname = "concurrent-utilities"; version = "0.2.0.2"; sha256 = "1phc9a90nvx6dk741hmg3w5m9y8ra5a7zsgmzw173ibaapr2yhqi"; - revision = "1"; - editedCabalFile = "1phqnmgq7mj7751d4g599jy3brz4fmlm1z7qd88gkyr94mn5pm23"; + revision = "2"; + editedCabalFile = "1jf0sx6yq557aspa3wm12hkc64pmfnc39kbc5wsa2k7ksash3k15"; libraryHaskellDepends = [ base ]; description = "More utilities and broad-used datastructures for concurrency"; license = stdenv.lib.licenses.bsd3; @@ -59589,7 +59694,7 @@ self: { version = "0.1.0.1"; sha256 = "16s8y035f30gyla620diwnsqi8lbmmfyxjpj4dlq24d45k5wfnsd"; libraryHaskellDepends = [ attoparsec base bytestring vector ]; - description = "Parse ByteStrings of a prescribed length"; + description = "Parse ByteStrings of a prescribed length."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -59690,7 +59795,7 @@ self: { base containers criterion deepseq nat-sized-numbers QuickCheck smallcheck transformers vector ]; - description = "Typeclasses and instances for monads with constraints"; + description = "Typeclasses and instances for monads with constraints."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -61599,8 +61704,8 @@ self: { }: mkDerivation { pname = "cpkg"; - version = "0.2.5.2"; - sha256 = "1njjbvpnkjwxgsrjr3fihyvgr194mc94g2qxdq5yb1ai3sms7zsd"; + version = "0.2.5.3"; + sha256 = "0fdwjpkjwdixcb3r265z3dnrsrzcfh513lv6wxmgd63507j29njf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62963,6 +63068,8 @@ self: { pname = "crypto-enigma"; version = "0.1.1.6"; sha256 = "07qxrpwg9r2w2l0d2nrvn703vzsfhchznly93bnr2pfpbwj4iv2z"; + revision = "1"; + editedCabalFile = "15n8jb3g89x1cj5vk9a3x3g55c3agdz611sjlp5ixvqzf1kz5jiq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers split text ]; @@ -62970,7 +63077,7 @@ self: { ansi-terminal base containers optparse-applicative split text ]; testHaskellDepends = [ base HUnit QuickCheck ]; - description = "An Enigma machine simulator with display"; + description = "An Enigma machine simulator with display."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -63862,8 +63969,8 @@ self: { pname = "css-syntax"; version = "0.1.0.0"; sha256 = "02f000nzc0dhjhlp1z82q4far8ablvzalpk918lg54f63lbqdwsh"; - revision = "4"; - editedCabalFile = "0n3wf9yjpn29nl0f9jk3izp7d2iq00j6bp1y1v1k5vc1ycskhn5y"; + revision = "5"; + editedCabalFile = "1i3svb2zy7i3g2xrv8hki5dn6fd5rh2pwjxv72rbmbgl1adp3w3s"; libraryHaskellDepends = [ base scientific text ]; testHaskellDepends = [ base directory hspec QuickCheck scientific text @@ -63939,7 +64046,7 @@ self: { attoparsec attoparsec-enumerator base bytestring containers directory enumerator safe transformers unix-compat ]; - description = "A flexible, fast, enumerator-based CSV parser library for Haskell"; + description = "A flexible, fast, enumerator-based CSV parser library for Haskell."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -65115,10 +65222,8 @@ self: { }: mkDerivation { pname = "darcs"; - version = "2.14.2"; - sha256 = "0zm2486gyhiga1amclbg92cd09bvki6vgh0ll75hv5kl72j61lb5"; - revision = "1"; - editedCabalFile = "0xl7j5cm704pbl2ms0dkydh7jvrz0ym76d725ifpg4h902m1zkhg"; + version = "2.14.4"; + sha256 = "0qk70a2i5p69lai0vzrckjql3rz8sfiq5vnpafmscmq8018i2wp7"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; @@ -65136,7 +65241,8 @@ self: { testHaskellDepends = [ array base bytestring cmdargs containers directory filepath FindBin HUnit mtl QuickCheck shelly split test-framework - test-framework-hunit test-framework-quickcheck2 text zip-archive + test-framework-hunit test-framework-quickcheck2 text transformers + zip-archive ]; doCheck = false; postInstall = '' @@ -65694,8 +65800,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "data-category"; - version = "0.8.1"; - sha256 = "06m5yb7ycxr1drvv67cyb01mhghhfac9y8wf7lpmq2z55h4hflb2"; + version = "0.9"; + sha256 = "1crp5mg9paf29gkl2nfpnx303p958kx3ap8zzbhq6gzvhklvyam0"; description = "Category theory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -66310,7 +66416,7 @@ self: { version = "0.0.2"; sha256 = "1xn6qnir5dss23y8d71dsy78sdk7hczwprxir8v6la15c43rf9p2"; libraryHaskellDepends = [ base containers data-fix transformers ]; - description = "Common subexpression elimination for the fixploint types"; + description = "Common subexpression elimination for the fixploint types."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -67917,6 +68023,34 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "dbus_1_2_14" = callPackage + ({ mkDerivation, base, bytestring, cereal, conduit, containers + , criterion, deepseq, directory, exceptions, extra, filepath, lens + , network, parsec, process, QuickCheck, random, resourcet, split + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , th-lift, transformers, unix, vector, xml-conduit, xml-types + }: + mkDerivation { + pname = "dbus"; + version = "1.2.14"; + sha256 = "0w304j28vc90dmyz6zqsijjdjj2967grdc8f3zf5jiq50rzgmrr8"; + libraryHaskellDepends = [ + base bytestring cereal conduit containers deepseq exceptions + filepath lens network parsec random split template-haskell text + th-lift transformers unix vector xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring cereal containers directory extra filepath network + parsec process QuickCheck random resourcet tasty tasty-hunit + tasty-quickcheck text transformers unix vector + ]; + benchmarkHaskellDepends = [ base criterion ]; + doCheck = false; + description = "A client library for the D-Bus IPC system"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dbus-client" = callPackage ({ mkDerivation, base, containers, dbus-core, monads-tf, text , transformers @@ -68104,7 +68238,7 @@ self: { libraryHaskellDepends = [ base containers deepseq parsec transformers wl-pprint ]; - description = "Disciplined Disciple Compiler common utilities"; + description = "Disciplined Disciple Compiler common utilities."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -70976,8 +71110,8 @@ self: { ({ mkDerivation, base, df1, di-core, di-df1, di-handle, polysemy }: mkDerivation { pname = "di-polysemy"; - version = "0.1.1.0"; - sha256 = "08n98ivdvfb77slzbxvysy4cgvnf6jcxf0zqj1rr40rjfxaw2xcn"; + version = "0.1.1.2"; + sha256 = "0qglcvz628si1kg5djgh9j7ppvgfsc3gphal05hvlc4xziywf55y"; libraryHaskellDepends = [ base df1 di-core di-df1 di-handle polysemy ]; @@ -71578,8 +71712,8 @@ self: { }: mkDerivation { pname = "dialogflow-fulfillment"; - version = "0.1.0.0"; - sha256 = "0pz5qyz6sf00c5155mrraya7jr8sp99hmfm1642hv4zhj08ky0j7"; + version = "0.1.1.1"; + sha256 = "1fha1raifdzkv3g52wl9cx6xpan3jsv11ysd3cz4sffylygcyg71"; libraryHaskellDepends = [ aeson base bytestring containers text unordered-containers ]; @@ -71644,7 +71778,7 @@ self: { testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; - description = "Cryptographically secure n-sided dice via rejection sampling"; + description = "Cryptographically secure n-sided dice via rejection sampling."; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -72752,8 +72886,8 @@ self: { }: mkDerivation { pname = "dirtree"; - version = "0.1.1"; - sha256 = "18iahbw6hzjxsnmr3yi80w0xvf6iphdxb2yg5kpnww26lmlgk6dc"; + version = "0.1.3"; + sha256 = "1x2wff1iqjwdygb6yn7v63bplig4ad4qh6brqaj66y1qpnhb5vja"; libraryHaskellDepends = [ base bytestring containers deepseq directory filepath lens unix zip-archive @@ -72843,8 +72977,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.5.0"; - sha256 = "1449ap68c917z1318wg67cv7yk7cmfr61m0ikbf132gzsfyx69kv"; + version = "1.5.2"; + sha256 = "1xpgbxmf70jlgm2mfnyb3mylvp0xzgp501iybbf3s12b7d0kk17b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74369,8 +74503,8 @@ self: { }: mkDerivation { pname = "dobutokO2"; - version = "0.35.2.0"; - sha256 = "1hr4l8flfjinvbdwxf3xmq3xknd19kbf3d2k23dy7y1fghd6vflh"; + version = "0.37.1.0"; + sha256 = "16mbd89mpzcvyrzrn6sbwfnwsay2a9h0jn227py95r68pn2c2rn0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74969,6 +75103,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dom-events" = callPackage + ({ mkDerivation, base, text, unordered-containers }: + mkDerivation { + pname = "dom-events"; + version = "0.0.0.4"; + sha256 = "1yyhinrv6pm275fi9kg8hdi3vzv33i8nm785fih402fw0a9g8r35"; + libraryHaskellDepends = [ base text unordered-containers ]; + testHaskellDepends = [ base ]; + description = "DOM Events expressed as Haskell types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dom-lt" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq }: mkDerivation { @@ -76829,7 +76975,7 @@ self: { version = "0.1.1.0"; sha256 = "1agk7q556yf6v776568apvc4dgvxiqfshina12f69ky8afvjr6qz"; libraryHaskellDepends = [ base containers template-haskell unix ]; - description = "Automatically derive dynamic linking methods from a data type"; + description = "Automatically derive dynamic linking methods from a data type."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -76856,7 +77002,7 @@ self: { version = "0.1.0.5"; sha256 = "0hsy9mgnl2yf94kqxy69wgmr5hjqxpp55qvij3f53sxxywjrxdi2"; libraryHaskellDepends = [ base primitive vector ]; - description = "A wrapper around MVector that enables pushing, popping and extending"; + description = "A wrapper around MVector that enables pushing, popping and extending."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -78431,6 +78577,8 @@ self: { pname = "ekg-core"; version = "0.1.1.7"; sha256 = "04nv6iwzrb63fs97ixb0amj8p6zhabg3ggbrg4nbkq7xjhmkz0a5"; + revision = "1"; + editedCabalFile = "17rfxsns0za7jqp3069mwp0lbd433gwb7lrnla02y7hfxbpnldf4"; libraryHaskellDepends = [ base containers ghc-prim text unordered-containers ]; @@ -78499,8 +78647,8 @@ self: { pname = "ekg-json"; version = "0.1.0.6"; sha256 = "0iyx0ix4dcyhh9xg4ia1lm7x2q0iffswnr33khfg9fr81am80shy"; - revision = "5"; - editedCabalFile = "0qc3fdycamm97lhhvwgvl8kvj169qrwr5ds4vkvyclpv0s90ijva"; + revision = "6"; + editedCabalFile = "111495nizf5d9s91nbss78y3rh7vj5p1021m7pz96li37i5ps13m"; libraryHaskellDepends = [ aeson base ekg-core text unordered-containers ]; @@ -79313,29 +79461,68 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "elynx" = callPackage + ({ mkDerivation, aeson, base, bytestring, elynx-tools + , optparse-applicative, slynx, tlynx + }: + mkDerivation { + pname = "elynx"; + version = "0.2.2"; + sha256 = "19fj65klv8pyan6n6i0mzcwpsprkhvxirh82hdmr3b3y2zaw10h6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring elynx-tools optparse-applicative slynx tlynx + ]; + description = "Validate and (optionally) redo ELynx analyses"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "elynx-markov" = callPackage + ({ mkDerivation, base, bytestring, containers, elynx-seq + , elynx-tools, elynx-tree, hmatrix, hspec, hspec-megaparsec + , integration, math-functions, megaparsec, mwc-random, parallel + , primitive, statistics, vector + }: + mkDerivation { + pname = "elynx-markov"; + version = "0.2.2"; + sha256 = "1w7wxha82xaanfnzyn8ygfpxmk7lalfvzwr157crz8nm59ai4c05"; + libraryHaskellDepends = [ + base bytestring containers elynx-seq elynx-tools elynx-tree hmatrix + integration math-functions megaparsec mwc-random parallel primitive + statistics vector + ]; + testHaskellDepends = [ + base bytestring containers elynx-tools elynx-tree hmatrix hspec + hspec-megaparsec integration math-functions megaparsec mwc-random + parallel primitive statistics vector + ]; + description = "Simulate molecular sequences along trees"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "elynx-seq" = callPackage - ({ mkDerivation, async, base, bytestring, containers - , data-memocombinators, elynx-tools, elynx-tree, hmatrix, hspec - , hspec-megaparsec, integration, math-functions, matrices - , megaparsec, mwc-random, optparse-applicative, parallel, primitive - , statistics, transformers, vector, vector-th-unbox, word8 + ({ mkDerivation, aeson, base, bytestring, containers, elynx-tools + , hspec, hspec-megaparsec, matrices, megaparsec, mwc-random + , parallel, primitive, vector, vector-th-unbox, word8 }: mkDerivation { pname = "elynx-seq"; - version = "0.1.0"; - sha256 = "07kykql8i5msy2n091bwbawagbfpw8q553k5s89j3y5bi6d4aahg"; + version = "0.2.2"; + sha256 = "1m09indy34zgx16m2rnmwjf9fvrhi8qcdxpfz7myjl2hxbp8hz1j"; libraryHaskellDepends = [ - async base bytestring containers data-memocombinators elynx-tools - elynx-tree hmatrix integration math-functions matrices megaparsec - mwc-random optparse-applicative parallel primitive statistics - transformers vector vector-th-unbox word8 + aeson base bytestring containers elynx-tools matrices megaparsec + mwc-random parallel primitive vector vector-th-unbox word8 ]; testHaskellDepends = [ - async base bytestring containers data-memocombinators elynx-tools - elynx-tree hmatrix hspec hspec-megaparsec integration - math-functions matrices megaparsec mwc-random optparse-applicative - parallel primitive statistics transformers vector vector-th-unbox - word8 + aeson base bytestring containers elynx-tools hspec hspec-megaparsec + matrices megaparsec mwc-random parallel primitive vector + vector-th-unbox word8 ]; description = "Handle molecular sequences"; license = stdenv.lib.licenses.gpl3; @@ -79344,22 +79531,23 @@ self: { }) {}; "elynx-tools" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, containers - , cryptohash-sha256, deepseq, fast-logger, hmatrix, lifted-base - , matrices, megaparsec, monad-control, monad-logger, mwc-random - , optparse-applicative, parallel, primitive, template-haskell, text - , time, transformers, transformers-base, vector, zlib + ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring + , containers, cryptohash-sha256, deepseq, directory, fast-logger + , hmatrix, matrices, megaparsec, monad-control, monad-logger + , mwc-random, optparse-applicative, parallel, primitive + , template-haskell, text, time, transformers, transformers-base + , vector, zlib }: mkDerivation { pname = "elynx-tools"; - version = "0.1.0"; - sha256 = "0dhri3chyyqq8svw1lkl89hdrjb7b2bin50gqv3d6hrxs9813yz3"; + version = "0.2.2"; + sha256 = "0gdnfyag704yfvrakc7d0adh3mb9r1kf1v8cpdrspaxxr77brw9q"; libraryHaskellDepends = [ - aeson async base bytestring containers cryptohash-sha256 deepseq - fast-logger hmatrix lifted-base matrices megaparsec monad-control - monad-logger mwc-random optparse-applicative parallel primitive - template-haskell text time transformers transformers-base vector - zlib + aeson async base base16-bytestring bytestring containers + cryptohash-sha256 deepseq directory fast-logger hmatrix matrices + megaparsec monad-control monad-logger mwc-random + optparse-applicative parallel primitive template-haskell text time + transformers transformers-base vector zlib ]; description = "Tools for ELynx"; license = stdenv.lib.licenses.gpl3; @@ -79369,31 +79557,26 @@ self: { "elynx-tree" = callPackage ({ mkDerivation, base, bytestring, containers, criterion - , elynx-tools, hspec, hspec-megaparsec, lifted-async - , math-functions, megaparsec, mwc-random, optparse-applicative - , parallel, primitive, QuickCheck, quickcheck-instances, statistics - , transformers, vector + , elynx-tools, hspec, hspec-megaparsec, math-functions, megaparsec + , mwc-random, primitive, QuickCheck, quickcheck-instances + , statistics }: mkDerivation { pname = "elynx-tree"; - version = "0.1.0"; - sha256 = "1mg4k03xx1zmsn54ip5q27p3qll13dcfk2gh2xyfy097b4mlwrzp"; + version = "0.2.2"; + sha256 = "00c7rli9vfi1crz9plpc5xgh960ba245kisxihbx54vqlc94b5hj"; libraryHaskellDepends = [ - base bytestring containers elynx-tools lifted-async math-functions - megaparsec mwc-random optparse-applicative parallel primitive - QuickCheck quickcheck-instances statistics transformers vector + base bytestring containers elynx-tools math-functions megaparsec + mwc-random primitive statistics ]; testHaskellDepends = [ base bytestring containers elynx-tools hspec hspec-megaparsec - lifted-async math-functions megaparsec mwc-random - optparse-applicative parallel primitive QuickCheck - quickcheck-instances statistics transformers vector + math-functions megaparsec mwc-random primitive QuickCheck + quickcheck-instances statistics ]; benchmarkHaskellDepends = [ - base bytestring containers criterion elynx-tools lifted-async - math-functions megaparsec mwc-random optparse-applicative parallel - primitive QuickCheck quickcheck-instances statistics transformers - vector + base bytestring containers criterion elynx-tools math-functions + megaparsec mwc-random primitive statistics ]; description = "Handle phylogenetic trees"; license = stdenv.lib.licenses.gpl3; @@ -82203,6 +82386,8 @@ self: { pname = "eventloop"; version = "0.8.2.8"; sha256 = "1k10f8mihxb9xsvjkmzxphin4l49f5pwbfxfan1ar7wzxyv85vjj"; + revision = "1"; + editedCabalFile = "0qzrfk1riyf33b7kyjpdzzi8c40wh559wr0m0rjziykzxy0s92m2"; libraryHaskellDepends = [ aeson base bytestring concurrent-utilities deepseq network stm suspend text timers websockets @@ -83548,6 +83733,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extended-containers-lens" = callPackage + ({ mkDerivation, base, extended-containers, lens }: + mkDerivation { + pname = "extended-containers-lens"; + version = "0.1.0.0"; + sha256 = "107nfyrp62h6qwc3ra08cd9vyaanc7442wcbfmm83aw05fav3p43"; + libraryHaskellDepends = [ base extended-containers lens ]; + description = "lens instances for extended-containers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "extended-reals" = callPackage ({ mkDerivation, base, deepseq, hashable, HUnit, QuickCheck, tasty , tasty-hunit, tasty-quickcheck, tasty-th @@ -91192,8 +91388,8 @@ self: { }: mkDerivation { pname = "front"; - version = "0.0.0.7"; - sha256 = "07vzic8r0w7krnhpsq674g7zjk3gbzmf59gff25qk2qpj3rn4w9f"; + version = "0.0.0.8"; + sha256 = "07hx4a4hkg8ch29zax67ja099p7npgsaci45h5002cqp91il1khv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95706,8 +95902,8 @@ self: { }: mkDerivation { pname = "ghc-check"; - version = "0.3.0.0"; - sha256 = "19fgfkv68q1l93ql6g4xpa27pcv1v04vpfpq0rcvspp09xmcv1i4"; + version = "0.3.0.1"; + sha256 = "180xqs4g90v9sdjb0b3baqk62gbnw1xkv76wdq5ap49q0730s3vz"; libraryHaskellDepends = [ base filepath ghc ghc-paths process template-haskell transformers ]; @@ -98063,8 +98259,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "3.0.32"; - sha256 = "0div9lqmirys1f3dy6bskvai72hb82g6rvcg0kwg1im974xp5m8l"; + version = "3.0.33"; + sha256 = "03fvazdkg1m9svp39bn4gz7cfy23pp01yfcf6ambkdrq9msqsjak"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi @@ -98359,8 +98555,8 @@ self: { }: mkDerivation { pname = "gi-poppler"; - version = "0.18.21"; - sha256 = "1mfi3yn7yrwg2cdpqp0av4cabmmqpmm2hywsrm5d78cxix4z1s7f"; + version = "0.18.22"; + sha256 = "0bqmkijnmxi4k30nbn8zsx03i9y7mlp06ikmd2dbxj22lyazqjz4"; setupHaskellDepends = [ base Cabal gi-cairo gi-gio gi-glib gi-gobject haskell-gi ]; @@ -99436,18 +99632,15 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.2.6"; - sha256 = "0959lmq1w1vh9cj3jnq2bg4jndcqg7d4ha531bvp4bg88z00q1zv"; + version = "1.3.0"; + sha256 = "08nr6a763zc0zszbw1lci4d86z3rpcyr1444a10q3a0dj64krwab"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base burrito bytestring http-client http-client-tls http-types mime-types optparse-generic text unordered-containers ]; - executableHaskellDepends = [ - aeson base burrito bytestring http-client http-client-tls - http-types mime-types optparse-generic text unordered-containers - ]; + executableHaskellDepends = [ base ]; description = "Upload files to GitHub releases"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -99577,8 +99770,8 @@ self: { }: mkDerivation { pname = "github-webhooks"; - version = "0.12.0"; - sha256 = "0p029a2pl77arldqllr84gnizhi3fib2mxf4cfggvykhdcrc856h"; + version = "0.13.0"; + sha256 = "08yqkxgmd9mqv75wzqi0mxhnb9jv1wawxkikgf6nzqwpdfml967y"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite deepseq deepseq-generics memory text time vector @@ -103926,8 +104119,8 @@ self: { }: mkDerivation { pname = "gopro-plus"; - version = "0.3.1.0"; - sha256 = "06wggkl9p69xm75f3kkajacqr54fq7vqbmyldgapfqglbzs43z7g"; + version = "0.3.1.1"; + sha256 = "0gjdz5c165hk4nbynp3s633kzivq62y3riz45w0l0k2qrirpkd14"; libraryHaskellDepends = [ aeson base bytestring containers exceptions filepath generic-deriving lens lens-aeson mtl random retry text time @@ -105230,7 +105423,7 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; - description = "GRASP implementation for the AMMM project"; + description = "GRASP implementation for the AMMM project."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -105446,8 +105639,8 @@ self: { }: mkDerivation { pname = "greskell"; - version = "1.0.0.1"; - sha256 = "070qqvp4dp7zng6yr1dipcranqhgccnps6k767ag6nh6cprz09qw"; + version = "1.0.1.0"; + sha256 = "0gknzbaldmziy7lj23g3l8q3ymxdr5vbis109j6r7zbjap1jy0in"; libraryHaskellDepends = [ aeson base exceptions greskell-core hashable semigroups text transformers unordered-containers vector @@ -105460,15 +105653,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "greskell_1_0_1_0" = callPackage + "greskell_1_1_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover , exceptions, greskell-core, hashable, hint, hspec, semigroups , text, transformers, unordered-containers, vector }: mkDerivation { pname = "greskell"; - version = "1.0.1.0"; - sha256 = "0gknzbaldmziy7lj23g3l8q3ymxdr5vbis109j6r7zbjap1jy0in"; + version = "1.1.0.0"; + sha256 = "10zvz33pd5h2zslmvhilsiqzg6j91azrh8dixc0z75dwrrwyhaa2"; libraryHaskellDepends = [ aeson base exceptions greskell-core hashable semigroups text transformers unordered-containers vector @@ -108246,34 +108439,6 @@ self: { broken = true; }) {}; - "hackage-security_0_5_3_0" = callPackage - ({ mkDerivation, base, base16-bytestring, base64-bytestring - , bytestring, Cabal, containers, cryptohash-sha256, directory - , ed25519, filepath, ghc-prim, mtl, network, network-uri, parsec - , pretty, QuickCheck, tar, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, temporary, time, transformers, zlib - }: - mkDerivation { - pname = "hackage-security"; - version = "0.5.3.0"; - sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v"; - revision = "6"; - editedCabalFile = "1xs2nkzlvkdz8g27yzfxbjdbdadfmgiydnlpn5dm77cg18r495ay"; - libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring Cabal - containers cryptohash-sha256 directory ed25519 filepath ghc-prim - mtl network network-uri parsec pretty tar template-haskell time - transformers zlib - ]; - testHaskellDepends = [ - base bytestring Cabal containers network-uri QuickCheck tar tasty - tasty-hunit tasty-quickcheck temporary time zlib - ]; - description = "Hackage security library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hackage-security" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring , bytestring, Cabal, containers, cryptohash-sha256, directory @@ -108824,8 +108989,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.17.3"; - sha256 = "00lyf2m6q866383q79b705xhn987504wz3fp3zh7m8580v8phy5p"; + version = "1.17.6"; + sha256 = "02xfkssxpyi7q7d1aj1gna8m4374pajqilbcgq0ii0hfrxiilc1k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108842,8 +109007,6 @@ self: { ]; description = "Dockerfile Linter JavaScript API"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hadoop-formats" = callPackage @@ -109549,7 +109712,7 @@ self: { libraryHaskellDepends = [ base containers data-default filepath hakyll ]; - description = "Allow Hakyll to create hierarchical menues from directories"; + description = "Allow Hakyll to create hierarchical menues from directories."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -110951,7 +111114,7 @@ self: { base containers happstack-data happstack-util mtl syb syb-with-class template-haskell ]; - description = "Efficient relational queries on Haskell sets"; + description = "Efficient relational queries on Haskell sets."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -112501,8 +112664,8 @@ self: { pname = "haskell-awk"; version = "1.1.1"; sha256 = "0s6vzfsqh2wwsp98l8zpg6cvh7jwz5wha44idz3yavhmy6z08zgd"; - revision = "1"; - editedCabalFile = "1rrplmf2n4vkwisi367gi4a6yyh0ri2sdjqmdix7xyvfdad7m9cb"; + revision = "2"; + editedCabalFile = "1nq69vqp5dphhkq3h94c1gw2hpgyn2snnsig6kjwm4z60ww87viw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114767,7 +114930,7 @@ self: { version = "1.0.0"; sha256 = "0j1aqix21pqcsw7skl897pd1ir6hg836g4zb2h5338h4gih6blx0"; libraryHaskellDepends = [ base haskelldb hsql mtl old-time ]; - description = "HaskellDB support for HSQL"; + description = "HaskellDB support for HSQL."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -115413,8 +115576,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.22.2"; - sha256 = "0h073f67rhp4w78lnn7vgg0v2i5p6cv1af16b80g3a55bd6mwkla"; + version = "0.23.14"; + sha256 = "0gvcjmyisnjml6mv43xgpq3hb2047lsk84vjr4hv4zf9h23gwb14"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116457,16 +116620,16 @@ self: { "hasql-migration" = callPackage ({ mkDerivation, base, bytestring, contravariant, cryptonite - , data-default-class, directory, hasql, hasql-transaction, hspec - , memory, text, time, transformers + , directory, hasql, hasql-transaction, hspec, memory, text, time + , transformers }: mkDerivation { pname = "hasql-migration"; - version = "0.2.0"; - sha256 = "03dd0m2ggsv094nga0d8yaqcqb0r9ngdh3zvvr8127n9ka6805l1"; + version = "0.3.0"; + sha256 = "0qk9cds6crdbjrn0niv6dfaj2pa3qpmwh1l96rl2hvqyq2dz148q"; libraryHaskellDepends = [ - base bytestring contravariant cryptonite data-default-class - directory hasql hasql-transaction memory text time + base bytestring contravariant cryptonite directory hasql + hasql-transaction memory text time ]; testHaskellDepends = [ base bytestring hasql hasql-transaction hspec transformers @@ -116610,8 +116773,8 @@ self: { }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.6"; - sha256 = "0s9c2aa0mpxiqsvpaf3l5k2gqchrjv4x9jpjmw7v3ywnv9pcxpkf"; + version = "0.4.0.7"; + sha256 = "0hs62wzp2phlq00jkz6qas1i3gyx3krnzn5hzvpa8zl4q0fggjvz"; libraryHaskellDepends = [ base bytestring case-insensitive containers contravariant fast-builder foldl hashable hasql headed-megaparsec megaparsec @@ -116627,8 +116790,6 @@ self: { ]; description = "Template Haskell utilities for Hasql"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hasql-transaction" = callPackage @@ -117832,7 +117993,7 @@ self: { executableHaskellDepends = [ base directory HaskellForMaths QuickCheck text ]; - description = "Virtual Rubik's cube of arbitrary size"; + description = "Virtual Rubik's cube of arbitrary size."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -118353,8 +118514,6 @@ self: { ]; description = "More informative parser"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "headergen" = callPackage @@ -118402,6 +118561,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "headroom_0_2_1_1" = callPackage + ({ mkDerivation, aeson, base, doctest, either, file-embed, hspec + , mustache, optparse-applicative, pcre-light, QuickCheck, rio + , template-haskell, time, yaml + }: + mkDerivation { + pname = "headroom"; + version = "0.2.1.1"; + sha256 = "101zvngl2p89g2ivcnyrb6mbxmv88jcrz7n7lvapsxicqr0nppb4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base either file-embed mustache optparse-applicative + pcre-light rio template-haskell time yaml + ]; + executableHaskellDepends = [ base optparse-applicative rio ]; + testHaskellDepends = [ + aeson base doctest hspec optparse-applicative pcre-light QuickCheck + rio + ]; + description = "License Header Manager"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "heap" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -118789,6 +118973,8 @@ self: { pname = "hedgehog-classes"; version = "0.2.4.1"; sha256 = "0qa938cy1bm3shq0l4rfdq5cmb54jjy0qpp6cmx1xjd6yrdqrkxc"; + revision = "1"; + editedCabalFile = "1kxlq8x947wlpm6y80s25hhw074skzhpm7sbl87bvgcc6p7j7gc5"; libraryHaskellDepends = [ aeson base binary comonad containers hedgehog pretty-show primitive semirings silently transformers wl-pprint-annotated @@ -119714,8 +119900,8 @@ self: { ({ mkDerivation, base, doctest, time }: mkDerivation { pname = "herf-time"; - version = "0.3.0"; - sha256 = "00ar1kb29gjvna7rcdg6wj3f22dil2pzbzy8zblvyc452zjy03y2"; + version = "0.3.1"; + sha256 = "06ai2f2l2g4lxvvly5wrr0yrz7fq3ljzympywcxqvyg7dbf6k6hc"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base doctest ]; description = "haskell time manipulation in a 'kerf like' style"; @@ -120453,6 +120639,29 @@ self: { broken = true; }) {}; + "hextream" = callPackage + ({ mkDerivation, attoparsec, base, base-compat, Cabal + , cabal-doctest, containers, data-default, doctest, filepath + , parsers, pretty-simple, resourcet, streaming-attoparsec + , streaming-bytestring, tasty, tasty-golden, tasty-hunit, text + }: + mkDerivation { + pname = "hextream"; + version = "0.1.0.1"; + sha256 = "0dc38zszqgbpmj7hlsd3w09i8rdpzd7jpr4vm2zv9y2y6bgcdpdr"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-compat containers parsers text + ]; + testHaskellDepends = [ + attoparsec base base-compat data-default doctest filepath parsers + pretty-simple resourcet streaming-attoparsec streaming-bytestring + tasty tasty-golden tasty-hunit text + ]; + description = "Streaming-friendly XML parsers"; + license = stdenv.lib.licenses.cc0; + }) {}; + "heyefi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, configurator , directory, exceptions, filepath, HandsomeSoup, hspec, hspec-wai @@ -122192,21 +122401,20 @@ self: { }) {}; "hint" = callPackage - ({ mkDerivation, base, containers, directory, exceptions - , extensible-exceptions, filepath, ghc, ghc-boot, ghc-paths, HUnit - , mtl, random, temporary, unix + ({ mkDerivation, base, containers, directory, exceptions, filepath + , ghc, ghc-boot, ghc-paths, HUnit, random, stm, temporary + , transformers, unix }: mkDerivation { pname = "hint"; - version = "0.9.0.2"; - sha256 = "06xnlfpf9h7i4fvm3p69accm18h7hblh7173040vlk5qvjywblhf"; + version = "0.9.0.3"; + sha256 = "0kp2hngmk2sf4ariv02rgrrd190zzb7nlk0pj8fq7rsckcxc87ra"; libraryHaskellDepends = [ - base directory exceptions filepath ghc ghc-boot ghc-paths mtl - random temporary unix + base directory exceptions filepath ghc ghc-boot ghc-paths random + temporary transformers unix ]; testHaskellDepends = [ - base containers directory exceptions extensible-exceptions filepath - HUnit unix + base containers directory exceptions filepath HUnit stm unix ]; description = "Runtime Haskell interpreter (GHC API wrapper)"; license = stdenv.lib.licenses.bsd3; @@ -124688,6 +124896,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hoauth2_1_12_0" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, exceptions + , http-conduit, http-types, microlens, text, unordered-containers + , uri-bytestring, uri-bytestring-aeson + }: + mkDerivation { + pname = "hoauth2"; + version = "1.12.0"; + sha256 = "0v3brbwq07qa7fszdlxaf1q2nfxvr273qq7zg0x5nqvaa63ghdlc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring exceptions http-conduit http-types + microlens text unordered-containers uri-bytestring + uri-bytestring-aeson + ]; + description = "Haskell OAuth2 authentication client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hob" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango @@ -129539,6 +129768,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsendxmpp" = callPackage + ({ mkDerivation, base, hslogger, pontarius-xmpp + , pontarius-xmpp-extras, string-class + }: + mkDerivation { + pname = "hsendxmpp"; + version = "0.1.2.0"; + sha256 = "16mjcxkd706kfv9ifs1vn1gqry0wq8zqfwl8mig6vvav18n79l6q"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base hslogger pontarius-xmpp pontarius-xmpp-extras string-class + ]; + description = "sendxmpp clone, sending XMPP messages via CLI"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsenv" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, file-embed , filepath, http-streams, io-streams, mtl, process, safe, split @@ -131102,6 +131349,18 @@ self: { broken = true; }) {}; + "hspec-tables" = callPackage + ({ mkDerivation, base, hspec, hspec-core }: + mkDerivation { + pname = "hspec-tables"; + version = "0.0.1"; + sha256 = "07z85920dr85kc763hfqd6rrzl81cc39cjgc0ymy95ycgpdz2w1q"; + libraryHaskellDepends = [ base hspec-core ]; + testHaskellDepends = [ base hspec hspec-core ]; + description = "Table-driven (by-example) HSpec tests"; + license = stdenv.lib.licenses.mit; + }) {}; + "hspec-test-framework" = callPackage ({ mkDerivation, base, hspec, hspec-contrib, hspec-core, HUnit , QuickCheck @@ -131362,7 +131621,7 @@ self: { sha256 = "0lz9zjy1xgjjbabbi2hcrvsnfid6c78y2cb2703qjwr93xy54f1f"; libraryHaskellDepends = [ base hsql old-time ]; librarySystemDepends = [ unixODBC ]; - description = "A Haskell Interface to ODBC"; + description = "A Haskell Interface to ODBC."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -131376,7 +131635,7 @@ self: { sha256 = "0yj0jalpapjvpxmc79yd6bn93ax13pp87dipbg2c9mxf3p38jc9z"; libraryHaskellDepends = [ base hsql old-time ]; librarySystemDepends = [ postgresql ]; - description = "A Haskell Interface to PostgreSQL via the PQ library"; + description = "A Haskell Interface to PostgreSQL via the PQ library."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -131695,18 +131954,19 @@ self: { "hstar" = callPackage ({ mkDerivation, archive-libarchive, archive-sig, base, brotli - , bytestring, bz2, cpphs, lz4-hs, lzlib, lzma, optparse-applicative - , zlib, zstd + , bytestring, bz2, cpphs, lz4-hs, lzlib, lzma, lzo + , optparse-applicative, zlib, zstd }: mkDerivation { pname = "hstar"; - version = "0.1.0.2"; - sha256 = "0npc8ykz9d5j0ghxfpyjvgzsk4nsgrcgl0jqb437rp2641j119j1"; + version = "0.1.0.4"; + sha256 = "1c28xbcg8lmh7zkpl8xpg30niv6adjk8zggwcxi72ylb9z2y3fqr"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ archive-libarchive archive-sig base brotli bytestring bz2 lz4-hs - lzlib lzma optparse-applicative zlib zstd + lzlib lzma lzo optparse-applicative zlib zstd ]; executableToolDepends = [ cpphs ]; description = "Haskell version of tar CLI utility"; @@ -133383,8 +133643,8 @@ self: { }: mkDerivation { pname = "http-io-streams"; - version = "0.1.2.0"; - sha256 = "1xn3lbpxsbl79qgaq9qmhlr78g44h0qpx0jyyb3z8q28z5p39wcy"; + version = "0.1.3.0"; + sha256 = "1m8nj92v21mgrb2mxlvc6smkpvd01664ng4kwikadb4j8bfpb15r"; libraryHaskellDepends = [ attoparsec base base64-bytestring blaze-builder brotli-streams bytestring case-insensitive containers directory HsOpenSSL @@ -134600,7 +134860,7 @@ self: { executableHaskellDepends = [ array base bytestring containers kangaroo ]; - description = "Extract function names from Windows DLLs"; + description = "Extract function names from Windows DLLs."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -134897,6 +135157,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-balancedparens_0_4_0_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, doctest + , doctest-discover, generic-lens, hedgehog, hspec, hspec-discover + , hw-bits, hw-excess, hw-fingertree, hw-hspec-hedgehog, hw-prim + , hw-rankselect-base, lens, mmap, optparse-applicative + , transformers, vector + }: + mkDerivation { + pname = "hw-balancedparens"; + version = "0.4.0.0"; + sha256 = "02yb90i256avjkn7kfqiv55x8jpsiavr7swy1lh9bhga2zhgxnd5"; + revision = "1"; + editedCabalFile = "04s9n77xq5wr2n9zhj85dycxyvnbz0832m7sajrhl6kif4b0rsfv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim + hw-rankselect-base vector + ]; + executableHaskellDepends = [ + base bytestring generic-lens hw-bits hw-prim lens mmap + optparse-applicative vector + ]; + testHaskellDepends = [ + base doctest doctest-discover hedgehog hspec hw-bits + hw-hspec-hedgehog hw-prim hw-rankselect-base transformers vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + base criterion hedgehog hw-bits hw-prim vector + ]; + doHaddock = false; + description = "Balanced parentheses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-bits" = callPackage ({ mkDerivation, base, bitvec, bytestring, criterion, deepseq , doctest, doctest-discover, hedgehog, hspec, hspec-discover @@ -135010,6 +135307,8 @@ self: { pname = "hw-dsv"; version = "0.4.1.0"; sha256 = "1wv0yg662c3bq4kpgfqfjks59v17i5h3v3mils1qpxn4c57jr3s8"; + revision = "1"; + editedCabalFile = "1xhdvqmqm44ky8mbwi64fj3bawqswf58ghlbj2bvk136yflvz2c7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135047,6 +135346,8 @@ self: { pname = "hw-dump"; version = "0.1.1.0"; sha256 = "14ya18i3xvay5xn8j20b06msqyd49h34w526k1x1fxdp0i2l3rwr"; + revision = "1"; + editedCabalFile = "0v310296cxsv92k2rjrc9zrwh7yb7lkjwivndpbh5hv5p8ll0zm6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135080,6 +135381,8 @@ self: { pname = "hw-eliasfano"; version = "0.1.2.0"; sha256 = "1wqpzznmz6bl88wzhrfcbgi49dw7w7i0p92hyc0m58nanqm1zgnj"; + revision = "1"; + editedCabalFile = "0qqshcj482x0yfmb76fj6ng57sf3i0r8daz93kzab8lscarh31j9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135219,6 +135522,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-int_0_0_2_0" = callPackage + ({ mkDerivation, base, doctest, doctest-discover, hedgehog, hspec + , hspec-discover, hw-hedgehog, hw-hspec-hedgehog + }: + mkDerivation { + pname = "hw-int"; + version = "0.0.2.0"; + sha256 = "13ifa28b12hiibhmwas5hn3dmmiz2rihlc837hhii0z1ng03s360"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest doctest-discover hedgehog hspec hw-hedgehog + hw-hspec-hedgehog + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + description = "Additional facilities for Integers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-ip" = callPackage ({ mkDerivation, appar, base, binary, bytestring, containers , doctest, doctest-discover, generic-lens, hedgehog, hspec @@ -135262,6 +135584,8 @@ self: { pname = "hw-json"; version = "1.3.2.0"; sha256 = "00pdd813phgfi9g9xs6r7iw03iifwmlzfb0b424q1cq6d9z37v2f"; + revision = "2"; + editedCabalFile = "1lg2l399fnx7vg2bxf6chcwpl9q3pblzrmwzzijxczvyfrsy5m41"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135301,6 +135625,8 @@ self: { pname = "hw-json-lens"; version = "0.2.1.0"; sha256 = "1v3ws69pyrw5ja00r326kqlq6hd7r5np119fk2la7f74aqhajjf6"; + revision = "1"; + editedCabalFile = "1gxqds8889dzkfncnlncjb7avw4zm7dzj3063mq4rsb05gyrplhz"; libraryHaskellDepends = [ aeson base bytestring containers hw-json lens scientific text word8 ]; @@ -135352,6 +135678,8 @@ self: { pname = "hw-json-simple-cursor"; version = "0.1.1.0"; sha256 = "1kwxnqsa2mkw5sa8rc9rixjm6f75lyjdaz7f67yyhwls5v4315bl"; + revision = "2"; + editedCabalFile = "144afi48rm613gcb8gccfyw5ybx9mzsfzsfq1nvsmlyijl8rgc1x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135388,6 +135716,8 @@ self: { pname = "hw-json-standard-cursor"; version = "0.2.2.0"; sha256 = "0rj0p3p2b5ghyyfkzvaivzcdsmnjxvqm16n94qpwacaszyca8hny"; + revision = "2"; + editedCabalFile = "07cspws24pxh9i98zylw73fknw6gcvna8qq9r3lcnh455wr3c9m1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135521,6 +135851,8 @@ self: { pname = "hw-packed-vector"; version = "0.2.1.0"; sha256 = "13hly2yzx6kx4j56iksgj4i3wmvg7rmxq57d0g87lmybzhha9q38"; + revision = "1"; + editedCabalFile = "070ac32s0azzhnqwrvhnfa18sxn60ayhmlikr6zk4vl1v03y0xbc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135621,6 +135953,8 @@ self: { pname = "hw-rankselect"; version = "0.13.4.0"; sha256 = "0chk3n4vb55px943w0l3q7pxhgbvqm64vn7lkhi7k0l2dpybycp7"; + revision = "1"; + editedCabalFile = "03p711rvs3qn9x5rfc90yxrbyp5fqsi9i2wbiwrs3vq6if66vc5z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135774,6 +136108,8 @@ self: { pname = "hw-uri"; version = "0.2.1.0"; sha256 = "1bwdzvms0n86k7gbkhk0jj3m1pcc9vbjk13kgpchqxpxm971srbs"; + revision = "1"; + editedCabalFile = "0bbsv8dj0z6wvgn0ldgvbrhji8mw5514pqwrp4ih8i2mjnfcdh2a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135822,6 +136158,8 @@ self: { pname = "hw-xml"; version = "0.5.1.0"; sha256 = "0g81kknllbc6v5wx7kgzhh78409njfzr3h7lfdx7ip0nkhhnpmw4"; + revision = "2"; + editedCabalFile = "1zi0ma6fmzghlc65dxpznsyiyp4ij7cwz1yw35i0jjm314mhi4va"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -136243,7 +136581,7 @@ self: { base containers directory filepath haskell98 HTTP HUnit hxt network parsec process ]; - description = "A collection of tools for processing XML with Haskell (Filter variant)"; + description = "A collection of tools for processing XML with Haskell (Filter variant)."; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -137196,8 +137534,8 @@ self: { }: mkDerivation { pname = "i3blocks-hs-contrib"; - version = "2.0.1"; - sha256 = "0dl50c3c9483p6345a8918gika3flrph97xwplrr9i4a55dprcxg"; + version = "2.1.0"; + sha256 = "191jrmid5q3pfamyhlmyh7ypws5slr1x95ajaxijcnsqnivb4sac"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text turtle ]; @@ -137212,16 +137550,16 @@ self: { }) {}; "i3ipc" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers, hspec - , network, text, typed-process, vector + ({ mkDerivation, aeson, base, binary, bytestring, containers + , exceptions, hspec, network, text, typed-process, vector }: mkDerivation { pname = "i3ipc"; - version = "0.1.0.1"; - sha256 = "128dixb0nad1h2gf302r84kng2lw9g6vrnyjs61sqipbn6bn4ygd"; + version = "0.2.0.0"; + sha256 = "1h4vj027h0n3pvwxq4ipzdxpw03skbpi1qc6griwlkslk1qwyv8w"; libraryHaskellDepends = [ - aeson base binary bytestring containers network text typed-process - vector + aeson base binary bytestring containers exceptions network text + typed-process vector ]; testHaskellDepends = [ aeson base bytestring hspec ]; description = "A type-safe wrapper around i3's IPC"; @@ -138418,7 +138756,7 @@ self: { libraryToolDepends = [ alex ]; executableHaskellDepends = [ array base containers html xhtml ]; executableToolDepends = [ alex ]; - description = "A fast syntax highlighting library built with alex"; + description = "A fast syntax highlighting library built with alex."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -138433,7 +138771,7 @@ self: { revision = "1"; editedCabalFile = "1wl2sv2g7iwxldk582h1z6a2b3ks4wzk8rx8bflcxwlh6s4kq0s7"; libraryHaskellDepends = [ base bytestring ]; - description = "Determine the type of an image by reading the first bytes"; + description = "Determine the type of an image by reading the first bytes."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -139477,6 +139815,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "indexed-list-literals_0_2_1_3" = callPackage + ({ mkDerivation, base, hspec, Only }: + mkDerivation { + pname = "indexed-list-literals"; + version = "0.2.1.3"; + sha256 = "179z0df99ixaplr1qv7dawj3h8fq5qhgfn8mg0i4ix6xhpi9kqr6"; + libraryHaskellDepends = [ base Only ]; + testHaskellDepends = [ base hspec ]; + description = "Type safe indexed list literals"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "indexed-profunctors" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -139565,7 +139916,7 @@ self: { sha256 = "08fjmza05wlj11mvdjwfcp3fn6k5zi1hsld84805clipd55sbp0r"; libraryHaskellDepends = [ array base deepseq vector ]; testHaskellDepends = [ array base deepseq QuickCheck text vector ]; - description = "Non-contiguous interval data types with potentially infinite ranges"; + description = "Non-contiguous interval data types with potentially infinite ranges."; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -141912,6 +142263,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ipynb_0_1_0_1" = callPackage + ({ mkDerivation, aeson, aeson-diff, base, base64-bytestring + , bytestring, containers, directory, filepath, microlens + , microlens-aeson, tasty, tasty-hunit, text, unordered-containers + , vector + }: + mkDerivation { + pname = "ipynb"; + version = "0.1.0.1"; + sha256 = "0lwpz0ip7r1rxkirqb6p48ql19fzamqkrnf3khx7bfl5wsxi6yrb"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring containers text + unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-diff base base64-bytestring bytestring directory + filepath microlens microlens-aeson tasty tasty-hunit text + unordered-containers vector + ]; + description = "Data structure for working with Jupyter notebooks (ipynb)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ipython-kernel" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text , containers, cryptonite, directory, filepath, memory, mtl, process @@ -144297,6 +144672,37 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "jose_0_8_2_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, concise, containers, cryptonite, hspec, lens, memory + , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances + , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck + , template-haskell, text, time, unordered-containers, vector, x509 + }: + mkDerivation { + pname = "jose"; + version = "0.8.2.1"; + sha256 = "1mfnxfzgcxlsjfwzg4syih6wasi7mq25j3dawar9aihvdkpwqlfh"; + 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 + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite hspec lens memory monad-time mtl network-uri + QuickCheck quickcheck-instances safe semigroups tasty tasty-hspec + tasty-quickcheck template-haskell text time unordered-containers + vector x509 + ]; + description = "Javascript Object Signing and Encryption and JSON Web Token library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jose-jwt" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal , containers, criterion, cryptonite, doctest, either, hspec, HUnit @@ -145284,29 +145690,29 @@ self: { "json-syntax" = callPackage ({ mkDerivation, aeson, array-builder, array-chunks, base - , byteslice, bytesmith, bytestring, gauge, neat-interpolation - , primitive, scientific, scientific-notation - , small-bytearray-builder, tasty, tasty-hunit, text, text-short - , unordered-containers, vector + , bytebuild, byteslice, bytesmith, bytestring, gauge + , neat-interpolation, primitive, scientific, scientific-notation + , tasty, tasty-hunit, text, text-short, unordered-containers + , vector }: mkDerivation { pname = "json-syntax"; - version = "0.1.0.0"; - sha256 = "1z997wqg233nrbhzimqvlmq62ywa4abk0fygbwb79h1agq67jhc1"; + version = "0.1.1.0"; + sha256 = "08an68dh7ci5a84p25qzyfijhqbqsmsps0cyv8j5s3jfisaggbp5"; libraryHaskellDepends = [ - array-builder array-chunks base byteslice bytesmith bytestring - primitive scientific-notation text-short + array-builder array-chunks base bytebuild byteslice bytesmith + bytestring primitive scientific-notation text-short ]; testHaskellDepends = [ - aeson array-chunks base byteslice bytestring neat-interpolation - primitive scientific scientific-notation small-bytearray-builder - tasty tasty-hunit text text-short unordered-containers vector + aeson array-chunks base bytebuild byteslice bytestring + neat-interpolation primitive scientific scientific-notation tasty + tasty-hunit text text-short unordered-containers vector ]; benchmarkHaskellDepends = [ aeson base byteslice bytestring gauge neat-interpolation primitive scientific-notation text ]; - description = "High-performance JSON parser"; + description = "High-performance JSON parser and encoder"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -145425,7 +145831,7 @@ self: { base blaze-builder bytestring containers json2-types mtl old-locale parsec pretty time utf8-string ]; - description = "Library provides support for JSON"; + description = "Library provides support for JSON."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -145972,22 +146378,23 @@ self: { "jvm-binary" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, containers , criterion, data-binary-ieee754, deepseq, deriving-compat - , directory, filepath, generic-random, hspec, hspec-discover - , hspec-expectations-pretty-diff, mtl, QuickCheck, template-haskell - , text, vector, zip-archive + , directory, doctest, filepath, generic-random, hspec + , hspec-discover, hspec-expectations-pretty-diff, mtl, QuickCheck + , template-haskell, text, vector, zip-archive }: mkDerivation { pname = "jvm-binary"; - version = "0.8.0"; - sha256 = "0mzzfdsxh6r8blx447c25bdzv3y8gqb984p48y5cfpvrn2dwhs41"; + version = "0.9.0"; + sha256 = "1ks5mbp1anrgm100sf3ycv1prwm3vj1vyag7l0ihs4cr2sqzq3a2"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base binary bytestring containers data-binary-ieee754 deepseq deriving-compat mtl template-haskell text vector ]; testHaskellDepends = [ attoparsec base binary bytestring containers data-binary-ieee754 - deepseq deriving-compat directory filepath generic-random hspec - hspec-discover hspec-expectations-pretty-diff mtl QuickCheck + deepseq deriving-compat directory doctest filepath generic-random + hspec hspec-discover hspec-expectations-pretty-diff mtl QuickCheck template-haskell text vector zip-archive ]; testToolDepends = [ hspec-discover ]; @@ -148171,8 +148578,8 @@ self: { pname = "kraken"; version = "0.1.0"; sha256 = "12l24z6alscbdicp11nfc8fwmlhk5mjdjyh6xdqyvlzphp5yfp1k"; - revision = "2"; - editedCabalFile = "141qx2fb3dimv20qsl2q1bagwcn9i0r72z2ha1w7191m557in319"; + revision = "3"; + editedCabalFile = "1l4i9nhwvy958ka6l6gb5w5cxgjhdm1h7ycvcc2nrqlw2iwk16v1"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls mtl ]; @@ -148380,6 +148787,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "kubernetes-webhook-haskell_0_2_0_1" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring + , text, unordered-containers + }: + mkDerivation { + pname = "kubernetes-webhook-haskell"; + version = "0.2.0.1"; + sha256 = "10qf41gx4631793d19wibyhc2nm8wv3qjb53rhlgpxbjy547y2rr"; + libraryHaskellDepends = [ + aeson base base64-bytestring binary bytestring text + unordered-containers + ]; + description = "Create Kubernetes Admission Webhooks in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kuifje" = callPackage ({ mkDerivation, base, boxes, containers, lens }: mkDerivation { @@ -150001,7 +150425,7 @@ self: { libraryHaskellDepends = [ base containers language-ecmascript parsec uniplate ]; - description = "JavaScript static analysis library"; + description = "JavaScript static analysis library."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -150021,7 +150445,7 @@ self: { hashable lens mtl parsec pretty text unordered-containers ]; libraryToolDepends = [ alex ]; - description = "Parser and pretty printer for the Eiffel language"; + description = "Parser and pretty printer for the Eiffel language."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -150055,7 +150479,7 @@ self: { sha256 = "16kzdvhxpmfiia68c4y36fv1sjymy7sblba4iz77qqnwfqz3zka4"; libraryHaskellDepends = [ array base haskell-src parsec syb ]; libraryToolDepends = [ alex happy ]; - description = "Fortran lexer and parser, language support, and extensions"; + description = "Fortran lexer and parser, language support, and extensions."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -150569,6 +150993,50 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-puppet_1_4_6_3" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base + , base16-bytestring, bytestring, case-insensitive, containers + , cryptonite, directory, filecache, filepath, formatting, Glob + , hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data + , http-client, lens, lens-aeson, megaparsec, memory, mtl + , operational, optparse-applicative, parsec, parser-combinators + , pcre-utils, protolude, random, regex-pcre-builtin, scientific + , servant, servant-client, split, stm, strict-base-types, temporary + , text, time, transformers, unix, unordered-containers, vector + , yaml + }: + mkDerivation { + pname = "language-puppet"; + version = "1.4.6.3"; + sha256 = "0g84x311hivlchz23kw0lwqcml3r0wkwh24bqvpgkb2m7rmi8mwx"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring + case-insensitive containers cryptonite directory filecache filepath + formatting hashable hruby hslogger http-api-data http-client lens + lens-aeson megaparsec memory mtl operational parsec + parser-combinators pcre-utils protolude random regex-pcre-builtin + scientific servant servant-client split stm strict-base-types text + time transformers unix unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson ansi-wl-pprint async base bytestring containers Glob hslogger + http-client lens mtl optparse-applicative regex-pcre-builtin + strict-base-types text transformers unordered-containers vector + yaml + ]; + testHaskellDepends = [ + base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl + pcre-utils scientific strict-base-types temporary text transformers + unordered-containers vector + ]; + description = "Tools to parse and evaluate the Puppet DSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-python" = callPackage ({ mkDerivation, alex, array, base, containers, happy, monads-tf , pretty, transformers, utf8-string @@ -150583,7 +151051,7 @@ self: { array base containers monads-tf pretty transformers utf8-string ]; libraryToolDepends = [ alex happy ]; - description = "Parsing and pretty printing of Python code"; + description = "Parsing and pretty printing of Python code."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -150600,7 +151068,7 @@ self: { executableHaskellDepends = [ base haskell98 language-python xhtml ]; - description = "Generate coloured XHTML for Python code"; + description = "Generate coloured XHTML for Python code."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -151156,8 +151624,8 @@ self: { }: mkDerivation { pname = "latex-svg-hakyll"; - version = "0.1"; - sha256 = "119mln1k2qlzddz7fwjpvqzkd9gwi9ijmrlzlcxly63a8ffvylcn"; + version = "0.2"; + sha256 = "0brpnsd96r5q01mdaamny74mwphhjyhnz1zjy620i13d2cswl1rw"; libraryHaskellDepends = [ base hakyll latex-svg-image latex-svg-pandoc lrucache pandoc-types ]; @@ -151172,8 +151640,8 @@ self: { }: mkDerivation { pname = "latex-svg-image"; - version = "0.1"; - sha256 = "0g27rg4ip5rg2dkfwxv3khnfn8bjpgwrr3sakxvsrhvsxgb6lwf3"; + version = "0.2"; + sha256 = "1vr66sk1g4g8rhm78ply1mfk0ybcmpg420z26nniw51zr79lvnvn"; libraryHaskellDepends = [ base base64-bytestring bytestring cryptohash-sha256 deepseq directory filepath parsec process temporary transformers @@ -151188,8 +151656,8 @@ self: { }: mkDerivation { pname = "latex-svg-pandoc"; - version = "0.1"; - sha256 = "17n5gfdl7vdy06pph32yii9sww0mby10mdki6lh9k8wlvm15khv8"; + version = "0.2"; + sha256 = "1qzp5y7slklq8p1m6bspzyx7iypd5mq3q0hmxdysivisw776f0aq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153283,8 +153751,8 @@ self: { }: mkDerivation { pname = "lhs2tex"; - version = "1.23"; - sha256 = "1i55ssw6kzmc2ybqczpns3fpsd3043w6w42dni0kq7rkh87s1xc6"; + version = "1.24"; + sha256 = "09mkcklm9aixn4xwdcmy8z4x5myh4f5ky0nnadj1wgfjcychbmzc"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ @@ -155114,8 +155582,8 @@ self: { }: mkDerivation { pname = "linearmap-category"; - version = "0.4.0.0"; - sha256 = "18fk6fj98w660mid7sadq8algmm5a5gz5150ac62kdp4rrk6igjk"; + version = "0.4.0.1"; + sha256 = "1zc7zns49d832wm22dsbv5xvh5x6s4zg6ky1vr941rs1z9jskmyj"; libraryHaskellDepends = [ base call-stack constrained-categories containers free-vector-spaces ieee754 lens linear manifolds-core QuickCheck @@ -156765,7 +157233,7 @@ self: { base directory filepath llvm-hs llvm-hs-pure mtl tasty tasty-golden tasty-hspec tasty-hunit text transformers ]; - description = "A pretty printer for LLVM IR"; + description = "A pretty printer for LLVM IR."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -157120,7 +157588,7 @@ self: { libraryHaskellDepends = [ base combinatorial-problems containers erf random ]; - description = "Generalised local search within Haskell, for applications in combinatorial optimisation"; + description = "Generalised local search within Haskell, for applications in combinatorial optimisation."; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -159519,6 +159987,20 @@ self: { broken = true; }) {}; + "lzo" = callPackage + ({ mkDerivation, base, binary, bytestring, digest-pure, tasty + , tasty-hunit + }: + mkDerivation { + pname = "lzo"; + version = "0.1.1.0"; + sha256 = "0w10f9a5kpx5j9wiq8cvshn6fr1vbh03njdhadas5sy77qd2r1i7"; + libraryHaskellDepends = [ base binary bytestring digest-pure ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit ]; + description = "minilzo bundled for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mDNSResponder-client" = callPackage ({ mkDerivation, base, bytestring, Cabal, ctrie, data-endian , network, network-msg, transformers @@ -160969,8 +161451,8 @@ self: { }: mkDerivation { pname = "manifold-random"; - version = "0.5.0.4"; - sha256 = "0wf0ya7w73ikd0ivg7m8q4nnc3mv7426l5xlf04zs5gh982x33gl"; + version = "0.5.1.0"; + sha256 = "0zip7ni06zljhj94d5vdf6sb6fbsm9iidcsrl85bdh7i7dkb3avr"; libraryHaskellDepends = [ base constrained-categories linearmap-category manifolds random-fu semigroups vector-space @@ -160992,8 +161474,8 @@ self: { }: mkDerivation { pname = "manifolds"; - version = "0.5.0.4"; - sha256 = "0cng3sp2lg8bfi8g9w4p7ccmg5b177svljl5cki286kdjqsvl320"; + version = "0.5.1.0"; + sha256 = "12w1whsr8zbsvv06iwdd27hjnvs8s041hrsp5c85chl4xqxwkl5h"; libraryHaskellDepends = [ array base binary call-stack comonad constrained-categories containers deepseq free free-vector-spaces ieee754 lens linear @@ -161016,8 +161498,8 @@ self: { ({ mkDerivation, base, call-stack, tagged, vector-space }: mkDerivation { pname = "manifolds-core"; - version = "0.5.0.4"; - sha256 = "0b1acwmmjcgq6bb0qijh227wq49vl295gd0d4iz8lpk1g1pwb2v2"; + version = "0.5.1.0"; + sha256 = "1bvmr0gcfj7zd0rff0qjlzjy8hqdbh52ljiiazrmqmb9abdsciq3"; libraryHaskellDepends = [ base call-stack tagged vector-space ]; description = "The basic classes for the manifolds hierarchy"; license = stdenv.lib.licenses.gpl3; @@ -162217,18 +162699,20 @@ self: { }) {}; "matrix-sized" = callPackage - ({ mkDerivation, base, conduit, data-ordlist, ieee754, primitive - , singletons, tasty, tasty-quickcheck, vector + ({ mkDerivation, base, bytestring, bytestring-lexing, conduit + , conduit-extra, data-ordlist, ieee754, primitive, singletons + , store, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "matrix-sized"; - version = "0.0.4"; - sha256 = "09k6qrscgdbyimk67s7sx5gzz1xnpkz83lkadh0vbm4lwbbp8jlf"; + version = "0.1.0"; + sha256 = "0qmbckk1bmmg8lszdnd8lcgplniqzd53iq1aqv9jky96zdmmrna6"; libraryHaskellDepends = [ - base conduit primitive singletons vector + base bytestring bytestring-lexing conduit conduit-extra primitive + singletons store vector ]; testHaskellDepends = [ - base conduit data-ordlist ieee754 primitive singletons tasty + base conduit data-ordlist ieee754 singletons store tasty tasty-quickcheck vector ]; description = "Haskell matrix library with interface to C++ linear algebra libraries"; @@ -164007,7 +164491,7 @@ self: { version = "0.0.8"; sha256 = "0rdw0laqx9kypfwzqb4ir18r07sjxgm4pwfs82bjpwq0gf58nzas"; libraryHaskellDepends = [ arrows base random Stream ]; - description = "Generalised local search within Haskell, for applications in combinatorial optimisation"; + description = "Generalised local search within Haskell, for applications in combinatorial optimisation."; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -164309,8 +164793,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "microbase"; - version = "4.14.0.0.4"; - sha256 = "103gi70hzz1mvr2rzvsq77kzl2sfyf9kx6iaivg0shks8yslp5zq"; + version = "4.14.0.0.6"; + sha256 = "1wnng6ik7p4id5p7crbk9gwy0c4rg2rggkphc4wqfmc2zgpl1ywq"; libraryHaskellDepends = [ base ]; doHaddock = false; description = "A minimal base to work around GHC bugs"; @@ -165476,7 +165960,7 @@ self: { base containers directory filepath monads-tf parsec pretty transformers xhtml ]; - description = "an interpreter for an operational semantics for the STG machine"; + description = "an interpreter for an operational semantics for the STG machine."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -165759,15 +166243,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "miso_1_5_0_0" = callPackage + "miso_1_5_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-api-data , http-types, lucid, network-uri, servant, servant-lucid, text , transformers, vector }: mkDerivation { pname = "miso"; - version = "1.5.0.0"; - sha256 = "08843wyd41hs38vrixcfdnmar9vkvayk11323kav4qq85s3yhsd3"; + version = "1.5.1.0"; + sha256 = "1vnpfqnkg89ax5znkppqnnp2dgmps2hwdyc05rph2xqvyg5wq9qd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165796,8 +166280,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "miso-examples"; - version = "1.5.0.0"; - sha256 = "0k0rf7kb65nqckmz8gc27rssnn3ja0nswmrbslfmm0nz7293jaiw"; + version = "1.5.1.0"; + sha256 = "14zbzrh3rvqhpn0gd02wd1jdd40inlpy8v4a1qv1aq1c39ip2csb"; isLibrary = false; isExecutable = true; description = "A tasty Haskell front-end framework"; @@ -168319,7 +168803,7 @@ self: { revision = "1"; editedCabalFile = "11v5zdsb9mp1rxvgcrxcr2xnc610xi16krwa9r4i5d6njmphfbdp"; libraryHaskellDepends = [ base ]; - description = "Haskell98 partial maps and filters over MonadPlus"; + description = "Haskell98 partial maps and filters over MonadPlus."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -169057,7 +169541,7 @@ self: { }) {morfeusz = null;}; "morley" = callPackage - ({ mkDerivation, aeson, aeson-options, aeson-pretty, base-noprelude + ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base-noprelude , base16-bytestring, base58-bytestring, binary, bytestring , constraints, containers, cryptonite, data-default, directory , filepath, first-class-families, fmt, formatting, gauge, ghc-prim @@ -169073,12 +169557,12 @@ self: { }: mkDerivation { pname = "morley"; - version = "1.1.0"; - sha256 = "0y8i03pa5i7d1afhh7ihb7wicwmjvajqs38brp8614n825jzng9c"; + version = "1.2.0"; + sha256 = "1id9sqh105p9b35g7rnk6x43h3h2d4v71bg13mz4gk5ny186d512"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-options aeson-pretty base-noprelude base16-bytestring + aeson aeson-casing aeson-pretty base-noprelude base16-bytestring base58-bytestring binary bytestring constraints containers cryptonite data-default first-class-families fmt formatting ghc-prim gitrev hex-text hspec hspec-expectations HUnit interpolate @@ -169166,6 +169650,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "morpheus-graphql_0_11_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, megaparsec + , mtl, scientific, tasty, tasty-hunit, template-haskell, text + , th-lift-instances, transformers, unliftio-core + , unordered-containers, uuid, vector, websockets + }: + mkDerivation { + pname = "morpheus-graphql"; + version = "0.11.0"; + sha256 = "1cwq1wa43df8d681x409ra9cnv9qfxb2wpbf6mm3fcbnkkaza351"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers megaparsec mtl scientific + template-haskell text th-lift-instances transformers unliftio-core + unordered-containers uuid vector websockets + ]; + testHaskellDepends = [ + aeson base bytestring containers megaparsec mtl scientific tasty + tasty-hunit template-haskell text th-lift-instances transformers + unliftio-core unordered-containers uuid vector websockets + ]; + description = "Morpheus GraphQL"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "morpheus-graphql-cli" = callPackage ({ mkDerivation, base, bytestring, filepath, morpheus-graphql , optparse-applicative @@ -170375,8 +170885,8 @@ self: { }: mkDerivation { pname = "mu-avro"; - version = "0.2.0.0"; - sha256 = "12cjq2pfaksa8s93j731p6i572xlnpl7p42lz1kvyyn4bg5r222y"; + version = "0.3.0.0"; + sha256 = "0p5j3pzx2b8hj7zn7gdj7xg2n99yhzvbkhbr5cv6jwcd5gpz3pkn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -170390,8 +170900,39 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "mu-graphql" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , conduit, graphql-parser, http-types, list-t, mtl, mu-rpc + , mu-schema, parsers, regex-tdfa, scientific, sop-core, stm + , stm-chans, stm-conduit, stm-containers, template-haskell, text + , unordered-containers, uuid, wai, wai-extra, wai-websockets, warp + , warp-tls, websockets + }: + mkDerivation { + pname = "mu-graphql"; + version = "0.3.0.0"; + sha256 = "1371h6w3v10qcmp8zp3mjxfhvknk39qgcn9laslssci4yrrr5a09"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring conduit graphql-parser + http-types list-t mtl mu-rpc mu-schema parsers scientific sop-core + stm stm-chans stm-conduit stm-containers template-haskell text + unordered-containers uuid wai wai-websockets warp warp-tls + websockets + ]; + executableHaskellDepends = [ + base conduit mu-rpc mu-schema regex-tdfa text wai-extra warp + ]; + description = "GraphQL support for Mu"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {graphql-parser = null;}; + "mu-grpc-client" = callPackage - ({ mkDerivation, async, base, bytestring, conduit, http2 + ({ mkDerivation, async, avro, base, bytestring, conduit, http2 , http2-client, http2-client-grpc, http2-grpc-types, mu-grpc-common , mu-optics, mu-protobuf, mu-rpc, mu-schema, optics-core, sop-core , stm, stm-chans, stm-conduit, template-haskell, text @@ -170399,13 +170940,13 @@ self: { }: mkDerivation { pname = "mu-grpc-client"; - version = "0.2.0.0"; - sha256 = "0dy9nfzyls5410dh7crgk03bfwcrxgcwryqhplsg25x5rxplkcfb"; + version = "0.3.0.0"; + sha256 = "08z92rm1dcr02qwmd92inplzb1hgari0bsmw19xlmkdlsjldj5v0"; libraryHaskellDepends = [ - async base bytestring conduit http2 http2-client http2-client-grpc - http2-grpc-types mu-grpc-common mu-optics mu-protobuf mu-rpc - mu-schema optics-core sop-core stm stm-chans stm-conduit - template-haskell text th-abstraction + async avro base bytestring conduit http2 http2-client + http2-client-grpc http2-grpc-types mu-grpc-common mu-optics + mu-protobuf mu-rpc mu-schema optics-core sop-core stm stm-chans + stm-conduit template-haskell text th-abstraction ]; description = "gRPC clients from Mu definitions"; license = stdenv.lib.licenses.asl20; @@ -170420,8 +170961,8 @@ self: { }: mkDerivation { pname = "mu-grpc-common"; - version = "0.2.0.0"; - sha256 = "04984ibj6ma880jchibmr1z696mrik29gc2qnaf0vsp0nxwqr9vv"; + version = "0.3.0.0"; + sha256 = "1ipqzg799lfy2apl3galhgnqqpf5z9nr0dvb9gp9cmv0y9bn3iv6"; libraryHaskellDepends = [ avro base binary bytestring http2-grpc-proto3-wire http2-grpc-types mu-avro mu-protobuf mu-rpc mu-schema @@ -170433,24 +170974,24 @@ self: { }) {}; "mu-grpc-server" = callPackage - ({ mkDerivation, async, base, binary, bytestring, conduit + ({ mkDerivation, async, avro, base, binary, bytestring, conduit , http2-grpc-types, mtl, mu-grpc-common, mu-protobuf, mu-rpc , mu-schema, sop-core, stm, stm-conduit, wai, warp, warp-grpc , warp-tls }: mkDerivation { pname = "mu-grpc-server"; - version = "0.2.0.0"; - sha256 = "1g3dr66b6915ci53lhygahw8ganqivd42a918amv1xcxq7li1m76"; + version = "0.3.0.0"; + sha256 = "1z8mhychrr5y6zrxg3xx398x221cwyyw7yss8gfn0f5c7j64r693"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base binary bytestring conduit http2-grpc-types mtl + async avro base binary bytestring conduit http2-grpc-types mtl mu-grpc-common mu-protobuf mu-rpc mu-schema sop-core stm stm-conduit wai warp warp-grpc warp-tls ]; executableHaskellDepends = [ - async base binary bytestring conduit http2-grpc-types mtl + async avro base binary bytestring conduit http2-grpc-types mtl mu-grpc-common mu-protobuf mu-rpc mu-schema sop-core stm stm-conduit wai warp warp-grpc warp-tls ]; @@ -170460,13 +171001,29 @@ self: { broken = true; }) {}; + "mu-kafka" = callPackage + ({ mkDerivation, avro, base, bytestring, conduit, hw-kafka-client + , hw-kafka-conduit, mu-avro, mu-schema, resourcet + }: + mkDerivation { + pname = "mu-kafka"; + version = "0.3.0.0"; + sha256 = "0flz0567rgky7ckl0nzinfd93bb7x0w1dz031y7hk3wcpp98y5i3"; + libraryHaskellDepends = [ + avro base bytestring conduit hw-kafka-client hw-kafka-conduit + mu-avro mu-schema resourcet + ]; + description = "Utilities for interoperation between Mu and Kafka"; + license = stdenv.lib.licenses.asl20; + }) {}; + "mu-optics" = callPackage ({ mkDerivation, base, containers, mu-schema, optics-core, sop-core }: mkDerivation { pname = "mu-optics"; - version = "0.2.0.0"; - sha256 = "1b3954pq7iia4vq2bnl1gw2qakdrwkh647qpb1sl1dmrpi0mc77m"; + version = "0.3.0.0"; + sha256 = "0263nd5xwyn2jb99d6vn7fk8lzmkgarfx9n6lrc4dpa5immfypnq"; libraryHaskellDepends = [ base containers mu-schema optics-core sop-core ]; @@ -170480,8 +171037,8 @@ self: { }: mkDerivation { pname = "mu-persistent"; - version = "0.2.0.0"; - sha256 = "1n81dpayp0q0i19w1pchgwwblxz0jd510q01r8mvwpf099gb27pa"; + version = "0.3.0.0"; + sha256 = "1jd0h2cqr4nbwk2vyaq3wamrgwi1dkzmyhqg6b7002wdvm1h822j"; libraryHaskellDepends = [ base monad-logger mu-schema persistent resourcet transformers ]; @@ -170497,8 +171054,8 @@ self: { }: mkDerivation { pname = "mu-protobuf"; - version = "0.2.0.0"; - sha256 = "10yxb4dfdm9bm41gpd2jbb7jz79gk7s5yzqf3d994zqcq0d5k5fh"; + version = "0.3.0.0"; + sha256 = "02wk2bhx6lflgri9fm4dq09yz07xsm82fbxgm130zs7s6015chxf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -170522,8 +171079,8 @@ self: { }: mkDerivation { pname = "mu-rpc"; - version = "0.2.0.0"; - sha256 = "1rw4gci0m5isij0bgngbm7zjxafnkibmg3qsxs6dym19mxgqs9nk"; + version = "0.3.0.0"; + sha256 = "02m19ddp8q3khp8j6cgax24srf6dlpakq2wkjpqsa31vawn06a9g"; libraryHaskellDepends = [ base conduit mtl mu-schema sop-core template-haskell text ]; @@ -170538,8 +171095,8 @@ self: { }: mkDerivation { pname = "mu-schema"; - version = "0.2.0.0"; - sha256 = "1rdv2mvp66xy41l0g8v03szn5ndg8wji4mzpnqdd90z2xzim4z0w"; + version = "0.3.0.0"; + sha256 = "0b943w2mfrgrc2cgq4vjg1wgyb5ijdqfq9argv0k6i6b3hj97kqg"; libraryHaskellDepends = [ aeson base bytestring containers sop-core template-haskell text th-abstraction unordered-containers vector @@ -171751,7 +172308,7 @@ self: { ]; executableHaskellDepends = [ base ]; executablePkgconfigDepends = [ gtk3 ]; - description = "Supply your tunes info without leaving your music player"; + description = "Supply your tunes info without leaving your music player."; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -174112,8 +174669,8 @@ self: { }: mkDerivation { pname = "net-spider"; - version = "0.4.3.0"; - sha256 = "19cvghyj6val79bsq3sh9gpr1f94dmmikmgsdasf6a26vcxr1q4y"; + version = "0.4.3.1"; + sha256 = "0r0l078ljhvpacay1pwql4zccwpj8646zdzdz0gazh0yj2zs8g01"; libraryHaskellDepends = [ aeson base containers data-interval extended-reals greskell greskell-websocket hashable monad-logger regex-applicative @@ -174157,8 +174714,8 @@ self: { }: mkDerivation { pname = "net-spider-pangraph"; - version = "0.2.0.0"; - sha256 = "1ijaa4zsbm583s0bmhrc475p6q1gkx1wz3sg6698aciw0ip14kjs"; + version = "0.2.0.1"; + sha256 = "0n19hlyzb2r9kkkw1ivaify0msjv4iq69rv14cdak8x50dmvn4wq"; libraryHaskellDepends = [ base bytestring greskell net-spider pangraph text time ]; @@ -174178,8 +174735,8 @@ self: { }: mkDerivation { pname = "net-spider-rpl"; - version = "0.4.1.0"; - sha256 = "0j0w1sgr1b0vn5249agz94vlz1az9pfi8fswd72s84lpcn9jyw89"; + version = "0.4.1.1"; + sha256 = "09iwz5yrzcfb5rmlhskhzilyqbvf1al8j8qv7ag5jn6kq3pgipw3"; libraryHaskellDepends = [ aeson base conduit conduit-parse greskell hashable ip monad-logger mtl net-spider regex-applicative safe-exceptions text time @@ -174202,8 +174759,8 @@ self: { }: mkDerivation { pname = "net-spider-rpl-cli"; - version = "0.1.3.0"; - sha256 = "1hgzrl3fq1vp4dh4c0jf9kndclcrzapd124b4c9xd20xgidy01fd"; + version = "0.1.3.1"; + sha256 = "0y1bagnlazd7pj240ka1lf970qclf569qbsdxas27pj1pi91jb0r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174548,7 +175105,7 @@ self: { libraryHaskellDepends = [ base containers directory filepath mtl nettle-openflow unix ]; - description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs"; + description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -174566,7 +175123,7 @@ self: { array base bimap binary binary-strict bytestring containers HList mtl network parsec syb ]; - description = "OpenFlow protocol messages, binary formats, and servers"; + description = "OpenFlow protocol messages, binary formats, and servers."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -176527,7 +177084,7 @@ self: { revision = "1"; editedCabalFile = "08hgvqbb13n2scs4shqjdyzm7kblgllndk0429pdiwdx21k5391q"; libraryHaskellDepends = [ base bytestring http-conduit xml ]; - description = "Haskell interface to the nist random beacon"; + description = "Haskell interface to the nist random beacon."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -176623,20 +177180,20 @@ self: { "nix-derivation" = callPackage ({ mkDerivation, attoparsec, base, containers, criterion, deepseq - , pretty-show, QuickCheck, system-filepath, text, vector + , filepath, pretty-show, QuickCheck, text, vector }: mkDerivation { pname = "nix-derivation"; - version = "1.0.2"; - sha256 = "16xx4817ncgqvhmydbfr35lhgiw34js2n5liyfing3qvbfprmscw"; + version = "1.1.0"; + sha256 = "09r1818j838a6mzgsqsvf7a98l3h0v7vqrnmimvycaaxri3rxmhz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base containers deepseq system-filepath text vector + attoparsec base containers deepseq filepath text vector ]; executableHaskellDepends = [ attoparsec base pretty-show text ]; testHaskellDepends = [ - attoparsec base QuickCheck system-filepath text vector + attoparsec base filepath QuickCheck text vector ]; benchmarkHaskellDepends = [ attoparsec base criterion text ]; description = "Parse and render *.drv files"; @@ -176709,6 +177266,25 @@ self: { broken = true; }) {}; + "nix-narinfo" = callPackage + ({ mkDerivation, attoparsec, base, containers, filepath, hspec + , QuickCheck, text + }: + mkDerivation { + pname = "nix-narinfo"; + version = "0.1.0.0"; + sha256 = "1jv7bwjfp2b2c63gfnlznmc1r4bnf6mvlkngcipvyhnxr0mwpxfy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ attoparsec base containers text ]; + executableHaskellDepends = [ attoparsec base text ]; + testHaskellDepends = [ + attoparsec base filepath hspec QuickCheck text + ]; + description = "Parse and render .narinfo files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nix-paths" = callPackage ({ mkDerivation, base, nix, process }: mkDerivation { @@ -177326,6 +177902,8 @@ self: { pname = "nonce"; version = "1.0.7"; sha256 = "1q9ph0aq51mvdvydnriqd12sfin36pfb8f588zgac1ybn8r64ksb"; + revision = "1"; + editedCabalFile = "1i6f4nwp4xn31as6plqrf6wp6gn3ylwdi77h99572jy7p3985aw1"; libraryHaskellDepends = [ base base64-bytestring bytestring entropy text transformers unliftio unliftio-core @@ -177611,7 +178189,7 @@ self: { version = "0.1.1"; sha256 = "1mm1j0l3h8qxpk0bis4g1f6zp5407rkq2z5ldyr036frbvfwqaj5"; libraryHaskellDepends = [ base ]; - description = "Useful utility functions that only depend on base"; + description = "Useful utility functions that only depend on base."; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -179283,6 +179861,54 @@ self: { broken = true; }) {inherit (pkgs) unixODBC;}; + "odd-jobs" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , direct-daemonize, directory, either, fast-logger, filepath + , foreign-store, friendly-time, hedgehog, hostname, lifted-async + , lifted-base, lucid, mmorph, monad-control, monad-logger, mtl + , optparse-applicative, postgresql-simple, random, resource-pool + , safe, servant, servant-lucid, servant-server, string-conv, tasty + , tasty-discover, tasty-hedgehog, tasty-hunit, text + , text-conversions, time, timing-convenience, unix, unliftio + , unliftio-core, unordered-containers, warp + }: + mkDerivation { + pname = "odd-jobs"; + version = "0.1.0"; + sha256 = "0l1b63j76a8rbhligj7s282bzrw2dgb7jv8cki1a7ss0v58k3c4s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring direct-daemonize directory either fast-logger + filepath friendly-time hostname lucid monad-control monad-logger + mtl optparse-applicative postgresql-simple resource-pool safe + servant servant-lucid servant-server string-conv text + text-conversions time timing-convenience unix unliftio + unliftio-core unordered-containers warp + ]; + executableHaskellDepends = [ + aeson base bytestring direct-daemonize directory either fast-logger + filepath foreign-store friendly-time hostname lucid monad-control + monad-logger mtl optparse-applicative postgresql-simple + resource-pool safe servant servant-lucid servant-server string-conv + text text-conversions time timing-convenience unix unliftio + unliftio-core unordered-containers warp + ]; + testHaskellDepends = [ + aeson base bytestring containers direct-daemonize directory either + fast-logger filepath friendly-time hedgehog hostname lifted-async + lifted-base lucid mmorph monad-control monad-logger mtl + optparse-applicative postgresql-simple random resource-pool safe + servant servant-lucid servant-server string-conv tasty + tasty-discover tasty-hedgehog tasty-hunit text text-conversions + time timing-convenience unix unliftio unliftio-core + unordered-containers warp + ]; + testToolDepends = [ tasty-discover ]; + description = "A full-featured PostgreSQL-backed job queue (with an admin UI)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "oden-go-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text , unordered-containers @@ -179977,8 +180603,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.6.7004.1"; - sha256 = "09jgdqkw8hp82b3x0fg9906gyxwl9gz3hifv2dvrj915fvgiybg1"; + version = "0.6.7004.2"; + sha256 = "0lmfpbrfy6l7nlkjn26smmv3n992b54xnplwm67jjpryaz7psdz1"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -180755,12 +181381,12 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "opentelemetry_0_3_0" = callPackage + "opentelemetry_0_3_1" = callPackage ({ mkDerivation, base, bytestring, exceptions }: mkDerivation { pname = "opentelemetry"; - version = "0.3.0"; - sha256 = "1mgq84ixi8hxhgim5d5mx6v1zc1sqrp8cffzw14rly3sfhdi1k0m"; + version = "0.3.1"; + sha256 = "1yfhdh1pbilxmi0zjckyh60mrj1j8m10bwb3pbm1cb32rwashj45"; libraryHaskellDepends = [ base bytestring exceptions ]; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -180775,8 +181401,8 @@ self: { }: mkDerivation { pname = "opentelemetry-extra"; - version = "0.3.0"; - sha256 = "00998jr520qmr9ii96r04bspfh8cdxwk951y02ic01higqjkx6xp"; + version = "0.3.1"; + sha256 = "0jlbrsnk1h9cnrgkxln5qz3rxf235z8sy0sm10cw5hwi1y9kzs5a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180820,8 +181446,8 @@ self: { }: mkDerivation { pname = "opentelemetry-lightstep"; - version = "0.3.0"; - sha256 = "0kfvls8alc8wq0habl4snvhvd3a808z07san1sbvwp215frxycy9"; + version = "0.3.1"; + sha256 = "0p1dl9m82sgcjdv13jbkjk50466yw6228kyy2jvw3fpb4lyfg38n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180845,8 +181471,8 @@ self: { }: mkDerivation { pname = "opentelemetry-wai"; - version = "0.3.0"; - sha256 = "0x2a3s1xdc66ww8p8nkpwblvhv9hng64baij3wvbcbn2n1lls531"; + version = "0.3.1"; + sha256 = "1399xmmphh3ph7m0fn6yx81p7wvk3s10wg4a0fp0pdmpc7hmyxgi"; libraryHaskellDepends = [ base bytestring http-types opentelemetry text wai ]; @@ -181946,6 +182572,8 @@ self: { pname = "orders"; version = "0.1.0.0"; sha256 = "1ry6flg5sh3hl1xpkqk67ayd4y0xx3j2pwcz26q1pgqn6m84plzr"; + revision = "1"; + editedCabalFile = "1ilyg95l97xp4ym402g499ysfbwqsw413kpk4gvi5hd861xx2laj"; libraryHaskellDepends = [ base containers ]; description = "basic orders"; license = stdenv.lib.licenses.bsd3; @@ -182731,7 +183359,7 @@ self: { base binary criterion deepseq mtl unordered-containers vector vector-binary-instances ]; - description = "Generation and traversal of highly compressed directed acyclic word graphs"; + description = "Generation and traversal of highly compressed directed acyclic word graphs."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -183048,8 +183676,8 @@ self: { }: mkDerivation { pname = "pairing"; - version = "1.0.0"; - sha256 = "0mcjd463ffgq2ghvbi2h02dxy0p40ilhazznn2zqzqp7gksrhvfd"; + version = "1.1.0"; + sha256 = "1k19bmdnc9dlm62b6hvjnc4k7j3yi5hsc0m8yvw33qb63ci36mmk"; libraryHaskellDepends = [ base bytestring elliptic-curve errors galois-field groups MonadRandom protolude tasty-quickcheck @@ -183813,8 +184441,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.2.6"; - sha256 = "018y7c5w9q1dp9n975jclbcir91zay3r6m6fc2xcf1dyamds3ca9"; + version = "0.2.7"; + sha256 = "1fagym17jg4df445d8jr2lc52rx9irmnz7kv4g236py311z7bmbq"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -185146,10 +185774,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "parsec1"; - version = "1.0.0.6"; - sha256 = "0wwmghla8cqmmpwx9wwcmh39d9np9cgc1d0w3xf18k4adb1sg636"; - revision = "1"; - editedCabalFile = "0wnyg8blygix98w8gwqrm8z8r774zr9y2qvhkfb336zgdvdlif9x"; + version = "1.0.0.7"; + sha256 = "1v9kq4g378v8pkj8ldpqwh9dwlng5idbxqqb8ywmzdjnglih34rf"; libraryHaskellDepends = [ base ]; description = "Portable monadic parser combinators"; license = stdenv.lib.licenses.bsd3; @@ -188101,7 +188727,7 @@ self: { version = "0.3.0.0"; sha256 = "05h7wlw82ljjic50qhzlldhidz344id1fpf0yaxrhqvx7wkgyi2m"; libraryHaskellDepends = [ base time yesod ]; - description = "A library for rate limiting activities with a persistent backend"; + description = "A library for rate limiting activities with a persistent backend."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -192850,6 +193476,22 @@ self: { broken = true; }) {}; + "pontarius-xmpp-extras" = callPackage + ({ mkDerivation, base, data-default, pontarius-xmpp, text, time + , xml-types + }: + mkDerivation { + pname = "pontarius-xmpp-extras"; + version = "0.1.0.1"; + sha256 = "04qaq8m2c8l8my89n0p6x2r3hqw9nmivk1mjkip0wgw2cj3ia7h6"; + libraryHaskellDepends = [ + base data-default pontarius-xmpp text time xml-types + ]; + description = "XEPs implementation on top of pontarius-xmpp"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pontarius-xpmn" = callPackage ({ mkDerivation, base, containers, pontarius-xmpp, random, text , xml-types @@ -195860,8 +196502,8 @@ self: { ({ mkDerivation, ghc-prim }: mkDerivation { pname = "prim"; - version = "0.1.0.6"; - sha256 = "187pzlgkyg64azwrr2q896wy4i5zrryjbp9ldg9hm5lgyv782vr2"; + version = "0.1.0.9"; + sha256 = "15igqxb77ycl9lfs1bl1l9x3cynsg4kqzkr54q46ly4l315bsrq4"; libraryHaskellDepends = [ ghc-prim ]; description = "An ergonomic but conservative interface to ghc-prim"; license = stdenv.lib.licenses.mit; @@ -196713,7 +197355,7 @@ self: { semigroups tasty tasty-hunit text transformers transformers-compat void ]; - description = "Streaming interface to system processes"; + description = "Streaming interface to system processes."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -196751,7 +197393,7 @@ self: { base data-default GLUT hsnoise NumInstances OpenGL random time transformers utf8-string vector-space ]; - description = "Computer graphics for kids and artists with Processing implemented in Haskell"; + description = "Computer graphics for kids and artists with Processing implemented in Haskell."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -196876,10 +197518,8 @@ self: { }: mkDerivation { pname = "product-profunctors"; - version = "0.10.0.0"; - sha256 = "0s0ssl2900r16992mgl0idkryg3l7psp8nljyg9brr7fqa3pd3dd"; - revision = "4"; - editedCabalFile = "0vf9w949qfi6p1nqr0cxb9shxdz15mmrd8r0w4gxid56fjc2kaia"; + version = "0.10.0.1"; + sha256 = "15q6mgn42in4df61251q8h2d7hgvflik93xngc7jyyxj4ymaz5yh"; libraryHaskellDepends = [ base bifunctors contravariant profunctors tagged template-haskell ]; @@ -198563,6 +199203,8 @@ self: { pname = "pseudo-boolean"; version = "0.1.9.0"; sha256 = "00n5mf7abprhr9xvh3k1mw40jn4l94wwxpc2h0546h0n9v7srb1b"; + revision = "1"; + editedCabalFile = "14lgfxazr83nmbcdprygx2add8233hsq1hpdsiffx5zprgvr78vv"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable megaparsec parsec void @@ -199216,8 +199858,8 @@ self: { }: mkDerivation { pname = "purebred-email"; - version = "0.4"; - sha256 = "14spyllq10hkscbrhdsqr7k4rl8q17kvh2n9nmhjiikgjlp066cz"; + version = "0.4.1"; + sha256 = "0fkdmd0glp8p2dyzfpm3ah6nbfw4jqfzx7ai6yl2f9yrssb0ckp9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200233,6 +200875,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "qrcode-core_0_9_3" = callPackage + ({ mkDerivation, base, binary, bytestring, case-insensitive + , containers, dlist, primitive, text, vector + }: + mkDerivation { + pname = "qrcode-core"; + version = "0.9.3"; + sha256 = "08kp0qp7kvld99kk2iwr6cxpxji2w9vjydivqc3nwxbk5ay2mpjg"; + libraryHaskellDepends = [ + base binary bytestring case-insensitive containers dlist primitive + text vector + ]; + description = "QR code library in pure Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "qrcode-juicypixels" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, JuicyPixels , qrcode-core, text, vector @@ -200249,6 +200908,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "qrcode-juicypixels_0_8_1" = 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "qsem" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -202395,7 +203071,7 @@ self: { sha256 = "14fnk2q702qm0mh30r9kznbh4ikpv4fsd5mrnwphm5d06vmq6hq9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base haskell98 ]; - description = "'$' in reverse"; + description = "'$' in reverse."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -202422,8 +203098,8 @@ self: { ({ mkDerivation, base, criterion, hspec }: mkDerivation { pname = "rampart"; - version = "1.0.0.3"; - sha256 = "0y7nd9nbrmmb74cqmcwwq15xrd9b3wqjqvlw29jzlayard3c2hfj"; + version = "1.1.0.0"; + sha256 = "1bzgc5pij7i1c47b1jbyfsx7b3lk961fh5817qfmwlwx096g462f"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion ]; @@ -205802,6 +206478,30 @@ self: { broken = true; }) {}; + "reflex-dynamic-containers" = callPackage + ({ mkDerivation, base, binary, containers, deepseq, dependent-map + , dependent-sum, hashable, hspec, hspec-contrib, HUnit, ilist + , reflex, reflex-test-host, relude, these + }: + mkDerivation { + pname = "reflex-dynamic-containers"; + version = "0.1.0.0"; + sha256 = "161klhbz4528rljv4fhkzf4yad3xxiflignbc46il1j9lw99bh0k"; + libraryHaskellDepends = [ + base binary containers deepseq dependent-map dependent-sum hashable + ilist reflex reflex-test-host relude these + ]; + testHaskellDepends = [ + base binary containers deepseq dependent-map dependent-sum hashable + hspec hspec-contrib HUnit ilist reflex reflex-test-host relude + these + ]; + description = "various dynamic containers for Reflex"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "reflex-fsnotify" = callPackage ({ mkDerivation, base, containers, directory, filepath, fsnotify , reflex @@ -205991,6 +206691,24 @@ self: { broken = true; }) {}; + "reflex-test-host" = callPackage + ({ mkDerivation, base, dependent-sum, hspec, hspec-contrib, HUnit + , ref-tf, reflex, these + }: + mkDerivation { + pname = "reflex-test-host"; + version = "0.1.0.0"; + sha256 = "0yg1lg68xr5rs8l68i0znj5zp0z6rq7b515sfz3qvnmyv7qah946"; + libraryHaskellDepends = [ base dependent-sum ref-tf reflex these ]; + testHaskellDepends = [ + base dependent-sum hspec hspec-contrib HUnit ref-tf reflex these + ]; + description = "reflex host methods for testing without external events"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "reflex-transformers" = callPackage ({ mkDerivation, base, containers, lens, mtl, reflex, semigroups , stateWriter, transformers @@ -208935,22 +209653,6 @@ self: { }) {}; "resourcet" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec, mtl - , primitive, transformers, unliftio-core - }: - mkDerivation { - pname = "resourcet"; - version = "1.2.3"; - sha256 = "1ig7a22i5hn0ya7d4bg3xq0yy9mqgwawx4sv88db0fvdsnzg868s"; - libraryHaskellDepends = [ - base containers exceptions mtl primitive transformers unliftio-core - ]; - testHaskellDepends = [ base exceptions hspec transformers ]; - description = "Deterministic allocation and freeing of scarce resources"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "resourcet_1_2_4" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, mtl , primitive, transformers, unliftio-core }: @@ -208964,7 +209666,6 @@ self: { testHaskellDepends = [ base exceptions hspec transformers ]; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "respond" = callPackage @@ -209430,8 +210131,8 @@ self: { }: mkDerivation { pname = "retry"; - version = "0.8.1.1"; - sha256 = "0bvy7wh1x5r8c12rwcyf3ca0spw2bc82v42c7by0w053zfi3i4w9"; + version = "0.8.1.2"; + sha256 = "0nwyis42xpmxfw8nz8qn59r3v7q0dkfzkzkhllgn30cdjbbmwhf5"; libraryHaskellDepends = [ base exceptions ghc-prim random transformers ]; @@ -210317,6 +211018,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rio_0_1_15_1" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, hashable, hspec, microlens, mtl, primitive + , process, QuickCheck, text, time, typed-process, unix, unliftio + , unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "rio"; + version = "0.1.15.1"; + sha256 = "05mkxjwy9vp6ldzj5wci1frd2chvbg3l4vw1q8bpjdsj8svr2g5i"; + libraryHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable microlens mtl primitive process text time typed-process + unix unliftio unliftio-core unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable hspec microlens mtl primitive process QuickCheck text time + typed-process unix unliftio unliftio-core unordered-containers + vector + ]; + description = "A standard library for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rio-orphans" = callPackage ({ mkDerivation, base, exceptions, fast-logger, hspec , monad-control, monad-logger, resourcet, rio, transformers-base @@ -213066,18 +213793,18 @@ self: { "sak" = callPackage ({ mkDerivation, base, brotli, bytestring, bz2, cpphs, directory - , filepath, lz4-hs, lzlib, lzma, optparse-applicative, parallel-io - , snappy-lazy, zlib, zstd + , filepath, lz4-hs, lzlib, lzma, lzo, optparse-applicative + , parallel-io, snappy-lazy, zlib, zstd }: mkDerivation { pname = "sak"; - version = "0.1.2.4"; - sha256 = "0gj0w8c4j43586k474ncjk4ldgjx5rbw36g5lacbn13lf3fid2ck"; + version = "0.1.2.5"; + sha256 = "1xz3g7ksq1v8239xq2cddprlq4g8imid002w7wak15kv8aqvil1l"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base brotli bytestring bz2 directory filepath lz4-hs lzlib lzma + base brotli bytestring bz2 directory filepath lz4-hs lzlib lzma lzo optparse-applicative parallel-io snappy-lazy zlib zstd ]; executableToolDepends = [ cpphs ]; @@ -214063,22 +214790,6 @@ self: { }) {}; "scalpel" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, data-default - , http-client, http-client-tls, scalpel-core, tagsoup, text - }: - mkDerivation { - pname = "scalpel"; - version = "0.6.1"; - sha256 = "0cq9zslaqcs1vq85xznc11vis5bkvmhjsnwxrc2p01bsxbvwxsh6"; - libraryHaskellDepends = [ - base bytestring case-insensitive data-default http-client - http-client-tls scalpel-core tagsoup text - ]; - description = "A high level web scraping library for Haskell"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "scalpel_0_6_2" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, data-default , http-client, http-client-tls, scalpel-core, tagsoup, text }: @@ -214092,29 +214803,9 @@ self: { ]; description = "A high level web scraping library for Haskell"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scalpel-core" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion - , data-default, fail, HUnit, pointedlist, regex-base, regex-tdfa - , tagsoup, text, vector - }: - mkDerivation { - pname = "scalpel-core"; - version = "0.6.1"; - sha256 = "199g005ps5grjj3y7mxajck3ybyc60fs72p8jk859ji3svpqdfyn"; - libraryHaskellDepends = [ - base bytestring containers data-default fail pointedlist regex-base - regex-tdfa tagsoup text vector - ]; - testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ]; - benchmarkHaskellDepends = [ base criterion tagsoup text ]; - description = "A high level web scraping library for Haskell"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "scalpel-core_0_6_2" = callPackage ({ mkDerivation, base, bytestring, containers, criterion , data-default, fail, HUnit, mtl, pointedlist, regex-base , regex-tdfa, tagsoup, text, transformers, vector @@ -214131,7 +214822,6 @@ self: { benchmarkHaskellDepends = [ base criterion tagsoup text ]; description = "A high level web scraping library for Haskell"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scan" = callPackage @@ -214432,12 +215122,12 @@ self: { ({ mkDerivation, aeson, aeson-pretty, base, bifunctors, bytestring , free, generic-lens, generics-sop, hashable, hspec, lens , lens-aeson, mtl, pretty-simple, profunctors, QuickCheck - , scientific, text, transformers, unordered-containers, vector + , scientific, syb, text, transformers, unordered-containers, vector }: mkDerivation { pname = "schemas"; - version = "0.4.0.1"; - sha256 = "13i7q7krahvmirb6ryqsygcckmjdkmnk8qxh1pxsnihkkn6dj22k"; + version = "0.4.0.2"; + sha256 = "0b05xjkpwx4a9hwxjaxk28v47d4c3xyy7wagc5nblqppxpvb9zqr"; libraryHaskellDepends = [ aeson base bifunctors bytestring free generics-sop hashable lens lens-aeson mtl profunctors scientific text transformers @@ -214445,7 +215135,7 @@ self: { ]; testHaskellDepends = [ aeson aeson-pretty base bytestring generic-lens generics-sop hspec - lens mtl pretty-simple QuickCheck text transformers + lens mtl pretty-simple QuickCheck syb text transformers unordered-containers ]; description = "schema guided serialization"; @@ -214713,18 +215403,21 @@ self: { }) {}; "scientific-notation" = callPackage - ({ mkDerivation, aeson, attoparsec, base, byteslice, bytesmith - , bytestring, gauge, primitive, QuickCheck, run-st, scientific - , tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, aeson, attoparsec, base, bytebuild, byteslice + , bytesmith, bytestring, gauge, natural-arithmetic, primitive + , QuickCheck, run-st, scientific, tasty, tasty-hunit + , tasty-quickcheck }: mkDerivation { pname = "scientific-notation"; - version = "0.1.1.0"; - sha256 = "1s0iyj6dn0nbn8s31b5wwwlyfx5jcnwa3i9gp45idcwfsz5hmdvq"; - libraryHaskellDepends = [ base bytesmith ]; + version = "0.1.2.0"; + sha256 = "19yfg032ppiy70y28fbildxp4h6y4krs9ayh7a8sdbxibpqb82cx"; + libraryHaskellDepends = [ + base bytebuild bytesmith natural-arithmetic + ]; testHaskellDepends = [ - base byteslice bytesmith bytestring primitive QuickCheck tasty - tasty-hunit tasty-quickcheck + base bytebuild byteslice bytesmith bytestring primitive QuickCheck + tasty tasty-hunit tasty-quickcheck ]; benchmarkHaskellDepends = [ aeson attoparsec base byteslice bytesmith bytestring gauge @@ -220197,33 +220890,6 @@ self: { }) {}; "serverless-haskell" = callPackage - ({ mkDerivation, aeson, aeson-casing, amazonka-core - , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive - , hspec, hspec-discover, http-types, iproute, lens, network - , network-simple, raw-strings-qq, text, time, unix - , unordered-containers - }: - mkDerivation { - pname = "serverless-haskell"; - version = "0.10.2"; - sha256 = "1iy69394dqv38dlh71m8sarcfps9gaaq90zpc4f169vnhpr59wak"; - libraryHaskellDepends = [ - aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base - bytestring case-insensitive http-types iproute lens network - network-simple text time unix unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base - bytestring case-insensitive hspec hspec-discover http-types iproute - lens network network-simple raw-strings-qq text time unix - unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "Deploying Haskell code onto AWS Lambda using Serverless"; - license = stdenv.lib.licenses.mit; - }) {}; - - "serverless-haskell_0_10_5" = callPackage ({ mkDerivation, aeson, aeson-casing, amazonka-core , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive , hspec, hspec-discover, http-types, iproute, lens, network @@ -220248,7 +220914,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Deploying Haskell code onto AWS Lambda using Serverless"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serversession" = callPackage @@ -221495,6 +222160,39 @@ self: { broken = true; }) {}; + "shakebook" = callPackage + ({ mkDerivation, aeson, base, comonad, comonad-extras, doctemplates + , extra, feed, free, lens, lens-aeson, optparse-applicative, pandoc + , pandoc-types, relude, rio, shake, slick, split, tasty + , tasty-golden, text-time + }: + mkDerivation { + pname = "shakebook"; + version = "0.2.0.4"; + sha256 = "1h36pm81fwzsyjannsbxc27h03mb5k47byq1xc23gfj5i1gs1vhv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base comonad comonad-extras doctemplates extra feed free lens + lens-aeson pandoc pandoc-types relude rio shake slick split + text-time + ]; + executableHaskellDepends = [ + aeson base comonad comonad-extras doctemplates extra feed free lens + lens-aeson optparse-applicative pandoc pandoc-types relude rio + shake slick split text-time + ]; + testHaskellDepends = [ + aeson base comonad comonad-extras doctemplates extra feed free lens + lens-aeson pandoc pandoc-types relude rio shake slick split tasty + tasty-golden text-time + ]; + description = "Shake-based technical documentation generator; HTML & PDF"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "shaker" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, ghc, ghc-paths, haskeline, haskell-src, HUnit, mtl @@ -222714,7 +223412,7 @@ self: { version = "0.1.0.1"; sha256 = "19zjwzh3i8ql5xz9rvmbz7n2l3z7dcq683ikrpvqx3wxnc06058m"; libraryHaskellDepends = [ base ]; - description = "Sieve is an implementation of the Sieve abstract data type"; + description = "Sieve is an implementation of the Sieve abstract data type."; license = stdenv.lib.licenses.gpl2; }) {}; @@ -223003,6 +223701,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-affine-space_0_1_1" = callPackage + ({ mkDerivation, base, deepseq, directory, filepath, hlint, process + , regex-posix + }: + mkDerivation { + pname = "simple-affine-space"; + version = "0.1.1"; + sha256 = "172yn8kispqbn6zrdn610mh3l728ffb6lwa1zk5qgwm0lfpx3849"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + base directory filepath hlint process regex-posix + ]; + description = "A simple library for affine and vector spaces"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-atom" = callPackage ({ mkDerivation, base, containers, deepseq }: mkDerivation { @@ -225201,18 +225916,6 @@ self: { }) {}; "slist" = callPackage - ({ mkDerivation, base, doctest, Glob }: - mkDerivation { - pname = "slist"; - version = "0.1.0.0"; - sha256 = "0yvcy8v9qpg517njy3sr5vqr4jgpynii7lw8gqh9pwjk40q628wf"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest Glob ]; - description = "Sized list"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "slist_0_1_1_0" = callPackage ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "slist"; @@ -225222,7 +225925,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Sized list"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sloane" = callPackage @@ -225333,29 +226035,26 @@ self: { }) {}; "slynx" = callPackage - ({ mkDerivation, async, base, bytestring, containers - , data-memocombinators, elynx-seq, elynx-tools, elynx-tree, hmatrix - , integration, math-functions, matrices, megaparsec, monad-logger - , mwc-random, optparse-applicative, parallel, primitive, statistics - , text, transformers, vector, vector-th-unbox, word8 + ({ mkDerivation, async, base, bytestring, containers, elynx-markov + , elynx-seq, elynx-tools, elynx-tree, hmatrix, megaparsec + , monad-logger, mwc-random, optparse-applicative, scientific, text + , transformers, vector }: mkDerivation { pname = "slynx"; - version = "0.1.0"; - sha256 = "0bxdjwwxzpl437a2fzjb8vazbsz16jk2szxhbr63y12hckgjpzrj"; + version = "0.2.2"; + sha256 = "0jja57dcalxd1qp7fj338jwbpaxm1l3ika2zyd9rv3dk2k1xn6rj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base bytestring containers data-memocombinators elynx-seq - elynx-tools elynx-tree hmatrix integration math-functions matrices - megaparsec monad-logger mwc-random optparse-applicative parallel - primitive statistics text transformers vector vector-th-unbox word8 + async base bytestring containers elynx-markov elynx-seq elynx-tools + elynx-tree hmatrix megaparsec monad-logger mwc-random + optparse-applicative scientific text transformers vector ]; executableHaskellDepends = [ - async base bytestring containers data-memocombinators elynx-seq - elynx-tools hmatrix integration math-functions matrices megaparsec - monad-logger mwc-random optparse-applicative parallel primitive - statistics text transformers vector vector-th-unbox word8 + async base bytestring containers elynx-seq elynx-tools hmatrix + megaparsec monad-logger mwc-random optparse-applicative scientific + text transformers vector ]; description = "Handle molecular sequences"; license = stdenv.lib.licenses.gpl3; @@ -228375,22 +229074,22 @@ self: { }) {}; "souffle-haskell" = callPackage - ({ mkDerivation, base, deepseq, directory, filepath, free, hspec - , mtl, process, souffle, template-haskell, temporary, text + ({ mkDerivation, base, deepseq, directory, filepath, hspec, mtl + , process, souffle, template-haskell, temporary, text , type-errors-pretty, vector }: mkDerivation { pname = "souffle-haskell"; - version = "0.2.0"; - sha256 = "0c67z5wrfi3pp5fyvl8k4j1r8h7ziy6hj5zrwrpf550p3a04chrm"; + version = "0.2.2"; + sha256 = "1835yq0prh42x9yakfx963hv1lzkhizz02ba344z099rx4fx9fji"; libraryHaskellDepends = [ - base deepseq directory filepath free mtl process template-haskell + base deepseq directory filepath mtl process template-haskell temporary text type-errors-pretty vector ]; libraryToolDepends = [ souffle ]; testHaskellDepends = [ - base deepseq directory filepath free hspec mtl process - template-haskell temporary text type-errors-pretty vector + base deepseq directory filepath hspec mtl process template-haskell + temporary text type-errors-pretty vector ]; testToolDepends = [ souffle ]; description = "Souffle Datalog bindings for Haskell"; @@ -229042,7 +229741,7 @@ self: { aeson base blaze-markup bytestring cereal deepseq hashable mwc-random path-pieces primitive safecopy text uuid ]; - description = "Simple data types that help me here and there"; + description = "Simple data types that help me here and there."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -229116,8 +229815,8 @@ self: { }: mkDerivation { pname = "spectral-clustering"; - version = "0.3.1.3"; - sha256 = "0izf0lvk989y4d04240hbnsr5lc5lbl9200c5km0p72lv1v07mgf"; + version = "0.3.2.1"; + sha256 = "1n6yd2is628wsrfj149cdr8k06anncbk92d39r1w4dmsmdp7hchk"; libraryHaskellDepends = [ base clustering containers hmatrix hmatrix-svdlibc mwc-random safe sparse-linear-algebra statistics vector @@ -230652,28 +231351,27 @@ self: { "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array , async, attoparsec, base, base64-bytestring, bytestring, Cabal - , colour, conduit, conduit-extra, containers, cryptonite - , cryptonite-conduit, deepseq, directory, echo, exceptions, extra - , file-embed, filelock, filepath, fsnotify, generic-deriving - , hackage-security, hashable, hi-file-parser, hpack, hpc, hspec - , http-client, http-client-tls, http-conduit, http-download - , http-types, memory, microlens, mintty, mono-traversable, mtl - , mustache, neat-interpolation, network-uri, open-browser - , optparse-applicative, pantry, path, path-io, persistent - , persistent-sqlite, persistent-template, pretty, primitive - , process, project-template, QuickCheck, raw-strings-qq - , regex-applicative-text, resource-pool, resourcet, retry, rio - , rio-prettyprint, semigroups, smallcheck, split, stm - , streaming-commons, tar, template-haskell, temporary - , terminal-size, text, text-metrics, th-reify-many, time, tls + , casa-client, casa-types, colour, conduit, conduit-extra + , containers, cryptonite, cryptonite-conduit, deepseq, directory + , echo, exceptions, extra, file-embed, filelock, filepath, fsnotify + , generic-deriving, hackage-security, hashable, hi-file-parser + , hpack, hpc, hspec, http-client, http-client-tls, http-conduit + , http-download, http-types, memory, microlens, mintty + , mono-traversable, mtl, mustache, neat-interpolation, network-uri + , open-browser, optparse-applicative, pantry, path, path-io + , persistent, persistent-sqlite, persistent-template, pretty + , primitive, process, project-template, QuickCheck, raw-strings-qq + , regex-applicative-text, retry, rio, rio-prettyprint, semigroups + , smallcheck, split, stm, streaming-commons, tar, template-haskell + , temporary, text, text-metrics, th-reify-many, time, tls , transformers, typed-process, unicode-transforms, unix , unix-compat, unliftio, unordered-containers, vector, yaml , zip-archive, zlib }: mkDerivation { pname = "stack"; - version = "2.1.3.1"; - sha256 = "1q2nagnc24fvyj3hwnpgyp3rqhxswhscyw4pw2dazqx34ad3d0zr"; + version = "2.3.1"; + sha256 = "1l17jdkr6ca3hwm4v8bshq2zbadqhb35hk2gfjy2dri1mdibcsdr"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -230683,55 +231381,53 @@ self: { setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal array async attoparsec base - base64-bytestring bytestring Cabal colour conduit conduit-extra - containers cryptonite cryptonite-conduit deepseq directory echo - exceptions extra file-embed filelock filepath fsnotify - generic-deriving hackage-security hashable hi-file-parser hpack hpc - http-client http-client-tls http-conduit http-download http-types - memory microlens mintty mono-traversable mtl mustache - neat-interpolation network-uri open-browser optparse-applicative - pantry path path-io persistent persistent-sqlite - persistent-template pretty primitive process project-template - regex-applicative-text resource-pool resourcet retry rio - rio-prettyprint semigroups split stm streaming-commons tar - template-haskell temporary terminal-size text text-metrics - th-reify-many time tls transformers typed-process - unicode-transforms unix unix-compat unliftio unordered-containers - vector yaml zip-archive zlib + base64-bytestring bytestring Cabal casa-client casa-types colour + conduit conduit-extra containers cryptonite cryptonite-conduit + deepseq directory echo exceptions extra file-embed filelock + filepath fsnotify generic-deriving hackage-security hashable + hi-file-parser hpack hpc http-client http-client-tls http-conduit + http-download http-types memory microlens mintty mono-traversable + mtl mustache neat-interpolation network-uri open-browser + optparse-applicative pantry path path-io persistent + persistent-sqlite persistent-template pretty primitive process + project-template regex-applicative-text retry rio rio-prettyprint + semigroups split stm streaming-commons tar template-haskell + temporary text text-metrics th-reify-many time tls transformers + typed-process unicode-transforms unix unix-compat unliftio + unordered-containers vector yaml zip-archive zlib ]; executableHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal array async attoparsec base - base64-bytestring bytestring Cabal colour conduit conduit-extra - containers cryptonite cryptonite-conduit deepseq directory echo - exceptions extra file-embed filelock filepath fsnotify - generic-deriving hackage-security hashable hi-file-parser hpack hpc - http-client http-client-tls http-conduit http-download http-types - memory microlens mintty mono-traversable mtl mustache - neat-interpolation network-uri open-browser optparse-applicative - pantry path path-io persistent persistent-sqlite - persistent-template pretty primitive process project-template - regex-applicative-text resource-pool resourcet retry rio - rio-prettyprint semigroups split stm streaming-commons tar - template-haskell temporary terminal-size text text-metrics - th-reify-many time tls transformers typed-process - unicode-transforms unix unix-compat unliftio unordered-containers - vector yaml zip-archive zlib + base64-bytestring bytestring Cabal casa-client casa-types colour + conduit conduit-extra containers cryptonite cryptonite-conduit + deepseq directory echo exceptions extra file-embed filelock + filepath fsnotify generic-deriving hackage-security hashable + hi-file-parser hpack hpc http-client http-client-tls http-conduit + http-download http-types memory microlens mintty mono-traversable + mtl mustache neat-interpolation network-uri open-browser + optparse-applicative pantry path path-io persistent + persistent-sqlite persistent-template pretty primitive process + project-template regex-applicative-text retry rio rio-prettyprint + semigroups split stm streaming-commons tar template-haskell + temporary text text-metrics th-reify-many time tls transformers + typed-process unicode-transforms unix unix-compat unliftio + unordered-containers vector yaml zip-archive zlib ]; testHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal array async attoparsec base - base64-bytestring bytestring Cabal colour conduit conduit-extra - containers cryptonite cryptonite-conduit deepseq directory echo - exceptions extra file-embed filelock filepath fsnotify - generic-deriving hackage-security hashable hi-file-parser hpack hpc - hspec http-client http-client-tls http-conduit http-download - http-types memory microlens mintty mono-traversable mtl mustache - neat-interpolation network-uri open-browser optparse-applicative - pantry path path-io persistent persistent-sqlite - persistent-template pretty primitive process project-template - QuickCheck raw-strings-qq regex-applicative-text resource-pool - resourcet retry rio rio-prettyprint semigroups smallcheck split stm - streaming-commons tar template-haskell temporary terminal-size text - text-metrics th-reify-many time tls transformers typed-process + base64-bytestring bytestring Cabal casa-client casa-types colour + conduit conduit-extra containers cryptonite cryptonite-conduit + deepseq directory echo exceptions extra file-embed filelock + filepath fsnotify generic-deriving hackage-security hashable + hi-file-parser hpack hpc hspec http-client http-client-tls + http-conduit http-download http-types memory microlens mintty + mono-traversable mtl mustache neat-interpolation network-uri + open-browser optparse-applicative pantry path path-io persistent + persistent-sqlite persistent-template pretty primitive process + project-template QuickCheck raw-strings-qq regex-applicative-text + retry rio rio-prettyprint semigroups smallcheck split stm + streaming-commons tar template-haskell temporary text text-metrics + th-reify-many time tls transformers typed-process unicode-transforms unix unix-compat unliftio unordered-containers vector yaml zip-archive zlib ]; @@ -232160,8 +232856,8 @@ self: { }: mkDerivation { pname = "staversion"; - version = "0.2.3.4"; - sha256 = "0b3hkk6m2wpcyj1zkl3az4v2m9cb7djxk7iz00rxz5j13ngxgfci"; + version = "0.2.3.5"; + sha256 = "1jm6cyql0zinw1bfs30986jpmb7ws4jmzfyxwmdfkdcz73bf1867"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -233577,7 +234273,7 @@ self: { base containers directory doctest filepath streaming streaming-commons tasty tasty-hunit ]; - description = "A resource management decorator for \"streaming\""; + description = "A resource management decorator for \"streaming\"."; license = stdenv.lib.licenses.mit; }) {}; @@ -233986,35 +234682,6 @@ self: { }) {}; "streamly" = callPackage - ({ mkDerivation, atomic-primops, base, containers, deepseq - , directory, exceptions, fusion-plugin-types, gauge, ghc, ghc-prim - , heaps, hspec, lockfree-queue, monad-control, mtl, network - , primitive, QuickCheck, random, transformers, transformers-base - , typed-process - }: - mkDerivation { - pname = "streamly"; - version = "0.7.1"; - sha256 = "0jzs2jaznjqrnzwqnjyg0zxggsrid3q8r5v4cnlzvkcn053yam3m"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - atomic-primops base containers deepseq directory exceptions - fusion-plugin-types ghc-prim heaps lockfree-queue monad-control mtl - network primitive transformers transformers-base - ]; - testHaskellDepends = [ - base containers exceptions ghc hspec mtl QuickCheck random - transformers - ]; - benchmarkHaskellDepends = [ - base deepseq gauge mtl random typed-process - ]; - description = "Beautiful Streaming, Concurrent and Reactive Composition"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "streamly_0_7_2" = callPackage ({ mkDerivation, atomic-primops, base, containers, deepseq , directory, exceptions, fusion-plugin-types, ghc, ghc-prim, heaps , hspec, lockfree-queue, monad-control, mtl, network, primitive @@ -234037,7 +234704,6 @@ self: { ]; description = "Beautiful Streaming, Concurrent and Reactive Composition"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streamly-bytestring" = callPackage @@ -234496,7 +235162,7 @@ self: { "string-interpolate" = callPackage ({ mkDerivation, base, bytestring, criterion, formatting - , haskell-src-meta, hspec, interpolate, interpolatedstring-perl6 + , haskell-src-exts, haskell-src-meta, hspec, interpolate , neat-interpolation, QuickCheck, quickcheck-instances , quickcheck-text, quickcheck-unicode, random-shuffle , template-haskell, text, text-conversions, unordered-containers @@ -234504,11 +235170,11 @@ self: { }: mkDerivation { pname = "string-interpolate"; - version = "0.2.0.1"; - sha256 = "08izbllwik00iaxmakr5dhm2x0nsc1n5q2naa10awr2vz391x6v4"; + version = "0.2.0.3"; + sha256 = "0xmanjs8sgk3cm6f25wbpxsmzpgznf73pvviw0ig71mn2y2kx6bi"; libraryHaskellDepends = [ - base bytestring haskell-src-meta template-haskell text - text-conversions utf8-string + base bytestring haskell-src-exts haskell-src-meta template-haskell + text text-conversions utf8-string ]; testHaskellDepends = [ base bytestring hspec QuickCheck quickcheck-instances @@ -234516,8 +235182,8 @@ self: { unordered-containers ]; benchmarkHaskellDepends = [ - base bytestring criterion formatting interpolate - interpolatedstring-perl6 neat-interpolation QuickCheck text + base bytestring criterion formatting interpolate neat-interpolation + QuickCheck text ]; description = "Haskell string/text/bytestring interpolation that just works"; license = stdenv.lib.licenses.bsd3; @@ -234792,17 +235458,6 @@ self: { }) {}; "stripe-concepts" = callPackage - ({ mkDerivation, base, bytestring, text }: - mkDerivation { - pname = "stripe-concepts"; - version = "1.0.2.0"; - sha256 = "0a8p4pm8v83kcgxm3jpmpl4811pdjjn2rmdl0mkq649rfnm3cg2k"; - libraryHaskellDepends = [ base bytestring text ]; - description = "Types for the Stripe API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "stripe-concepts_1_0_2_2" = callPackage ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "stripe-concepts"; @@ -234811,7 +235466,6 @@ self: { libraryHaskellDepends = [ base bytestring text ]; description = "Types for the Stripe API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stripe-core" = callPackage @@ -234905,23 +235559,6 @@ self: { }) {}; "stripe-signature" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite - , memory, stripe-concepts, text - }: - mkDerivation { - pname = "stripe-signature"; - version = "1.0.0.1"; - sha256 = "1l5gw1lv63mpi8f2z70wv4b5809ljsi2zzdgj2mwc2zrdqfnharn"; - libraryHaskellDepends = [ - base base16-bytestring bytestring cryptonite memory stripe-concepts - text - ]; - testHaskellDepends = [ base bytestring text ]; - description = "Verification of Stripe webhook signatures"; - license = stdenv.lib.licenses.mit; - }) {}; - - "stripe-signature_1_0_0_2" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite , memory, stripe-concepts, text }: @@ -234936,7 +235573,6 @@ self: { testHaskellDepends = [ base bytestring text ]; description = "Verification of Stripe webhook signatures"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stripe-tests" = callPackage @@ -236269,10 +236905,8 @@ self: { }: mkDerivation { pname = "sv"; - version = "1.4"; - sha256 = "02ymnnknfppx59b922y62grkmarwsyy77iv6bmyp2bzm8vbvnvd5"; - revision = "2"; - editedCabalFile = "0kacp654mmj9h038mrxnq69ln5ipbbp2ifvyzqixgjask2bf9f41"; + version = "1.4.0.1"; + sha256 = "1ak58rqg9f8xh43sgflcqnvpc62580y3ip1sxdg9w2scr8fqc6y2"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring contravariant hw-dsv semigroupoids sv-core transformers utf8-string validation @@ -236324,8 +236958,8 @@ self: { pname = "sv-core"; version = "0.5"; sha256 = "1x5gmv2pbn3hx1dhpkigivjkbg6n6xy7lc36wmccsw2qqn9r5qxa"; - revision = "2"; - editedCabalFile = "066kpnyvpzl6bvc11ng6xq4mdd84lxjiif83i265mkjc8hq21xd4"; + revision = "3"; + editedCabalFile = "0z077qfw5v6ar1jmlfgzjjj35zqpc77xzjqwihk5v5h6hifanp9d"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant deepseq double-conversion lens mtl parsec profunctors readable @@ -236348,8 +236982,8 @@ self: { pname = "sv-svfactor"; version = "0.2"; sha256 = "1fjgryypq6i4r3w9zdb282aq5lqp4577mzzycafklphc0d2ancgb"; - revision = "2"; - editedCabalFile = "1igmg66d7zs8pcia4j7nhr7iivnbanqz34wcpfx967823vc2whpw"; + revision = "3"; + editedCabalFile = "1qvpbc5qhljmfaxlbfjddiq51dymd9zlp66ya99sypb0anydc5n2"; libraryHaskellDepends = [ base bytestring lens profunctors sv-core svfactor validation ]; @@ -236787,7 +237421,7 @@ self: { base containers hashable HUnit network-uri old-locale semigroups test-framework test-framework-hunit text time ]; - description = "A semantic web toolkit"; + description = "A semantic web toolkit."; license = stdenv.lib.licenses.lgpl21; }) {}; @@ -238353,7 +238987,7 @@ self: { libraryHaskellDepends = [ base containers ghc-prim mtl Takusen template-haskell time ]; - description = "Transito Abierto: convenience library when using Takusen and Oracle"; + description = "Transito Abierto: convenience library when using Takusen and Oracle."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -239612,8 +240246,8 @@ self: { }: mkDerivation { pname = "taskwarrior"; - version = "0.2.0.0"; - sha256 = "1sljpsafyh2kxga7p9dz0nsvqlsmbd399xlgmncnyfh0z9cii7pw"; + version = "0.2.1.0"; + sha256 = "1ladijvlvr6w35y1qlxbp0y34bby58a9bfyhqiynn0s4m5bj55c6"; libraryHaskellDepends = [ aeson base bytestring process random text time unordered-containers uuid @@ -239773,6 +240407,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-golden_2_3_3_2" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, mtl, optparse-applicative, process, tagged + , tasty, tasty-hunit, temporary, text + }: + mkDerivation { + pname = "tasty-golden"; + version = "2.3.3.2"; + sha256 = "19dif84p71hks8czmaff6nlylsz34bqy0nki7mclr4ysawz1hdm9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers deepseq directory filepath mtl + optparse-applicative process tagged tasty temporary text + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary + ]; + description = "Golden tests support for tasty"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-groundhog-converters" = callPackage ({ mkDerivation, aeson, base, bimap, bytestring, containers , groundhog, groundhog-converters, groundhog-sqlite, groundhog-th @@ -239957,6 +240614,21 @@ self: { broken = true; }) {}; + "tasty-json" = callPackage + ({ mkDerivation, base, bytestring, containers, stm, tagged, tasty + , text + }: + mkDerivation { + pname = "tasty-json"; + version = "0.1.0.0"; + sha256 = "0k6zzi2w675pghxfv5y6m67n2cv8bb22dq9zgb5yfwycfj3va4bp"; + libraryHaskellDepends = [ + base bytestring containers stm tagged tasty text + ]; + description = "JSON reporter for the tasty testing framework"; + license = stdenv.lib.licenses.mit; + }) {}; + "tasty-kat" = callPackage ({ mkDerivation, base, bytestring, mtl, tasty, tasty-hunit , tasty-quickcheck @@ -240093,6 +240765,8 @@ self: { pname = "tasty-rerun"; version = "1.1.17"; sha256 = "0hiafrknk700gi8rm675akz8q6abk8iwlmygwnlx1fy3znalkqad"; + revision = "1"; + editedCabalFile = "1j08802psflkj3wb5jhh4z5w1i852hw5fm9k5aczbvfx9873zyhc"; libraryHaskellDepends = [ base containers mtl optparse-applicative split stm tagged tasty transformers @@ -240858,8 +241532,8 @@ self: { ({ mkDerivation, base, time }: mkDerivation { pname = "tempi"; - version = "1.0.1.1"; - sha256 = "126j3bph2b7wsn7gvckx7b6sj69djcr57m4yzbdc895mq5zga88j"; + version = "1.0.2.0"; + sha256 = "08hjgs32cx3vcm6sga4xc7ijcj3lbjlg133vkri06xfi0v3hjgnp"; libraryHaskellDepends = [ base time ]; description = "For representing musical tempi"; license = stdenv.lib.licenses.bsd3; @@ -241826,22 +242500,24 @@ self: { "tesla" = callPackage ({ mkDerivation, aeson, base, bytestring, casing, containers - , generic-deriving, HUnit, lens, lens-aeson, mtl, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, text, time - , vector, wreq + , exceptions, generic-deriving, HUnit, lens, lens-aeson + , monad-logger, mtl, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, text, time, unliftio-core, vector, wreq }: mkDerivation { pname = "tesla"; - version = "0.1.0.1"; - sha256 = "0rk1i9pl6x6f58hbij287aaab7ac3iy3ngs2bqb2990zqfh12ir4"; + version = "0.2.0.0"; + sha256 = "0gpzkrh5238n42h158np1k14a28y11kgicwbv6w4br6h0rnbr9d3"; libraryHaskellDepends = [ - aeson base bytestring casing containers generic-deriving lens - lens-aeson mtl template-haskell text time vector wreq + aeson base bytestring casing containers exceptions generic-deriving + lens lens-aeson monad-logger mtl template-haskell text time + unliftio-core vector wreq ]; testHaskellDepends = [ - aeson base bytestring casing containers generic-deriving HUnit lens - lens-aeson mtl tasty tasty-hunit tasty-quickcheck template-haskell - text time vector wreq + aeson base bytestring casing containers exceptions generic-deriving + HUnit lens lens-aeson monad-logger mtl tasty tasty-hunit + tasty-quickcheck template-haskell text time unliftio-core vector + wreq ]; description = "Tesla API client"; license = stdenv.lib.licenses.bsd3; @@ -242536,28 +243212,6 @@ self: { }) {}; "texmath" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, pandoc-types, parsec, process, syb, temporary, text - , utf8-string, xml - }: - mkDerivation { - pname = "texmath"; - version = "0.12.0.1"; - sha256 = "1halp1vn2334ym3j3fxfbrpkr15nc201c7vfwmzimya6vnyknsxs"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec syb text xml - ]; - testHaskellDepends = [ - base bytestring directory filepath process temporary text - utf8-string xml - ]; - description = "Conversion between formats used to represent mathematics"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "texmath_0_12_0_2" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pandoc-types, parsec, process, syb, temporary, text , utf8-string, xml @@ -242577,7 +243231,6 @@ self: { ]; description = "Conversion between formats used to represent mathematics"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "texrunner" = callPackage @@ -246591,7 +247244,7 @@ self: { sha256 = "1snw5cdkyqyninqqqwa6qfndfmwfr4lkdg0v94267g7xbwcqjj8h"; libraryHaskellDepends = [ base containers network-uri text ]; testHaskellDepends = [ base HUnit network-uri text ]; - description = "This project separates subdomains, domains, and top-level-domains from URLs"; + description = "This project separates subdomains, domains, and top-level-domains from URLs."; license = stdenv.lib.licenses.mit; }) {}; @@ -246703,29 +247356,29 @@ self: { }) {}; "tlynx" = callPackage - ({ mkDerivation, array, base, bytestring, containers, elynx-seq - , elynx-tools, elynx-tree, lifted-async, math-functions, megaparsec - , monad-logger, MonadRandom, mwc-random, optparse-applicative - , parallel, primitive, QuickCheck, quickcheck-instances, statistics - , text, transformers, vector + ({ mkDerivation, aeson, array, base, bytestring, comonad + , containers, elynx-tools, elynx-tree, gnuplot, lifted-async + , megaparsec, monad-logger, mwc-random, optparse-applicative + , parallel, primitive, scientific, statistics, text, transformers + , vector }: mkDerivation { pname = "tlynx"; - version = "0.1.0"; - sha256 = "0l4i4hyyw0m8kj2fqy4arcfyn9vnl4zdsbicz191hlc1nx935byn"; + version = "0.2.2"; + sha256 = "0hf70zvcndjmlwbd2n2ncbl89xi2xmkr7ymq48hmdlg3vp0bdz62"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base bytestring containers elynx-seq elynx-tools elynx-tree - lifted-async math-functions megaparsec monad-logger MonadRandom - mwc-random optparse-applicative parallel primitive QuickCheck - quickcheck-instances statistics text transformers vector + aeson array base bytestring comonad containers elynx-tools + elynx-tree gnuplot lifted-async megaparsec monad-logger mwc-random + optparse-applicative parallel primitive scientific statistics text + transformers vector ]; executableHaskellDepends = [ - array base bytestring containers elynx-tools elynx-tree - lifted-async math-functions megaparsec monad-logger MonadRandom - mwc-random optparse-applicative parallel primitive QuickCheck - quickcheck-instances statistics text transformers vector + aeson array base bytestring comonad containers elynx-tools gnuplot + lifted-async megaparsec monad-logger mwc-random + optparse-applicative parallel primitive scientific statistics text + transformers vector ]; description = "Handle phylogenetic trees"; license = stdenv.lib.licenses.gpl3; @@ -250592,7 +251245,7 @@ self: { libraryHaskellDepends = [ base twentefp-eventloop-graphics twentefp-number ]; - description = "RoseTree type and show functions for lab assignment of University of Twente"; + description = "RoseTree type and show functions for lab assignment of University of Twente."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -250916,31 +251569,28 @@ self: { "twitter-conduit" = callPackage ({ mkDerivation, aeson, attoparsec, authenticate-oauth, base - , bytestring, Cabal, cabal-doctest, case-insensitive, conduit - , conduit-extra, containers, data-default, doctest, exceptions - , hlint, hspec, hspec-discover, http-client, http-conduit - , http-types, lens, lens-aeson, network-uri, resourcet - , template-haskell, text, time, transformers, transformers-base + , bytestring, Cabal, cabal-doctest, conduit, conduit-extra + , containers, data-default, doctest, exceptions, ghc-prim, hlint + , hspec, hspec-discover, http-client, http-conduit, http-types + , lens, lens-aeson, resourcet, text, time, transformers , twitter-types, twitter-types-lens }: mkDerivation { pname = "twitter-conduit"; - version = "0.4.0"; - sha256 = "1i1ppwha497vhbj0z9gdspg9anqsikrix3j9vzpz0pcn9ij5rwrg"; + version = "0.5.0"; + sha256 = "1rh68ll9dv0axql5npvk547ykqbarak3frpwdflblfm3hrfnwfgf"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec authenticate-oauth base bytestring conduit - conduit-extra containers data-default exceptions http-client - http-conduit http-types lens lens-aeson resourcet template-haskell - text time transformers transformers-base twitter-types - twitter-types-lens + conduit-extra containers data-default exceptions ghc-prim + http-client http-conduit http-types lens lens-aeson resourcet text + time transformers twitter-types twitter-types-lens ]; testHaskellDepends = [ - aeson attoparsec authenticate-oauth base bytestring - case-insensitive conduit conduit-extra containers data-default - doctest hlint hspec http-client http-conduit http-types lens - lens-aeson network-uri resourcet template-haskell text time - twitter-types twitter-types-lens + aeson attoparsec authenticate-oauth base bytestring conduit + conduit-extra containers data-default doctest hlint hspec + http-client http-conduit http-types lens lens-aeson resourcet text + time twitter-types twitter-types-lens ]; testToolDepends = [ hspec-discover ]; description = "Twitter API package with conduit interface and Streaming API support"; @@ -251348,18 +251998,6 @@ self: { }) {}; "type-errors-pretty" = callPackage - ({ mkDerivation, base, doctest, Glob }: - mkDerivation { - pname = "type-errors-pretty"; - version = "0.0.1.0"; - sha256 = "1xp72vsmqamgg9k8w7pimy6q3dn73ammg7zda98a0hb4q9pdcrml"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest Glob ]; - description = "Combinators for writing pretty type errors easily"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "type-errors-pretty_0_0_1_1" = callPackage ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "type-errors-pretty"; @@ -251369,7 +252007,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Combinators for writing pretty type errors easily"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-fun" = callPackage @@ -251955,6 +252592,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "typed-encoding" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, doctest + , doctest-discover, QuickCheck, quickcheck-instances, text + }: + mkDerivation { + pname = "typed-encoding"; + version = "0.1.0.0"; + sha256 = "182qw95s60nnicl74hhijj4d9rk5rhpyibxw1awcwhks2a3c89r6"; + libraryHaskellDepends = [ base base64-bytestring bytestring text ]; + testHaskellDepends = [ + base base64-bytestring bytestring doctest doctest-discover + QuickCheck quickcheck-instances text + ]; + description = "Type safe string transformations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "typed-process" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec , process, stm, temporary, transformers, unliftio-core @@ -252146,6 +252800,8 @@ self: { pname = "typelevel-rewrite-rules"; version = "0.1"; sha256 = "1gm3xbsi90dgppwhhhlmq1rwwnx9bxhm7zv9x4yr0952fwxrm8x8"; + revision = "1"; + editedCabalFile = "0wgryhys24671j46s58prbh7agrlxdcbains6qv37kp6xly726nj"; libraryHaskellDepends = [ base ghc ghc-prim ghc-tcplugins-extra term-rewriting transformers ]; @@ -252239,37 +252895,6 @@ self: { }) {}; "typerep-map" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq - , dependent-map, dependent-sum, ghc-prim, ghc-typelits-knownnat - , hedgehog, primitive, QuickCheck, tasty, tasty-discover - , tasty-hedgehog, tasty-hspec, vector - }: - mkDerivation { - pname = "typerep-map"; - version = "0.3.2"; - sha256 = "0s77hj0m9jiqgybccdfl1x88j05fx7grkg16q6kldd1lgqrvrgb0"; - revision = "3"; - editedCabalFile = "032y3parcz7ffmsqichmshczk7zxkg66dciwvr5d7fznqvy3sg1s"; - libraryHaskellDepends = [ - base containers deepseq ghc-prim primitive vector - ]; - testHaskellDepends = [ - base ghc-typelits-knownnat hedgehog QuickCheck tasty tasty-discover - tasty-hedgehog tasty-hspec - ]; - testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ - base criterion deepseq dependent-map dependent-sum - ghc-typelits-knownnat - ]; - doHaddock = false; - description = "Efficient implementation of a dependent map with types as keys"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "typerep-map_0_3_3_0" = callPackage ({ mkDerivation, base, containers, criterion, deepseq , dependent-map, dependent-sum, ghc-prim, ghc-typelits-knownnat , hedgehog, hspec, hspec-hedgehog, primitive, vector @@ -256819,17 +257444,6 @@ self: { }) {}; "validity-containers" = callPackage - ({ mkDerivation, base, containers, validity }: - mkDerivation { - pname = "validity-containers"; - version = "0.5.0.1"; - sha256 = "1rhr3ibxj94gipdqq2ar1qkklpavs2yj53n3qrnfawhs2sih9kpd"; - libraryHaskellDepends = [ base containers validity ]; - description = "Validity instances for containers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity-containers_0_5_0_3" = callPackage ({ mkDerivation, base, containers, validity }: mkDerivation { pname = "validity-containers"; @@ -256838,7 +257452,6 @@ self: { libraryHaskellDepends = [ base containers validity ]; description = "Validity instances for containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-path" = callPackage @@ -258492,7 +259105,7 @@ self: { version = "1.0"; sha256 = "0kzwp58lki3jvx09n6w8rc97idhy947xqik72p2fqjyigkymv04h"; libraryHaskellDepends = [ base mtl ]; - description = "Views allow you to run a State monad on part of a state"; + description = "Views allow you to run a State monad on part of a state."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -265199,7 +265812,7 @@ self: { revision = "1"; editedCabalFile = "1jszf2hdipr9iry6pcdhhk42aglcq6m3zvg9rgmnickfdzd4k71h"; libraryHaskellDepends = [ base containers time vector-space ]; - description = "Pure Haskell PostScript and SVG generation"; + description = "Pure Haskell PostScript and SVG generation."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -266461,8 +267074,8 @@ self: { }: mkDerivation { pname = "xml-conduit-stylist"; - version = "1.2.0.0"; - sha256 = "140ydh4yzafdiksh149jxvbjsd4r7bvfdh620bawqwnnc5dpk01q"; + version = "2.1.0.0"; + sha256 = "0x33v7nc6swnizdmqmf2gxwr9afyrnra5kyywzp34hbawimd4apr"; libraryHaskellDepends = [ base containers css-syntax network-uri stylist text unordered-containers xml-conduit @@ -272411,6 +273024,30 @@ self: { broken = true; }) {}; + "zeolite-lang" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hashable + , mtl, parsec, regex-tdfa, transformers, unix + }: + mkDerivation { + pname = "zeolite-lang"; + version = "0.1.2.9"; + sha256 = "1jyy54cpvcaarsxhglbcq9yjz24l6qfcfkinwj1lngz824mr0qgq"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers directory filepath hashable mtl parsec regex-tdfa + transformers unix + ]; + executableHaskellDepends = [ + base containers directory filepath unix + ]; + testHaskellDepends = [ base directory filepath ]; + doHaddock = false; + description = "Zeolite is a statically-typed, general-purpose programming language"; + license = stdenv.lib.licenses.asl20; + }) {}; + "zephyr" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base , base-compat, boxes, bytestring, containers, directory, filepath @@ -273418,35 +274055,55 @@ self: { }) {}; "zre" = callPackage - ({ mkDerivation, async, attoparsec, base, binary, binary-strict - , bytestring, config-ini, containers, data-default, lifted-async - , monad-control, mtl, network, network-info, network-multicast - , optparse-applicative, process, random, repline, sockaddr, stm + ({ mkDerivation, async, attoparsec, base, binary, bytestring + , config-ini, containers, data-default, directory, filepath + , lifted-async, monad-control, mtl, network, network-bsd + , network-info, network-multicast, optparse-applicative, process + , QuickCheck, quickcheck-instances, random, repline, sockaddr, stm , text, time, transformers-base, uuid, zeromq4-haskell }: mkDerivation { pname = "zre"; - version = "0.1.0.1"; - sha256 = "0ddd7ppx8ivgrcvaj1d74vxjrgly8y5k5yr181dmi0z0jfkkkfx4"; + version = "0.1.0.2"; + sha256 = "09h1vsnm9p4yds8k4k7c5ixn8q6cikwkiw6wxf7srl9bbrwxhj9l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async attoparsec base binary binary-strict bytestring config-ini - containers data-default monad-control mtl network network-info - network-multicast optparse-applicative process random sockaddr stm - text time transformers-base uuid zeromq4-haskell + async attoparsec base binary bytestring config-ini containers + data-default directory filepath monad-control mtl network + network-bsd network-info network-multicast optparse-applicative + process random sockaddr stm text time transformers-base uuid + zeromq4-haskell ]; executableHaskellDepends = [ async base bytestring lifted-async monad-control mtl repline stm time ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring QuickCheck quickcheck-instances uuid + ]; description = "ZRE protocol implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; + "zsdd" = callPackage + ({ mkDerivation, base, containers, hashable, mtl, random + , unordered-containers + }: + mkDerivation { + pname = "zsdd"; + version = "0.1.0.0"; + sha256 = "0r6b1azxbkvnqa1ksw9hrk37cglv1lkhqaq16zkjnigzvgfilw8g"; + libraryHaskellDepends = [ + base containers hashable mtl unordered-containers + ]; + testHaskellDepends = [ base mtl random ]; + description = "Zero-suppressed decision diagrams"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zsh-battery" = callPackage ({ mkDerivation, base, directory, filepath, mtl }: mkDerivation { diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch new file mode 100644 index 0000000000..7ed390d3f2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch @@ -0,0 +1,383 @@ +Only in dbus-1.2.13-new: .codeclimate.yml +diff -ur dbus-1.2.13-old/dbus.cabal dbus-1.2.13-new/dbus.cabal +--- dbus-1.2.13-old/dbus.cabal 2020-04-25 19:29:27.372272952 +0200 ++++ dbus-1.2.13-new/dbus.cabal 2020-04-25 19:26:36.140991920 +0200 +@@ -1,172 +1,180 @@ +-cabal-version: >=1.8 + name: dbus + version: 1.2.13 + license: Apache-2.0 + license-file: license.txt +-maintainer: Andrey Sverdlichenko + author: John Millikin ++maintainer: Andrey Sverdlichenko ++build-type: Simple ++cabal-version: >= 1.8 ++category: Network, Desktop + stability: experimental + homepage: https://github.com/rblaze/haskell-dbus#readme ++ + synopsis: A client library for the D-Bus IPC system. + description: +- D-Bus is a simple, message-based protocol for inter-process +- communication, which allows applications to interact with other parts of +- the machine and the user's session using remote procedure calls. +- . +- D-Bus is a essential part of the modern Linux desktop, where it replaces +- earlier protocols such as CORBA and DCOP. +- . +- This library is an implementation of the D-Bus protocol in Haskell. It +- can be used to add D-Bus support to Haskell applications, without the +- awkward interfaces common to foreign bindings. +- . +- Example: connect to the session bus, and get a list of active names. +- . +- @ +- {-\# LANGUAGE OverloadedStrings \#-} +- . +- import Data.List (sort) +- import DBus +- import DBus.Client +- . +- main = do +- client <- connectSession +- // +- \-- Request a list of connected clients from the bus +- reply <- call_ client (methodCall \"\/org\/freedesktop\/DBus\" \"org.freedesktop.DBus\" \"ListNames\") +- { methodCallDestination = Just \"org.freedesktop.DBus\" +- } +- // +- \-- org.freedesktop.DBus.ListNames() returns a single value, which is +- \-- a list of names (here represented as [String]) +- let Just names = fromVariant (methodReturnBody reply !! 0) +- // +- \-- Print each name on a line, sorted so reserved names are below +- \-- temporary names. +- mapM_ putStrLn (sort names) +- @ +- . +- >$ ghc --make list-names.hs +- >$ ./list-names +- >:1.0 +- >:1.1 +- >:1.10 +- >:1.106 +- >:1.109 +- >:1.110 +- >ca.desrt.dconf +- >org.freedesktop.DBus +- >org.freedesktop.Notifications +- >org.freedesktop.secrets +- >org.gnome.ScreenSaver +-category: Network, Desktop +-build-type: Simple ++ D-Bus is a simple, message-based protocol for inter-process ++ communication, which allows applications to interact with other parts of ++ the machine and the user's session using remote procedure calls. ++ . ++ D-Bus is a essential part of the modern Linux desktop, where it replaces ++ earlier protocols such as CORBA and DCOP. ++ . ++ This library is an implementation of the D-Bus protocol in Haskell. It ++ can be used to add D-Bus support to Haskell applications, without the ++ awkward interfaces common to foreign bindings. ++ . ++ Example: connect to the session bus, and get a list of active names. ++ . ++ @ ++ {-\# LANGUAGE OverloadedStrings \#-} ++ . ++ import Data.List (sort) ++ import DBus ++ import DBus.Client ++ . ++ main = do ++ client <- connectSession ++ ++ -- Request a list of connected clients from the bus ++ reply <- call_ client (methodCall \"\/org\/freedesktop\/DBus\" \"org.freedesktop.DBus\" \"ListNames\") ++ { methodCallDestination = Just \"org.freedesktop.DBus\" ++ } ++ ++ -- org.freedesktop.DBus.ListNames() returns a single value, which is ++ -- a list of names (here represented as [String]) ++ let Just names = fromVariant (methodReturnBody reply !! 0) ++ ++ -- Print each name on a line, sorted so reserved names are below ++ -- temporary names. ++ mapM_ putStrLn (sort names) ++ @ ++ . ++ >$ ghc --make list-names.hs ++ >$ ./list-names ++ >:1.0 ++ >:1.1 ++ >:1.10 ++ >:1.106 ++ >:1.109 ++ >:1.110 ++ >ca.desrt.dconf ++ >org.freedesktop.DBus ++ >org.freedesktop.Notifications ++ >org.freedesktop.secrets ++ >org.gnome.ScreenSaver ++ ++ + extra-source-files: +- examples/dbus-monitor.hs +- examples/export.hs +- examples/introspect.hs +- examples/list-names.hs +- idlxml/dbus.xml ++ examples/dbus-monitor.hs ++ examples/export.hs ++ examples/introspect.hs ++ examples/list-names.hs ++ idlxml/dbus.xml + + source-repository head +- type: git +- location: https://github.com/rblaze/haskell-dbus ++ type: git ++ location: https://github.com/rblaze/haskell-dbus + + library +- exposed-modules: +- DBus +- DBus.Client +- DBus.Generation +- DBus.Internal.Address +- DBus.Internal.Message +- DBus.Internal.Types +- DBus.Internal.Wire +- DBus.Introspection +- DBus.Introspection.Parse +- DBus.Introspection.Render +- DBus.Introspection.Types +- DBus.Socket +- DBus.TH +- DBus.Transport +- hs-source-dirs: lib +- ghc-options: -W -Wall +- build-depends: +- base ==4.*, +- bytestring <0.11, +- cereal <0.6, +- conduit >=1.3.0 && <1.4, +- containers <0.7, +- deepseq <1.5, +- exceptions <0.11, +- filepath <1.5, +- lens <4.20, +- network >=3.0.1.0 && <3.2, +- parsec <3.2, +- random <1.2, +- split <0.3, +- template-haskell <2.16.0.0, +- text <1.3, +- th-lift <0.9, +- transformers <0.6, +- unix <2.8, +- vector <0.13, +- xml-conduit >=1.9.0.0 && <1.10.0.0, +- xml-types <0.4 ++ ghc-options: -W -Wall ++ hs-source-dirs: lib ++ ++ build-depends: ++ base >=4 && <5 ++ , bytestring ++ , cereal ++ , conduit >= 1.3.0 ++ , containers ++ , deepseq ++ , exceptions ++ , filepath ++ , lens < 4.20 ++ , network >= 3.0.1.0 && < 3.2 ++ , parsec ++ , random ++ , split ++ , template-haskell < 2.17.0.0 ++ , text ++ , th-lift < 0.9 ++ , transformers ++ , unix ++ , vector ++ , xml-conduit >= 1.9.0.0 && < 1.10.0.0 ++ , xml-types ++ ++ exposed-modules: ++ DBus ++ DBus.Client ++ DBus.Generation ++ DBus.Internal.Address ++ DBus.Internal.Message ++ DBus.Internal.Types ++ DBus.Internal.Wire ++ DBus.Introspection ++ DBus.Introspection.Parse ++ DBus.Introspection.Render ++ DBus.Introspection.Types ++ DBus.Socket ++ DBus.TH ++ DBus.Transport + + test-suite dbus_tests +- type: exitcode-stdio-1.0 +- main-is: DBusTests.hs +- hs-source-dirs: tests +- other-modules: +- DBusTests.Address +- DBusTests.BusName +- DBusTests.Client +- DBusTests.ErrorName +- DBusTests.Generation +- DBusTests.Integration +- DBusTests.InterfaceName +- DBusTests.Introspection +- DBusTests.MemberName +- DBusTests.Message +- DBusTests.ObjectPath +- DBusTests.Serialization +- DBusTests.Signature +- DBusTests.Socket +- DBusTests.TH +- DBusTests.Transport +- DBusTests.Util +- DBusTests.Variant +- DBusTests.Wire +- ghc-options: -W -Wall -fno-warn-orphans +- build-depends: +- dbus -any, +- base ==4.*, +- bytestring <0.11, +- cereal <0.6, +- containers <0.7, +- directory <1.4, +- extra <1.8, +- filepath <1.5, +- network >=3.0.1.0 && <3.2, +- parsec <3.2, +- process <1.7, +- QuickCheck <2.15, +- random <1.2, +- resourcet <1.3, +- tasty <1.3, +- tasty-hunit <0.11, +- tasty-quickcheck <0.11, +- text <1.3, +- transformers <0.6, +- unix <2.8, +- vector <0.13 ++ type: exitcode-stdio-1.0 ++ main-is: DBusTests.hs ++ hs-source-dirs: tests ++ ghc-options: -W -Wall -fno-warn-orphans ++ ++ build-depends: ++ dbus ++ , base >=4 && <5 ++ , bytestring ++ , cereal ++ , containers ++ , directory ++ , extra < 1.8 ++ , filepath ++ , network >= 3.0.1.0 && < 3.2 ++ , parsec ++ , process ++ , QuickCheck < 2.15 ++ , random ++ , resourcet ++ , tasty ++ , tasty-hunit ++ , tasty-quickcheck ++ , text ++ , transformers ++ , unix ++ , vector ++ ++ other-modules: ++ DBusTests.Address ++ DBusTests.BusName ++ DBusTests.Client ++ DBusTests.ErrorName ++ DBusTests.Generation ++ DBusTests.Integration ++ DBusTests.InterfaceName ++ DBusTests.Introspection ++ DBusTests.MemberName ++ DBusTests.Message ++ DBusTests.ObjectPath ++ DBusTests.Serialization ++ DBusTests.Signature ++ DBusTests.Socket ++ DBusTests.TH ++ DBusTests.Transport ++ DBusTests.Util ++ DBusTests.Variant ++ DBusTests.Wire + + benchmark dbus_benchmarks +- type: exitcode-stdio-1.0 +- main-is: DBusBenchmarks.hs +- hs-source-dirs: benchmarks +- ghc-options: -Wall -fno-warn-orphans +- build-depends: +- dbus -any, +- base ==4.*, +- criterion <1.6 ++ type: exitcode-stdio-1.0 ++ main-is: DBusBenchmarks.hs ++ hs-source-dirs: benchmarks ++ ghc-options: -Wall -fno-warn-orphans ++ ++ build-depends: ++ dbus ++ , base >=4 && <5 ++ , criterion +Only in dbus-1.2.13-new: .git +Only in dbus-1.2.13-new: .gitignore +diff -ur dbus-1.2.13-old/lib/DBus/Generation.hs dbus-1.2.13-new/lib/DBus/Generation.hs +--- dbus-1.2.13-old/lib/DBus/Generation.hs 2019-02-14 16:37:47.000000000 +0100 ++++ dbus-1.2.13-new/lib/DBus/Generation.hs 2020-04-25 19:26:36.144991997 +0200 +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + {-# LANGUAGE OverloadedStrings #-} + {-# LANGUAGE TemplateHaskell #-} + module DBus.Generation where +@@ -26,6 +27,13 @@ + import Prelude hiding (mapM) + import System.Posix.Types (Fd(..)) + ++-- | Compatibility helper to create (total) tuple expressions ++mkTupE :: [Exp] -> Exp ++mkTupE = TupE ++#if MIN_VERSION_template_haskell(2,16,0) ++ . map Just ++#endif ++ + type ClientBusPathR a = ReaderT (Client, T.BusName, T.ObjectPath) IO a + + dbusInvoke :: (Client -> T.BusName -> T.ObjectPath -> a) -> ClientBusPathR a +@@ -232,8 +240,8 @@ + finalOutputNames <- buildOutputNames + let variantListExp = map makeToVariantApp methodArgNames + mapOrHead' = mapOrHead outputLength +- fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames TupE +- finalResultTuple = mapOrHead' VarE finalOutputNames TupE ++ fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames mkTupE ++ finalResultTuple = mapOrHead' VarE finalOutputNames mkTupE + maybeExtractionPattern = mapOrHead' makeJustPattern finalOutputNames TupP + getMethodCallDefDec = [d| + $( varP methodCallDefN ) = +@@ -432,7 +440,7 @@ + } + |] + let mapOrHead' = mapOrHead argCount +- fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames TupE ++ fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames mkTupE + maybeExtractionPattern = mapOrHead' makeJustPattern toHandlerOutputNames TupP + applyToName toApply n = AppE toApply $ VarE n + finalApplication = foldl applyToName (VarE handlerArgN) diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/stack-ghc882-support.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/stack-ghc882-support.patch deleted file mode 100644 index 0d906638e7..0000000000 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/stack-ghc882-support.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff --git a/src/Stack/Coverage.hs b/src/Stack/Coverage.hs -index d95fa332..f80e121a 100644 ---- a/src/Stack/Coverage.hs -+++ b/src/Stack/Coverage.hs -@@ -235,7 +235,7 @@ generateHpcReportForTargets opts tixFiles targetNames = do - case nc of - CTest testName -> - liftM (pkgPath ) $ parseRelFile (T.unpack testName ++ "/" ++ T.unpack testName ++ ".tix") -- _ -> fail $ -+ _ -> liftIO $ fail $ - "Can't specify anything except test-suites as hpc report targets (" ++ - packageNameString name ++ - " is used with a non test-suite target)" -diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs -index b69337ce..08eb9b9f 100644 ---- a/src/Stack/Package.hs -+++ b/src/Stack/Package.hs -@@ -463,7 +463,7 @@ makeObjectFilePathFromC - makeObjectFilePathFromC cabalDir namedComponent distDir cFilePath = do - relCFilePath <- stripProperPrefix cabalDir cFilePath - relOFilePath <- -- parseRelFile (replaceExtension (toFilePath relCFilePath) "o") -+ parseRelFile (System.FilePath.replaceExtension (toFilePath relCFilePath) "o") - return (componentOutputDir namedComponent distDir relOFilePath) - - -- | Make the global autogen dir if Cabal version is new enough. -diff --git a/src/Stack/Script.hs b/src/Stack/Script.hs -index c63c9f62..70257be1 100644 ---- a/src/Stack/Script.hs -+++ b/src/Stack/Script.hs -@@ -172,8 +172,8 @@ scriptCmd opts = do - - toExeName fp = - if osIsWindows -- then replaceExtension fp "exe" -- else dropExtension fp -+ then System.FilePath.replaceExtension fp "exe" -+ else System.FilePath.dropExtension fp - - getPackagesFromImports - :: FilePath -- ^ script filename -diff --git a/src/Stack/Setup.hs b/src/Stack/Setup.hs -index 8bbfc45c..5c5b028c 100644 ---- a/src/Stack/Setup.hs -+++ b/src/Stack/Setup.hs -@@ -876,7 +876,7 @@ buildGhcFromSource getSetupInfo' installed (CompilerRepository url) commitId fla - (_,files) <- listDir (cwd bindistPath) - let - isBindist p = "ghc-" `isPrefixOf` (toFilePath (filename p)) -- && fileExtension (filename p) == ".xz" -+ && (maybe "" id (fileExtension (filename p))) == ".xz" - mbindist = filter isBindist files - case mbindist of - [bindist] -> do -diff --git a/src/Stack/Storage/Project.hs b/src/Stack/Storage/Project.hs -index dc5318d8..984e6259 100644 ---- a/src/Stack/Storage/Project.hs -+++ b/src/Stack/Storage/Project.hs -@@ -12,6 +12,9 @@ - {-# LANGUAGE UndecidableInstances #-} - {-# OPTIONS_GHC -Wno-unused-top-binds -Wno-identities #-} - -+{-# LANGUAGE DerivingStrategies #-} -+{-# LANGUAGE StandaloneDeriving #-} -+ - -- | Work with SQLite database used for caches across a single project. - module Stack.Storage.Project - ( initProjectStorage -diff --git a/src/Stack/Storage/User.hs b/src/Stack/Storage/User.hs -index 3845b094..09695344 100644 ---- a/src/Stack/Storage/User.hs -+++ b/src/Stack/Storage/User.hs -@@ -12,6 +12,9 @@ - {-# LANGUAGE UndecidableInstances #-} - {-# OPTIONS_GHC -Wno-unused-top-binds -Wno-identities #-} - -+{-# LANGUAGE DerivingStrategies #-} -+{-# LANGUAGE StandaloneDeriving #-} -+ - -- | Work with SQLite database used for caches across an entire user account. - module Stack.Storage.User - ( initUserStorage -diff --git a/src/Stack/Types/Config.hs b/src/Stack/Types/Config.hs -index a5cc22b5..a329d353 100644 ---- a/src/Stack/Types/Config.hs -+++ b/src/Stack/Types/Config.hs -@@ -406,7 +406,7 @@ instance FromJSON CabalConfigKey where - instance FromJSONKey CabalConfigKey where - fromJSONKey = FromJSONKeyTextParser parseCabalConfigKey - --parseCabalConfigKey :: Monad m => Text -> m CabalConfigKey -+parseCabalConfigKey :: MonadFail m => Text -> m CabalConfigKey - parseCabalConfigKey "$targets" = pure CCKTargets - parseCabalConfigKey "$locals" = pure CCKLocals - parseCabalConfigKey "$everything" = pure CCKEverything -@@ -974,7 +974,7 @@ parseConfigMonoidObject rootDir obj = do - - return ConfigMonoid {..} - where -- handleExplicitSetupDep :: Monad m => (Text, Bool) -> m (Maybe PackageName, Bool) -+ handleExplicitSetupDep :: MonadFail m => (Text, Bool) -> m (Maybe PackageName, Bool) - handleExplicitSetupDep (name', b) = do - name <- - if name' == "*" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix index 35672116ca..bbc38e5154 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix @@ -1,17 +1,21 @@ -{ stdenv, fetchzip, gnugrep }: +{ stdenv, fetchzip, coreutils, gnugrep }: stdenv.mkDerivation rec { pname = "bats"; - version = "1.1.0"; + version = "1.2.0"; src = fetchzip { url = "https://github.com/bats-core/bats-core/archive/v${version}.tar.gz"; - sha256 = "1kkh0j2alql3xiyhw9wsvcc3xclv52g0ivgyk8h85q9fn3qdqakz"; + sha256 = "0f59zh4d4pa1a7ybs5zl6h0csbqqv11lbnq0jl1dgwm1s6p49bsq"; }; patchPhase = '' patchShebangs ./install.sh - substituteInPlace ./libexec/bats-core/bats-format-tap-stream --replace grep ${gnugrep}/bin/grep + + substituteInPlace ./libexec/bats-core/bats \ + --replace 'type -p greadlink readlink' 'type -p ${coreutils}/bin/readlink' + substituteInPlace ./libexec/bats-core/bats-format-tap-stream \ + --replace grep ${gnugrep}/bin/grep ''; installPhase = "./install.sh $out"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix index db849bb542..130eabbee3 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix @@ -1,24 +1,25 @@ -{ stdenv, fetchurl, graalvm8 }: +{ stdenv, fetchurl, graalvm8, glibcLocales }: with stdenv.lib; stdenv.mkDerivation rec { pname = "babashka"; - version = "0.0.78"; + version = "0.0.89"; reflectionJson = fetchurl { name = "reflection.json"; url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json"; - sha256 = "1m1nwdxjsc6bkdzkbsll316ly0c3qxaimjzyfph1220irjxnm7xf"; + sha256 = "0bc5rbizd2lg7qfh733yiip8m9zqrwgjf5ca09sdibxp7nhhsjby"; }; src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "01w990zk5qjrbnc846snh6na002kdyrlrfnqwg03ibx20g3mr7if"; + sha256 = "11jhqbm3svvikr9glz8wwps1267y25g3384ijw6avn267s7d7l8c"; }; dontUnpack = true; - buildInputs = [ graalvm8 ]; + LC_ALL = "en_US.UTF-8"; + nativeBuildInputs = [ graalvm8 glibcLocales ]; buildPhase = '' native-image \ @@ -40,7 +41,8 @@ stdenv.mkDerivation rec { --no-fallback \ --no-server \ --report-unsupported-elements-at-runtime \ - "-J-Xmx3g" + "--initialize-at-run-time=org.postgresql.sspi.SSPIClient" \ + "-J-Xmx4500m" ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix index eda8e450bb..050e7f1497 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, version ? "2.7.1" }: +{ stdenv, fetchurl, unzip, version ? "2.7.2" }: let @@ -24,29 +24,29 @@ let url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; sha256 = "1p5bn04gr91chcszgmw5ng8mlzgwsrdr2v7k7ppwr1slkx97fsrh"; }; - "2.7.1-x86_64-linux" = fetchurl { + "2.7.2-x86_64-linux" = fetchurl { url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "1zjd9hxxg1dsyzkzgqjvl933kprf8h143z5qi4mj1iczxv7zp27a"; + sha256 = "0vvsgda1smqdjn35yiq9pxx8f5haxb4hqnspcsfs6sn5c36k854v"; }; - "2.7.1-i686-linux" = fetchurl { + "2.7.2-i686-linux" = fetchurl { url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "0cggr1jbhzahmazlhba0vw2chz9zxd98jgk6zxvxdnw5hvkx8si1"; + sha256 = "0dj01d2wwrp3cc5x73vs6fzhs6db60gkbjlrw3w9j04wcx69i38m"; }; - "2.7.1-aarch64-linux" = fetchurl { + "2.7.2-aarch64-linux" = fetchurl { url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "0m4qlc3zy87habr61npykvpclggn5k4hadl59v2b0ymvxa4h5zfh"; + sha256 = "1p66fkdh1kv0ypmadmg67c3y3li3aaf1lahqh2g6r6qrzbh5da2p"; }; - "2.8.0-dev.10.0-x86_64-linux" = fetchurl { + "2.9.0-4.0.dev-x86_64-linux" = fetchurl { url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "17x0q94zampm99dd2sn6q1644lfwcl0ig2rdlmfzd9i4llj2ddbl"; + sha256 = "16d9842fb3qbc0hy0zmimav9zndfkq96glgykj20xssc88qpjk2r"; }; - "2.8.0-dev.10.0-i686-linux" = fetchurl { + "2.9.0-4.0.dev-i686-linux" = fetchurl { url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "0hmkg4jrffzh8x2mxn8nbf7dl7k0v2vacbmxgpsl382vw9wwj96j"; + sha256 = "105wgyxmi491c7qw0z3zhn4lv52h80ngyz4ch9dyj0sq8nndz2rc"; }; - "2.8.0-dev.10.0-aarch64-linux" = fetchurl { + "2.9.0-4.0.dev-aarch64-linux" = fetchurl { url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "185ipcmr9h76g44kzlj5pyj99cljlap82rhd1c2larfklyj5ryvv"; + sha256 = "1x6mlmc4hccmx42k7srhma18faxpxvghjwqahna80508rdpljwgc"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/hy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/hy/default.nix index 5816b3a175..a3aca532b0 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/hy/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/hy/default.nix @@ -1,23 +1,32 @@ -{ stdenv, fetchurl, python2Packages }: +{ stdenv, python3Packages }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "hy"; - version = "0.17.0"; + version = "0.18.0"; - src = python2Packages.fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1gdbqsirsdxj320wnp7my5awzs1kfs6m4fqmkzbd1zd47qzj0zfi"; + sha256 = "04dfwm336gw61fmgwikvh0cnxk682p19b4w555wl5d7mlym4rwj2"; }; - propagatedBuildInputs = with python2Packages; [ + checkInputs = with python3Packages; [ flake8 pytest ]; + + propagatedBuildInputs = with python3Packages; [ appdirs astor clint + colorama fastentrypoints funcparserlib rply + pygments ]; + # Hy does not include tests in the source distribution from PyPI, so only test executable. + checkPhase = '' + $out/bin/hy --help > /dev/null + ''; + meta = with stdenv.lib; { description = "A LISP dialect embedded in Python"; homepage = "http://hylang.org/"; 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 7db3830447..3f0fa7303e 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix @@ -1,9 +1,10 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; - version = "2.0.5"; + version = "2.0.5-2020-03-20"; + rev = "e613105"; isStable = true; - sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7"; + sha256 = "0k843z90s4hi0qhri6ixy8sv21nig8jwbznpqgqg845ji530kqj7"; 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 e8f1b8b338..b5a7894e98 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix @@ -1,7 +1,8 @@ { self, callPackage }: callPackage ./default.nix { inherit self; - version = "2.1.0-beta3"; + version = "2.1.0-2020-03-20"; + rev = "9143e86"; isStable = false; - sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs"; + sha256 = "1zw1yr0375d6jr5x20zvkvk76hkaqamjynbswpl604w6r6id070b"; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix index 9be368a590..9bc76c4493 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, buildPackages +{ stdenv, fetchFromGitHub, buildPackages , name ? "luajit-${version}" , isStable , sha256 +, rev , version , extraMeta ? {} , callPackage @@ -10,6 +11,7 @@ , enableFFI ? true , enableJIT ? true , enableJITDebugModule ? enableJIT +, enableGC64 ? stdenv.hostPlatform.isAarch64 , enable52Compat ? false , enableValgrindSupport ? false , valgrind ? null @@ -28,6 +30,7 @@ let optional (!enableFFI) "-DLUAJIT_DISABLE_FFI" ++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT" ++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT" + ++ optional (!enableGC64) "-DLUAJIT_DISABLE_GC64" ++ optional useSystemMalloc "-DLUAJIT_USE_SYSMALLOC" ++ optional enableValgrindSupport "-DLUAJIT_USE_VALGRIND" ++ optional enableGDBJITSupport "-DLUAJIT_USE_GDBJIT" @@ -37,9 +40,10 @@ let in stdenv.mkDerivation rec { inherit name version; - src = fetchurl { - url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; - inherit sha256; + src = fetchFromGitHub { + owner = "LuaJIT"; + repo = "LuaJIT"; + inherit sha256 rev; }; luaversion = "5.1"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/metamath/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/metamath/default.nix index 680e410669..66352cfdda 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/metamath/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/metamath/default.nix @@ -2,23 +2,17 @@ stdenv.mkDerivation { pname = "metamath"; - version = "0.181"; + version = "0.182"; buildInputs = [ autoreconfHook ]; src = fetchFromGitHub { owner = "metamath"; repo = "metamath-exe"; - rev = "67cbfa8468deb6f8ad5bedafc6399bee59064764"; - sha256 = "1mk3g41qz26j38j68i9qmnl8khkd8jwrzj4vxkb855h4b819s000"; + rev = "5df616efe4119ff88daf77e7041d45b6fa39c578"; + sha256 = "0amjdgy42c7jypf6sz98iczlxcyl9bqx67ws1q8w2zdqk2izsyjp"; }; - # the files necessary to build the DATA target are not in this distribution - # luckily, they're not really needed so we don't build it. - makeFlags = [ "DATA=" ]; - - installTargets = [ "install-exec" ]; - meta = with stdenv.lib; { description = "Interpreter for the metamath proof language"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix index 1d6576b383..e0aea60e29 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix @@ -1,250 +1,280 @@ # We have tests for PCRE and PHP-FPM in nixos/tests/php/ or # both in the same attribute named nixosTests.php -{ callPackage, config, fetchurl, lib, makeWrapper, stdenv, symlinkJoin -, writeText , autoconf, automake, bison, flex, libtool, pkgconfig, re2c -, apacheHttpd, libargon2, libxml2, pcre, pcre2 , systemd, valgrind -}: +{ callPackage, lib, stdenv, nixosTests }@_args: let generic = - { version - , sha256 - , extraPatches ? [] + { callPackage, lib, stdenv, nixosTests, config, fetchurl, makeWrapper + , symlinkJoin, writeText, autoconf, automake, bison, flex, libtool + , pkgconfig, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2 + , systemd, valgrind - # Sapi flags - , cgiSupport ? config.php.cgi or true - , cliSupport ? config.php.cli or true - , fpmSupport ? config.php.fpm or true - , pearSupport ? config.php.pear or true - , pharSupport ? config.php.phar or true - , phpdbgSupport ? config.php.phpdbg or true + , version + , sha256 + , extraPatches ? [] + # Sapi flags + , cgiSupport ? true + , cliSupport ? true + , fpmSupport ? true + , pearSupport ? true + , pharSupport ? true + , phpdbgSupport ? true - # Misc flags - , apxs2Support ? config.php.apxs2 or (!stdenv.isDarwin) - , argon2Support ? config.php.argon2 or true - , cgotoSupport ? config.php.cgoto or false - , embedSupport ? config.php.embed or false - , ipv6Support ? config.php.ipv6 or true - , systemdSupport ? config.php.systemd or stdenv.isLinux - , valgrindSupport ? config.php.valgrind or true - , ztsSupport ? (config.php.zts or false) || (apxs2Support) - }: let - pcre' = if (lib.versionAtLeast version "7.3") then pcre2 else pcre; - in stdenv.mkDerivation { - pname = "php"; + # Misc flags + , apxs2Support ? !stdenv.isDarwin + , argon2Support ? true + , cgotoSupport ? false + , embedSupport ? false + , ipv6Support ? true + , systemdSupport ? stdenv.isLinux + , valgrindSupport ? true + , ztsSupport ? apxs2Support + }@args: + let + # buildEnv wraps php to provide additional extensions and + # configuration. Its usage is documented in + # doc/languages-frameworks/php.section.md. + # + # Create a buildEnv with earlier overridden values and + # extensions functions in its closure. This is necessary for + # consecutive calls to buildEnv and overrides to work as + # expected. + mkBuildEnv = prevArgs: prevExtensionFunctions: lib.makeOverridable ( + { extensions ? ({...}: []), extraConfig ? "", ... }@innerArgs: + let + allArgs = args // prevArgs // innerArgs; + filteredArgs = builtins.removeAttrs allArgs [ "extensions" "extraConfig" ]; + php = generic filteredArgs; - inherit version; + php-packages = (callPackage ../../../top-level/php-packages.nix { + php = phpWithExtensions; + }); - enableParallelBuilding = true; + allExtensionFunctions = prevExtensionFunctions ++ [ extensions ]; + enabledExtensions = + builtins.foldl' + (state: f: + f { enabled = state; all = php-packages.extensions; }) + [] + allExtensionFunctions; - nativeBuildInputs = [ autoconf automake bison flex libtool pkgconfig re2c ]; + getExtName = ext: lib.removePrefix "php-" (builtins.parseDrvName ext.name).name; - buildInputs = - # PCRE extension - [ pcre' ] - - # Enable sapis - ++ lib.optional pearSupport [ libxml2.dev ] - - # Misc deps - ++ lib.optional apxs2Support apacheHttpd - ++ lib.optional argon2Support libargon2 - ++ lib.optional systemdSupport systemd - ++ lib.optional valgrindSupport valgrind - ; - - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; - - configureFlags = - # Disable all extensions - [ "--disable-all" ] - - # PCRE - ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre'.dev}" ] - ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre'.dev}" ] - ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre'.dev}" ] - ++ [ "PCRE_LIBDIR=${pcre'}" ] - - - # Enable sapis - ++ lib.optional (!cgiSupport) "--disable-cgi" - ++ lib.optional (!cliSupport) "--disable-cli" - ++ lib.optional fpmSupport "--enable-fpm" - ++ lib.optional pearSupport [ "--with-pear=$(out)/lib/php/pear" "--enable-xml" "--with-libxml" ] - ++ lib.optional (pearSupport && (lib.versionOlder version "7.4")) "--enable-libxml" - ++ lib.optional pharSupport "--enable-phar" - ++ lib.optional phpdbgSupport "--enable-phpdbg" - - - # Misc flags - ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs" - ++ lib.optional argon2Support "--with-password-argon2=${libargon2}" - ++ lib.optional cgotoSupport "--enable-re2c-cgoto" - ++ lib.optional embedSupport "--enable-embed" - ++ lib.optional (!ipv6Support) "--disable-ipv6" - ++ lib.optional systemdSupport "--with-fpm-systemd" - ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" - ++ lib.optional ztsSupport "--enable-maintainer-zts" - ; - - hardeningDisable = [ "bindnow" ]; - - preConfigure = '' - # Don't record the configure flags since this causes unnecessary - # runtime dependencies - for i in main/build-defs.h.in scripts/php-config.in; do - substituteInPlace $i \ - --replace '@CONFIGURE_COMMAND@' '(omitted)' \ - --replace '@CONFIGURE_OPTIONS@' "" \ - --replace '@PHP_LDFLAGS@' "" - done - - export EXTENSION_DIR=$out/lib/php/extensions - - ./buildconf --copy --force - - if test -f $src/genfiles; then - ./genfiles - fi - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace configure --replace "-lstdc++" "-lc++" - ''; - - postInstall = '' - test -d $out/etc || mkdir $out/etc - cp php.ini-production $out/etc/php.ini - ''; - - postFixup = '' - mkdir -p $dev/bin $dev/share/man/man1 - mv $out/bin/phpize $out/bin/php-config $dev/bin/ - mv $out/share/man/man1/phpize.1.gz \ - $out/share/man/man1/php-config.1.gz \ - $dev/share/man/man1/ - ''; - - src = fetchurl { - url = "https://www.php.net/distributions/php-${version}.tar.bz2"; - inherit sha256; - }; - - patches = [ ./fix-paths-php7.patch ] ++ extraPatches; - - separateDebugInfo = true; - - outputs = [ "out" "dev" ]; - - meta = with stdenv.lib; { - description = "An HTML-embedded scripting language"; - homepage = "https://www.php.net/"; - license = licenses.php301; - maintainers = with maintainers; [ globin etu ma27 ]; - platforms = platforms.all; - outputsToInstall = [ "out" "dev" ]; - }; - }; - - generic' = { version, sha256, self, selfWithExtensions, ... }@args: - let - php = generic (builtins.removeAttrs args [ "self" "selfWithExtensions" ]); - - php-packages = (callPackage ../../../top-level/php-packages.nix { - php = self; - phpWithExtensions = selfWithExtensions; - }); - - buildEnv = { extensions ? (_: []), extraConfig ? "" }: - let - getExtName = ext: lib.removePrefix "php-" (builtins.parseDrvName ext.name).name; - enabledExtensions = extensions php-packages.extensions; - - # Generate extension load configuration snippets from the - # extension parameter. This is an attrset suitable for use - # with textClosureList, which is used to put the strings in - # the right order - if a plugin which is dependent on - # another plugin is placed before its dependency, it will - # fail to load. - extensionTexts = - lib.listToAttrs - (map (ext: + # Recursively get a list of all internal dependencies + # for a list of extensions. + getDepsRecursively = extensions: let - extName = getExtName ext; - type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension"; + deps = lib.concatMap + (ext: ext.internalDeps or []) + extensions; in - lib.nameValuePair extName { - text = "${type}=${ext}/lib/php/extensions/${extName}.so"; - deps = lib.optionals (ext ? internalDeps) - (map getExtName ext.internalDeps); - }) - enabledExtensions); + if ! (deps == []) then + deps ++ (getDepsRecursively deps) + else + deps; - extNames = map getExtName enabledExtensions; - extraInit = writeText "custom-php.ini" '' - ${lib.concatStringsSep "\n" - (lib.textClosureList extensionTexts extNames)} - ${extraConfig} + # Generate extension load configuration snippets from the + # extension parameter. This is an attrset suitable for use + # with textClosureList, which is used to put the strings in + # the right order - if a plugin which is dependent on + # another plugin is placed before its dependency, it will + # fail to load. + extensionTexts = + lib.listToAttrs + (map (ext: + let + extName = getExtName ext; + type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension"; + in + lib.nameValuePair extName { + text = "${type}=${ext}/lib/php/extensions/${extName}.so"; + deps = lib.optionals (ext ? internalDeps) + (map getExtName ext.internalDeps); + }) + (enabledExtensions ++ (getDepsRecursively enabledExtensions))); + + extNames = map getExtName enabledExtensions; + extraInit = writeText "php.ini" '' + ${lib.concatStringsSep "\n" + (lib.textClosureList extensionTexts extNames)} + ${extraConfig} + ''; + + phpWithExtensions = symlinkJoin rec { + name = "php-with-extensions-${version}"; + inherit (php) version; + nativeBuildInputs = [ makeWrapper ]; + passthru = { + buildEnv = mkBuildEnv allArgs allExtensionFunctions; + withExtensions = mkWithExtensions allArgs allExtensionFunctions; + phpIni = "${phpWithExtensions}/lib/php.ini"; + unwrapped = php; + tests = nixosTests.php; + inherit (php-packages) packages extensions; + inherit (php) meta; + }; + paths = [ php ]; + postBuild = '' + cp ${extraInit} $out/lib/php.ini + + wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib + + if test -e $out/bin/php-fpm; then + wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib + fi + ''; + }; + in + phpWithExtensions); + + mkWithExtensions = prevArgs: prevExtensionFunctions: extensions: + mkBuildEnv prevArgs prevExtensionFunctions { inherit extensions; }; + + pcre' = if (lib.versionAtLeast version "7.3") then pcre2 else pcre; + in + stdenv.mkDerivation { + pname = "php"; + + inherit version; + + enableParallelBuilding = true; + + nativeBuildInputs = [ autoconf automake bison flex libtool pkgconfig re2c ]; + + buildInputs = + # PCRE extension + [ pcre' ] + + # Enable sapis + ++ lib.optional pearSupport [ libxml2.dev ] + + # Misc deps + ++ lib.optional apxs2Support apacheHttpd + ++ lib.optional argon2Support libargon2 + ++ lib.optional systemdSupport systemd + ++ lib.optional valgrindSupport valgrind + ; + + CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; + + configureFlags = + # Disable all extensions + [ "--disable-all" ] + + # PCRE + ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre'.dev}" ] + ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre'.dev}" ] + ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre'.dev}" ] + ++ [ "PCRE_LIBDIR=${pcre'}" ] + + + # Enable sapis + ++ lib.optional (!cgiSupport) "--disable-cgi" + ++ lib.optional (!cliSupport) "--disable-cli" + ++ lib.optional fpmSupport "--enable-fpm" + ++ lib.optional pearSupport [ "--with-pear=$(out)/lib/php/pear" "--enable-xml" "--with-libxml" ] + ++ lib.optional (pearSupport && (lib.versionOlder version "7.4")) "--enable-libxml" + ++ lib.optional pharSupport "--enable-phar" + ++ lib.optional phpdbgSupport "--enable-phpdbg" + + + # Misc flags + ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs" + ++ lib.optional argon2Support "--with-password-argon2=${libargon2}" + ++ lib.optional cgotoSupport "--enable-re2c-cgoto" + ++ lib.optional embedSupport "--enable-embed" + ++ lib.optional (!ipv6Support) "--disable-ipv6" + ++ lib.optional systemdSupport "--with-fpm-systemd" + ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" + ++ lib.optional ztsSupport "--enable-maintainer-zts" + ; + + hardeningDisable = [ "bindnow" ]; + + preConfigure = '' + # Don't record the configure flags since this causes unnecessary + # runtime dependencies + for i in main/build-defs.h.in scripts/php-config.in; do + substituteInPlace $i \ + --replace '@CONFIGURE_COMMAND@' '(omitted)' \ + --replace '@CONFIGURE_OPTIONS@' "" \ + --replace '@PHP_LDFLAGS@' "" + done + + export EXTENSION_DIR=$out/lib/php/extensions + + ./buildconf --copy --force + + if test -f $src/genfiles; then + ./genfiles + fi + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace "-lstdc++" "-lc++" ''; - in - symlinkJoin { - name = "php-with-extensions-${version}"; - inherit (php) version; - nativeBuildInputs = [ makeWrapper ]; - passthru = { - inherit buildEnv withExtensions enabledExtensions; - inherit (php-packages) packages extensions; - }; - paths = [ php ]; - postBuild = '' - cp ${extraInit} $out/lib/custom-php.ini - wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib + postInstall = '' + test -d $out/etc || mkdir $out/etc + cp php.ini-production $out/etc/php.ini + ''; - if test -e $out/bin/php-fpm; then - wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib - fi - ''; + postFixup = '' + mkdir -p $dev/bin $dev/share/man/man1 + mv $out/bin/phpize $out/bin/php-config $dev/bin/ + mv $out/share/man/man1/phpize.1.gz \ + $out/share/man/man1/php-config.1.gz \ + $dev/share/man/man1/ + ''; + + src = fetchurl { + url = "https://www.php.net/distributions/php-${version}.tar.bz2"; + inherit sha256; }; - withExtensions = extensions: buildEnv { inherit extensions; }; - in - php.overrideAttrs (_: { - passthru = { - enabledExtensions = []; - inherit buildEnv withExtensions; - inherit (php-packages) packages extensions; - }; - }); + patches = [ ./fix-paths-php7.patch ] ++ extraPatches; - php72base = generic' { + separateDebugInfo = true; + + outputs = [ "out" "dev" ]; + + passthru = { + buildEnv = mkBuildEnv {} []; + withExtensions = mkWithExtensions {} []; + }; + + meta = with stdenv.lib; { + description = "An HTML-embedded scripting language"; + homepage = "https://www.php.net/"; + license = licenses.php301; + maintainers = teams.php.members; + platforms = platforms.all; + outputsToInstall = [ "out" "dev" ]; + }; + }; + + php72base = callPackage generic (_args // { version = "7.2.29"; sha256 = "08xry2fgqgg8s0ym1hh11wkbr36av3zq1bn4krbciw1b7x8gb8ga"; - self = php72base; - selfWithExtensions = php72; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php72-darwin-isfinite.patch; - }; + }); - php73base = generic' { + php73base = callPackage generic (_args // { version = "7.3.16"; sha256 = "0bh499v9dfgh9k51w4rird1slb9rh9whp5h37fb84c98d992s1xq"; - self = php73base; - selfWithExtensions = php73; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; - }; + }); - php74base = generic' { + php74base = callPackage generic (_args // { version = "7.4.4"; sha256 = "17w2m4phhpj76x5fx67vgjrlkcczqvky3f5in1kjg2pch90qz3ih"; - self = php74base; - selfWithExtensions = php74; - }; + }); - defaultPhpExtensions = extensions: with extensions; ([ + defaultPhpExtensions = { all, ... }: with all; ([ bcmath calendar curl ctype dom exif fileinfo filter ftp gd gettext gmp iconv intl json ldap mbstring mysqli mysqlnd opcache openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql pdo_sqlite pgsql @@ -252,13 +282,13 @@ let tokenizer xmlreader xmlwriter zip zlib ] ++ lib.optionals (!stdenv.isDarwin) [ imap ]); - defaultPhpExtensionsWithHash = extensions: - (defaultPhpExtensions extensions) ++ [ extensions.hash ]; + defaultPhpExtensionsWithHash = { all, ... }: + (defaultPhpExtensions { inherit all; }) ++ [ all.hash ]; php74 = php74base.withExtensions defaultPhpExtensions; php73 = php73base.withExtensions defaultPhpExtensionsWithHash; php72 = php72base.withExtensions defaultPhpExtensionsWithHash; in { - inherit php72base php73base php74base php72 php73 php74; + inherit php72 php73 php74; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix index 55065c45d5..f7ec06ce4f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix @@ -38,21 +38,22 @@ let is_nixenv = "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"; - # }; + nixenv-venv = rec { + env = runCommand "${python.name}-venv" {} '' + ${pythonEnv.interpreter} -m venv $out + ''; + interpreter = "${env}/bin/${pythonEnv.executable}"; + is_venv = "True"; + is_nixenv = "True"; + }; }; # All PyPy package builds are broken at the moment - integrationTests = lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec { + integrationTests = lib.optionalAttrs (python.pythonAtLeast "3.7" && (!python.isPyPy)) rec { # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { interpreter = python; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix index 06219a69fc..8d330fcdbf 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage }: +{ buildPythonPackage, pythonOlder }: buildPythonPackage { @@ -8,4 +8,6 @@ buildPythonPackage { src = ./.; + disabled = pythonOlder "3.7"; + } diff --git a/third_party/nixpkgs/pkgs/development/libraries/agda/agda-stdlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/agda/agda-stdlib/default.nix index 6056173c31..6647677f71 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -19,7 +19,7 @@ agda.mkDerivation (self: rec { topSourceDirectories = [ "src" ]; meta = with stdenv.lib; { - homepage = "http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary"; + homepage = "https://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary"; description = "A standard library for use with the Agda compiler"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aspell/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aspell/default.nix index 91fd83bf91..68faef7e78 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aspell/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aspell/default.nix @@ -15,10 +15,11 @@ let in stdenv.mkDerivation rec { - name = "aspell-0.60.8"; + pname = "aspell"; + version = "0.60.8"; src = fetchurl { - url = "mirror://gnu/aspell/${name}.tar.gz"; + url = "mirror://gnu/aspell/aspell-${version}.tar.gz"; sha256 = "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix index ec8c4b81dd..e415aa5e4f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 libsndfile python3 ]; meta = with stdenv.lib; { - homepage = "http://lv2plug.in"; + homepage = "https://lv2plug.in"; description = "A plugin standard for audio systems"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/bwidget/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bwidget/default.nix index 154b863455..ff9e6aa038 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bwidget/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bwidget/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz"; - sha256 = "0knlnpmwam74v0qa1h9gg4f32vzzz7ays2wbslflf51ilg7nw6jk"; + sha256 = "0wm6hk3rnqhnn2cyw24drqwbfnysp6jyfi8lc1vih5k704a955lf"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/directfb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/directfb/default.nix index f7545bb03d..d333b78666 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/directfb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/directfb/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, pkgconfig, flux, zlib +{ stdenv, lib, fetchFromGitHub, fetchpatch +, autoreconfHook, perl, pkgconfig, flux, zlib , libjpeg, freetype, libpng, giflib , enableX11 ? true, xorg , enableSDL ? true, SDL }: @@ -14,6 +15,16 @@ stdenv.mkDerivation rec { sha256 = "0bs3yzb7hy3mgydrj8ycg7pllrd2b6j0gxj596inyr7ihssr3i0y"; }; + patches = [ + # Fixes build in "davinci" with glibc >= 2.28 + # The "davinci" module is only enabled on 32-bit arm. + # https://github.com/deniskropp/DirectFB/pull/17 + (fetchpatch { + url = "https://github.com/deniskropp/DirectFB/commit/3a236241bbec3f15b012b6f0dbe94353d8094557.patch"; + sha256 = "0rj3gv0zlb225sqjz04p4yagy4xacf3210aa8vra8i1f0fv0w4kw"; + }) + ]; + nativeBuildInputs = [ autoreconfHook perl pkgconfig flux ]; buildInputs = [ zlib libjpeg freetype giflib libpng ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix index 131c22fccf..aed7dc59bc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix @@ -5,24 +5,25 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "canonical"; repo = pname; rev = "v${version}"; - sha256 = "19snm6cicxagcw9ys2jmjf6fchzs6pwm7h4jmyr0pn6zks2yjf1i"; + sha256 = "04h3wbfv6bkzzmcwaja33x2qkj3czn0p6fgbdgqd1xli8sx2c2k4"; }; nativeBuildInputs = [ autoreconfHook file pkgconfig ]; - buildInputs = [ libco-canonical.dev libuv raft-canonical.dev - sqlite-replication ]; + buildInputs = [ + libco-canonical.dev + libuv + raft-canonical.dev + sqlite-replication + ]; - preConfigure= '' - substituteInPlace configure --replace /usr/bin/ " " - ''; - - doCheck = true; + # tests hang for ever on x86_64-linux + doCheck = false; outputs = [ "dev" "out" ]; @@ -34,6 +35,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/CanonicalLtd/dqlite/"; license = licenses.asl20; maintainers = with maintainers; [ joko wucke13 ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix index 42e1a252a7..4741a3d156 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation rec { pname = "fmt"; version = "6.2.0"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "fmtlib"; repo = "fmt"; @@ -19,9 +21,14 @@ stdenv.mkDerivation rec { url = "https://github.com/fmtlib/fmt/commit/7d01859ef16e6b65bc023ad8bebfedecb088bf81.patch"; sha256 = "vdttRGgdltabeRAs4/z0BNtW2dLOhCxtXQFGVFKpEG0="; }) - ]; - outputs = [ "out" "dev" ]; + # Fix paths in pkg-config file + # https://github.com/fmtlib/fmt/pull/1657 + (fetchpatch { + url = "https://github.com/fmtlib/fmt/commit/78f041ab5b40a1145ba686aeb8013e8788b08cd2.patch"; + sha256 = "hjE6Q/ubA4UhvuJXgcsA3wiGoDK031P19njQRL9JF8M="; + }) + ]; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/garmintools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/garmintools/default.nix index a086648c91..aa6ebfd339 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/garmintools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/garmintools/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, libusb }: +{ stdenv, fetchurl, libusb-compat-0_1 }: stdenv.mkDerivation { name = "garmintools-0.10"; src = fetchurl { url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/garmintools/garmintools-0.10.tar.gz"; sha256 = "1vjc8h0z4kx2h52yc3chxn3wh1krn234fg12sggbia9zjrzhpmgz"; }; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; meta = { description = "Provides the ability to communicate with the Garmin Forerunner 305 via the USB interface"; homepage = "https://code.google.com/archive/p/garmintools/"; # community clone at https://github.com/ianmartin/garmintools diff --git a/third_party/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix index ef593c568a..d8a910d479 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + attrPath = "goocanvasmm2"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index c4e6af5d62..a3fe432017 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -48,7 +48,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.17"; + version = "3.24.18"; outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "1h5snvqz8f6zgwpmq7pblvfwj5dphfckj8bv7vdz1c0w49dja47j"; + sha256 = "1lia2ybd1661j6mvrc00iyd50gm7sy157bdzlyf4mr028rzzzspm"; }; patches = [ @@ -73,21 +73,6 @@ stdenv.mkDerivation rec { # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002 ./patches/01-build-Fix-path-handling-in-pkgconfig.patch - - # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1634 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/79732da1ed8cb167440fb047c72cfc0d888a187b.patch"; - sha256 = "1ynrx81dkwjfqhvg80q28qbb6jabg4x73fkbrnligzgkzimfjpx3"; - }) - # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1633 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/12fc9a45efcbb546eb7de13c5c4d3183f2f5a3b8.patch"; - sha256 = "00zrm77qk39p1hgn207az82cgvqiyp6is7dk0ssjxkc34403r78v"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/5a52af20cba76474e631b2a7548963bcad22d66d.patch"; - sha256 = "0sbzzwa0si1w83m5abyf312f4w445wwlms53m5hb7kdgkjbhaa3f"; - }) ] ++ optionals stdenv.isDarwin [ # X11 module requires which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it diff --git a/third_party/nixpkgs/pkgs/development/libraries/hamlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hamlib/default.nix index 8a359314de..8ef8b55be5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hamlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hamlib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb, pkgconfig, +{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkgconfig, boost, libtool, perlPackages }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2 - tcl libusb pkgconfig boost libtool ]; + tcl libusb-compat-0_1 pkgconfig boost libtool ]; configureFlags = [ "--with-perl-binding" "--with-python-binding" "--with-tcl-binding" "--with-rigmatrix" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/hidapi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hidapi/default.nix index 28e96244ba..11cdd0ab7e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hidapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hidapi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, systemd, libusb +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, systemd, libusb1 , darwin }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ ] - ++ stdenv.lib.optionals stdenv.isLinux [ libusb systemd ]; + ++ stdenv.lib.optionals stdenv.isLinux [ libusb1 systemd ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/icu/67.nix b/third_party/nixpkgs/pkgs/development/libraries/icu/67.nix new file mode 100644 index 0000000000..23a1069ea1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/icu/67.nix @@ -0,0 +1,4 @@ +import ./base.nix { + version = "67.1"; + sha256 = "1p6mhvxl0xr2n0g6xdps3mwzwlv6mjsz3xlpm793p9aiybb0ra4l"; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/ilmbase/bootstrap.patch b/third_party/nixpkgs/pkgs/development/libraries/ilmbase/bootstrap.patch deleted file mode 100644 index db6af6daeb..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/ilmbase/bootstrap.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ur openexr-v2.2.0-src-orig/IlmBase/bootstrap openexr-v2.2.0-src/IlmBase/bootstrap ---- IlmBase/bootstrap 2015-03-31 01:02:41.000000000 -0400 -+++ IlmBase/bootstrap 2015-03-31 01:03:35.000000000 -0400 -@@ -47,11 +47,6 @@ - fi - } - --# Check if /usr/local/share/aclocal exists --if [ -d /usr/local/share/aclocal ]; then -- ACLOCAL_INCLUDE="$ACLOCAL_INCLUDE -I /usr/local/share/aclocal" --fi -- - run_cmd aclocal -I m4 $ACLOCAL_INCLUDE - run_cmd $LIBTOOLIZE --automake --copy - run_cmd automake --add-missing --copy diff --git a/third_party/nixpkgs/pkgs/development/libraries/ilmbase/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ilmbase/default.nix index 99e47b0b30..0244725177 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ilmbase/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ilmbase/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, buildPackages, automake, autoconf, libtool, which, - fetchpatch }: +{ stdenv, lib, buildPackages, automake, autoconf, libtool, which, + fetchpatch, openexr }: stdenv.mkDerivation rec { pname = "ilmbase"; - version = "2.3.0"; + version = lib.getVersion openexr; - src = fetchurl { - url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0qiq5bqq9rxhqjiym2k36sx4vq8adgrz6xf6qwizi9bqm78phsa5"; - }; + # 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"; outputs = [ "out" "dev" ]; @@ -17,21 +18,16 @@ stdenv.mkDerivation rec { ./bootstrap ''; + # otherwise, the pkgconfig info for the libraries will not match the filenames + configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--enable-namespaceversioning=no"; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ automake autoconf libtool which ]; NIX_CFLAGS_LINK = "-pthread"; patches = [ - ./bootstrap.patch ./cross.patch - (fetchpatch { - name = "CVE-2018-18443.patch"; - url = "https://github.com/kdt3rd/openexr/commit/5fa930b82cff2db386c64ca512af19e60c14d32a.patch"; - sha256 = "1j6xd0qkx99acc1szycxaj0wwp01yac67jz48hwc4fwwpz8blx4s"; - stripLen = 1; - excludes = [ "CHANGES.md" ]; - }) ]; # fails 1 out of 1 tests with diff --git a/third_party/nixpkgs/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch b/third_party/nixpkgs/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch deleted file mode 100644 index 49edbf63a5..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch +++ /dev/null @@ -1,224 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8217cba..a6c1d70 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -32,7 +32,7 @@ else(APPLE) - endif(${BUILD_FOR_ARM}) - endif(APPLE) - --set(CMAKE_CXX_FLAGS "--std=c++0x -Wall -Wextra -Werror -Wno-unknown-warning-option -Wno-unused-parameter -Wno-null-dereference -Wno-unused-local-typedefs -DGTEST_USE_OWN_TR1_TUPLE=1 ${BUILD_PIC_COMPILER_FLAGS}") -+set(CMAKE_CXX_FLAGS "--std=c++11 -DGTEST_USE_OWN_TR1_TUPLE=1 ${BUILD_PIC_COMPILER_FLAGS}") - - set(TEST_BINARY "kinetic_client_test") - set(TEST_BINARY_PATH ${kinetic_cpp_client_BINARY_DIR}/${TEST_BINARY}) -@@ -50,103 +50,16 @@ set(GENERATED_SOURCES_PATH ${kinetic_cpp_client_SOURCE_DIR}/src/main/generated) - set(PREFIX "${CMAKE_BINARY_DIR}/vendor") - set(EXTERNAL_PREFIX "${kinetic_cpp_client_BINARY_DIR}/vendor") - --include(ExternalProject) -- --set(KINETIC_PROTO_VERSION "3.0.0") --set(KINETIC_PROTO_MD5 "85ca027b870811a297c1f6d792498934") -- --ExternalProject_add( -- kinetic-proto -- PREFIX ${PREFIX} -- DOWNLOAD_COMMAND curl -L https://github.com/Seagate/kinetic-protocol/archive/${KINETIC_PROTO_VERSION}.tar.gz -o kinetic-proto.tar.gz && openssl md5 kinetic-proto.tar.gz | grep -q ${KINETIC_PROTO_MD5} && rm -rf kinetic-proto && mkdir -p kinetic-proto && tar -xz --strip-components 1 -C kinetic-proto -f kinetic-proto.tar.gz -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND "" -- BUILD_COMMAND "" -- INSTALL_COMMAND "" --) -- --ExternalProject_add( -- gflags -- PREFIX ${EXTERNAL_PREFIX} -- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/gflags-2.0-no-svn-files.tar.gz" -- URL_MD5 "9084829124e02a7e6be0f0f824523423" -- CONFIGURE_COMMAND ../gflags/configure --prefix=${EXTERNAL_PREFIX} --enable-static ${CONFIG_HOST_FLAG} ${CHILD_MAKE_FLAGS} ${PIC_MAKE_FLAGS} --) -- --ExternalProject_add( -- glog -- PREFIX ${EXTERNAL_PREFIX} -- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/glog-0.3.3.tar.gz" -- URL_MD5 "a6fd2c22f8996846e34c763422717c18" -- PATCH_COMMAND sh ${kinetic_cpp_client_SOURCE_DIR}/patches/apply-glog-patches.sh ${kinetic_cpp_client_SOURCE_DIR} -- CONFIGURE_COMMAND ../glog/configure --prefix=${EXTERNAL_PREFIX} --with-gflags=${EXTERNAL_PREFIX} --enable-static ${CONFIG_HOST_FLAG} ${CHILD_MAKE_FLAGS} ${PIC_MAKE_FLAGS} -- DEPENDS gflags --) -- --ExternalProject_add( -- gtest -- PREFIX ${EXTERNAL_PREFIX} -- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/gtest-1.6.0.zip" -- URL_MD5 "4577b49f2973c90bf9ba69aa8166b786" -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND "" -- BUILD_COMMAND ${CMAKE_CXX_COMPILER} -DGTEST_USE_OWN_TR1_TUPLE=1 -I../gtest -I../gtest/include -c ../gtest/src/gtest-all.cc && ar -rv libgtest.a gtest-all.o && ranlib libgtest.a -- INSTALL_COMMAND "" --) -- --ExternalProject_add( -- gmock -- PREFIX ${EXTERNAL_PREFIX} -- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/gmock-1.6.0.zip" -- URL_MD5 "f547f47321ca88d3965ca2efdcc2a3c1" -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND "" -- BUILD_COMMAND ${CMAKE_CXX_COMPILER} -DGTEST_USE_OWN_TR1_TUPLE=1 -I../gmock -I../gmock/include -I../gtest -I../gtest/include -c ../gmock/src/gmock-all.cc && ar -rv libgmock.a gmock-all.o && ranlib libgmock.a -- INSTALL_COMMAND "" -- DEPENDS gtest --) -- --ExternalProject_add( -- openssl -- PREFIX ${EXTERNAL_PREFIX} -- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/openssl-1.0.1g.tar.gz" -- URL_MD5 "de62b43dfcd858e66a74bee1c834e959" -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND ${OPENSSL_CONFIGURE_COMMAND} --prefix=${EXTERNAL_PREFIX} ${BUILD_PIC_COMPILER_FLAG} -- BUILD_COMMAND touch apps/openssl && touch openssl.pc && make ${CHILD_MAKE_FLAGS} build_libs libssl.pc libcrypto.pc -- INSTALL_COMMAND make install_sw --) -- --# The protobuf build requires the existence of a protoc binary that can be --# executed on the host machine. To handle cross compilation, we always build --# protobuf once for the host so that we have a suitable copy of protoc. --ExternalProject_add( -- protoc -- PREFIX ${EXTERNAL_PREFIX}/host -- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/protobuf-2.5.0.tar.bz2" -- URL_MD5 "a72001a9067a4c2c4e0e836d0f92ece4" -- CONFIGURE_COMMAND ../protoc/configure --prefix=${EXTERNAL_PREFIX}/host --enable-static --) -- - # Protobuf code generation rules --set(PROTOC_PATH "${PREFIX}/host/bin/protoc") --set(PROTO_DIR "${CMAKE_BINARY_DIR}/vendor/src/kinetic-proto") -+set(PROTOC_PATH "protoc") -+set(PROTO_DIR "${CMAKE_BINARY_DIR}/kinetic-proto") - set(PROTO_ORIG_PATH "${PROTO_DIR}/kinetic.proto") - set(PROTO_MODIFIED_PATH "${PROTO_DIR}/kinetic_client.proto") --ExternalProject_add( -- protobuf -- PREFIX ${EXTERNAL_PREFIX} -- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/protobuf-2.5.0.tar.bz2" -- URL_MD5 "a72001a9067a4c2c4e0e836d0f92ece4" -- CONFIGURE_COMMAND ../protobuf/configure --prefix=${EXTERNAL_PREFIX} --enable-static --with-protoc=${PROTOC_PATH} ${CONFIG_HOST_FLAG} ${CHILD_MAKE_FLAGS} ${PIC_MAKE_FLAGS} -- DEPENDS protoc --) - - add_custom_command( - COMMENT "Compiling protobuf" - OUTPUT ${GENERATED_SOURCES_PATH}/kinetic_client.pb.h ${GENERATED_SOURCES_PATH}/kinetic_client.pb.cc - COMMAND mkdir -p ${GENERATED_SOURCES_PATH} && sed 's/com\\.seagate\\.kinetic\\.proto/com.seagate.kinetic.client.proto/' ${PROTO_ORIG_PATH} > ${PROTO_MODIFIED_PATH} && ${PROTOC_PATH} -I=${PROTO_DIR} --cpp_out=${GENERATED_SOURCES_PATH} ${PROTO_MODIFIED_PATH} -- DEPENDS kinetic-proto protoc protobuf - ) - set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${GENERATED_SOURCES_PATH}) - -@@ -157,21 +70,10 @@ include_directories( - - src/test/mock - src/test -- -- ${EXTERNAL_PREFIX}/include -- ${EXTERNAL_PREFIX}/src/gmock/include -- ${EXTERNAL_PREFIX}/src/gtest/include - ) - - set(LIBRARY_DEPENDENCIES - kinetic_client -- ${CMAKE_BINARY_DIR}/vendor/lib/libglog.a -- ${CMAKE_BINARY_DIR}/vendor/lib/libgflags.a -- ${CMAKE_BINARY_DIR}/vendor/lib/libssl.a -- ${CMAKE_BINARY_DIR}/vendor/lib/libcrypto.a -- ${CMAKE_BINARY_DIR}/vendor/lib/libprotobuf.a -- ${CMAKE_BINARY_DIR}/vendor/src/gtest/libgtest.a -- ${CMAKE_BINARY_DIR}/vendor/src/gmock/libgmock.a - ${CMAKE_THREAD_LIBS_INIT} - dl - ) -@@ -180,12 +82,68 @@ set(LIBRARY_DEPENDENCIES - # Otherwise glog uses the standard glibc unwinder and there is no dependency. - find_library(LIBUNWIND "unwind") - if(LIBUNWIND) -- set(LIBRARY_DEPENDENCIES -- ${LIBRARY_DEPENDENCIES} -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} - ${LIBUNWIND} - ) - endif() - -+find_library(LIBSSL "ssl") -+if(LIBSSL) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBSSL} -+ ) -+endif() -+ -+find_library(LIBCRYPTO "crypto") -+if(LIBCRYPTO) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBCRYPTO} -+ ) -+endif() -+ -+find_library(LIBPROTOBUF "protobuf") -+if(LIBPROTOBUF) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBPROTOBUF} -+ ) -+endif() -+ -+find_library(LIBGLOG "glog") -+if(LIBGLOG) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBGLOG} -+ ) -+endif() -+ -+find_library(LIBGFLAGS "gflags") -+if(LIBGFLAGS) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBGFLAGS} -+ ) -+endif() -+ -+find_library(LIBGMOCK "gmock") -+if(LIBGMOCK) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBGMOCK} -+ ) -+endif() -+ -+find_library(LIBGTEST "gtest") -+if(LIBGTEST) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBGTEST} -+ ) -+endif() -+ - add_library(kinetic_client - src/main/generated/kinetic_client.pb.cc - src/main/hmac_provider.cc -diff --git a/src/test/kinetic_cpp_client_test.cc b/src/test/kinetic_cpp_client_test.cc -index 2079fab..c5004a2 100644 ---- a/src/test/kinetic_cpp_client_test.cc -+++ b/src/test/kinetic_cpp_client_test.cc -@@ -22,6 +22,7 @@ - - #include - -+#include "gflags/gflags.h" - #include "gtest/gtest.h" - #include "glog/logging.h" - diff --git a/third_party/nixpkgs/pkgs/development/libraries/kinetic-cpp-client/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kinetic-cpp-client/default.nix deleted file mode 100644 index e2b81d7764..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/kinetic-cpp-client/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv, fetchgit, fetchurl, cmake, protobuf, libunwind, openssl, glog -, gflags, gmock, gtest -}: - -let - protoTar = fetchurl { - url = "https://github.com/Seagate/kinetic-protocol/archive/3.0.0.tar.gz"; - sha256 = "0406pp0sdf0rg6s5g18r2d8si2rin7p6qbzp7c6pma5hyzsygz48"; - }; -in -stdenv.mkDerivation { - name = "kinetic-cpp-client-2015-04-14"; - - src = fetchgit { - url = "git://github.com/Seagate/kinetic-cpp-client.git"; - rev = "015085a5c89db0398f80923053f36b9e0611e107"; - sha256 = "0gm34sl6lyidnxgg1lrhkxkxqj8z1y2cqn7zhzz2f1k50pigi5da"; - }; - - patches = [ ./build-fix.patch ]; - - postPatch = '' - mkdir -p build/kinetic-proto - tar -x --strip-components 1 -C build/kinetic-proto -f ${protoTar} - ''; - - nativeBuildInputs = [ cmake protobuf ]; - buildInputs = [ libunwind glog gflags gmock gtest ]; - - # The headers and library include from these and there is no provided pc file - propagatedBuildInputs = [ protobuf openssl ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=true" - ]; - - preCheck = '' - # The checks cannot find libkinetic_client.so otherwise - export LD_LIBRARY_PATH="$(pwd)" - ''; - - installPhase = '' - # There is no included install script so do our best - mkdir -p $out/lib - cp libkinetic_client.so $out/lib - cp -r ../include $out - cp ../src/main/generated/kinetic_client.pb.h $out/include - ''; - - doCheck = true; - - meta = with stdenv.lib; { - homepage = "https://github.com/Seagate/kinetic-cpp-client"; - description = "Code for producing C and C++ kinetic clients"; - license = licenses.lgpl21; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix index 09ebac9386..a1c2967dde 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform, libraspberrypi ? null }: -let version = "4.0.4"; in +let version = "4.0.5"; in stdenv.mkDerivation { pname = "libcec"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; - sha256 = "02j09y06csaic4m0fyb4dr9l3hl15nxbbniwq0i1qlccpxjak0j3"; + sha256 = "0hvp33mq0kg544hw20aq3vy5lxf5zid6gxm3qdga7wxw1r1lkmz4"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix index aeaa45a790..da7a186bea 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix @@ -1,23 +1,41 @@ -{ stdenv, fetchurl, makeWrapper }: +{ stdenv, fetchFromGitHub, autoreconfHook, strace, which }: stdenv.mkDerivation rec { - name = "libeatmydata-105"; + pname = "libeatmydata"; + version = "105"; - src = fetchurl { - url = "https://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz"; - sha256 = "1pd8sc73cgc41ldsvq6g8ics1m5k8gdcb91as9yg8z5jnrld1lmx"; + src = fetchFromGitHub { + owner = "stewartsmith"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "0sx803h46i81h67xbpd3c7ky0nhaw4gij214nsx4lqig70223v9r"; }; patches = [ ./find-shell-lib.patch ]; + patchFlags = "-p0"; + postPatch = '' - substituteInPlace eatmydata.in --replace NIX_OUT_DIR $out + substituteInPlace eatmydata.in \ + --replace NIX_OUT_DIR $out + + patchShebangs . ''; - meta = { - homepage = "https://www.flamingspork.com/projects/libeatmydata/"; - license = stdenv.lib.licenses.gpl3Plus; + nativeBuildInputs = [ + autoreconfHook + ] ++ stdenv.lib.optionals doCheck [ strace which ]; + + # while we can *build* in parallel, the tests also run in parallel which does + # not work with v105. Later versions (unreleased) have a fix for that. The + # problem is that on hydra we cannot use strace, so the tests don't run there. + enableParallelBuilding = true; + doCheck = false; + + meta = with stdenv.lib; { description = "Small LD_PRELOAD library to disable fsync and friends"; - platforms = stdenv.lib.platforms.unix; + homepage = "https://www.flamingspork.com/projects/libeatmydata/"; + license = licenses.gpl3Plus; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix index ea155440c8..3db0b056c0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix @@ -1,8 +1,21 @@ -{ fetchurl, stdenv, libtool, gettext, zlib, bzip2, flac, libvorbis +{ fetchurl, stdenv, substituteAll +, libtool, gettext, zlib, bzip2, flac, libvorbis , exiv2, libgsf, rpm, pkgconfig, fetchpatch +, gstreamerSupport ? true, gst_all_1 ? null +# ^ Needed e.g. for proper id3 and FLAC support. +# Set to `false` to decrease package closure size by about 87 MB (53%). +, gstPlugins ? (gst: [ gst.gst-plugins-base gst.gst-plugins-good ]) +# If an application needs additional gstreamer plugins it can also make them +# available by adding them to the environment variable +# GST_PLUGIN_SYSTEM_PATH_1_0, e.g. like this: +# postInstall = '' +# wrapProgram $out/bin/extract --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" +# ''; +# See also . , gtkSupport ? true, glib ? null, gtk3 ? null , videoSupport ? true, ffmpeg ? null, libmpeg2 ? null}: +assert gstreamerSupport -> gst_all_1 != null && builtins.isList (gstPlugins gst_all_1); assert gtkSupport -> glib != null && gtk3 != null; assert videoSupport -> ffmpeg != null && libmpeg2 != null; @@ -28,6 +41,15 @@ stdenv.mkDerivation rec { sha256 = "01xhcjbzv6p53wz7y2ii76kb8m9iwvnm4ip9w4a0bpgaxqz4b9fw"; excludes = [ "ChangeLog" ]; }) + ] ++ stdenv.lib.optionals gstreamerSupport [ + + # Libraries cannot be wrapped so we need to hardcode the plug-in paths. + (substituteAll { + src = ./gst-hardcode-plugins.patch; + load_gst_plugins = stdenv.lib.concatMapStrings + (plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'') + (gstPlugins gst_all_1); + }) ]; preConfigure = @@ -40,7 +62,9 @@ stdenv.mkDerivation rec { [ libtool gettext zlib bzip2 flac libvorbis exiv2 libgsf rpm pkgconfig - ] ++ stdenv.lib.optionals gtkSupport [ glib gtk3 ] + ] ++ stdenv.lib.optionals gstreamerSupport + ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1) + ++ stdenv.lib.optionals gtkSupport [ glib gtk3 ] ++ stdenv.lib.optionals videoSupport [ ffmpeg libmpeg2 ]; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libextractor/gst-hardcode-plugins.patch b/third_party/nixpkgs/pkgs/development/libraries/libextractor/gst-hardcode-plugins.patch new file mode 100644 index 0000000000..73ecf5f252 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libextractor/gst-hardcode-plugins.patch @@ -0,0 +1,11 @@ +--- a/src/plugins/gstreamer_extractor.c ++++ b/src/plugins/gstreamer_extractor.c +@@ -2215,6 +2215,7 @@ void __attribute__ ((constructor)) + gstreamer_init () + { + gst_init (NULL, NULL); ++ @load_gst_plugins@ + g_log_set_default_handler (&log_handler, NULL); + g_log_set_handler (NULL, G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION, + &log_handler, NULL); + diff --git a/third_party/nixpkgs/pkgs/development/libraries/libftdi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libftdi/default.nix index d483cc16f0..88c848397d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libftdi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libftdi/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libusb}: +{stdenv, fetchurl, libusb-compat-0_1}: with stdenv; mkDerivation rec { name = "libftdi-0.20"; @@ -8,9 +8,9 @@ with stdenv; mkDerivation rec { sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii"; }; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; - propagatedBuildInputs = [ libusb ]; + propagatedBuildInputs = [ libusb-compat-0_1 ]; # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix index 51bd69c0ed..0728dddcb4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix @@ -1,22 +1,24 @@ { stdenv , fetchFromGitHub -, autoreconfHook +, meson +, ninja , pkgconfig }: stdenv.mkDerivation rec { - version = "0.1.0"; + version = "0.1.2"; pname = "libmicrodns"; src = fetchFromGitHub { owner = "videolabs"; repo = pname; rev = version; - sha256 = "1pmf461zn35spbpbls1ih68ki7f8g8xjwhzr2csy63nnyq2k9jji"; + sha256 = "1yb0j0acidp494d28wqhzhrfski2qjb2a5mp5bq5qrpcg38zyz6i"; }; nativeBuildInputs = [ - autoreconfHook + meson + ninja pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmwaw/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmwaw/default.nix index a7e52376e3..fbba02fcd0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmwaw/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmwaw/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libmwaw"; - version="0.3.15"; + version="0.3.16"; name="${baseName}-${version}"; - hash="1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04"; - url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.15/libmwaw-0.3.15.tar.xz"; - sha256="1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04"; + hash="0s0qvrmxzs8wv4304p7zx9mrasglyaszafqrfmaxwyr9lpdrwqqc"; + url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.16/libmwaw-0.3.16.tar.xz"; + sha256="0s0qvrmxzs8wv4304p7zx9mrasglyaszafqrfmaxwyr9lpdrwqqc"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmypaint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmypaint/default.nix index 409867695f..5cb971f5db 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmypaint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmypaint/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libmypaint"; - version = "1.5.1"; + version = "1.6.0"; outputs = [ "out" "dev" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "mypaint"; repo = "libmypaint"; rev = "v${version}"; - sha256 = "1pxx8fjdabcindxhzgbhg4p7yanl4ihbd8kq71y2nyi9dqsjr2fw"; + sha256 = "1fdyywm915mmilfmzp7lz4rnmm05kkw0adrdqpqi4n8icp4d530g"; }; nativeBuildInputs = [ @@ -43,10 +43,6 @@ stdenv.mkDerivation rec { doCheck = true; - postPatch = '' - sed 's|python2|python|' -i autogen.sh - ''; - preConfigure = "./autogen.sh"; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnfc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnfc/default.nix index c3661a233a..ed7412d661 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnfc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnfc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb, readline }: +{ stdenv, fetchurl, libusb-compat-0_1, readline }: stdenv.mkDerivation { pname = "libnfc"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0wj0iwwcpmpalyk61aa7yc6i4p9hgdajkrgnlswgk0vnwbc78pll"; }; - buildInputs = [ libusb readline ]; + buildInputs = [ libusb-compat-0_1 readline ]; meta = with stdenv.lib; { description = "Open source library libnfc for Near Field Communication"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpgf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpgf/default.nix index f262a7da13..7710c20819 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpgf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpgf/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { # configureFlags = optional static "--enable-static --disable-shared"; meta = { - homepage = "http://www.libpgf.org/"; + homepage = "https://www.libpgf.org/"; description = "Progressive Graphics Format"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqmatrixclient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqmatrixclient/default.nix deleted file mode 100644 index 8027fd46ea..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libqmatrixclient/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake -, qtbase, qtmultimedia }: - -let - generic = version: sha256: prefix: stdenv.mkDerivation { - pname = "libqmatrixclient"; - inherit version; - - src = fetchFromGitHub { - owner = "QMatrixClient"; - repo = "libqmatrixclient"; - rev = "${prefix}${version}"; - inherit sha256; - }; - - postPatch = '' - sed -i -e '/example/Id' CMakeLists.txt - ''; - - buildInputs = [ qtbase qtmultimedia ]; - - nativeBuildInputs = [ cmake ]; - - meta = with stdenv.lib; { - description= "A Qt5 library to write cross-platfrom clients for Matrix"; - homepage = "https://matrix.org/docs/projects/sdk/libqmatrixclient.html"; - license = licenses.lgpl21; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ peterhoeg ]; - }; - }; - -in rec { - libqmatrixclient_0_4 = generic "0.4.2.1" "056hvp2m74wx72yd8vai18siddj9l8bhrvrkc4ia4cwjsqw02kid" "v"; - libqmatrixclient_0_5 = generic "0.5.2" "1bhlqfs7251fss4icx794ka614npr6zyrpp4qwc4q5408ykfm7lr" ""; - - libqmatrixclient = libqmatrixclient_0_4; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix new file mode 100644 index 0000000000..9ece2c13bd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix @@ -0,0 +1,24 @@ +{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, qtmultimedia }: + +mkDerivation rec { + pname = "libquotient"; + version = "0.5.3.2"; + + src = fetchFromGitHub { + owner = "quotient-im"; + repo = "libQuotient"; + rev = version; + sha256 = "0gkwr3yw6k2m0j8cc085b5p2q788rf5nhp1p5hc5d55pc7mci2qs"; + }; + + buildInputs = [ qtbase qtmultimedia ]; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "A Qt5 library to write cross-platfrom clients for Matrix"; + homepage = "https://matrix.org/docs/projects/sdk/quotient"; + maintainers = with maintainers; [ colemickens ]; + license = licenses.lgpl21; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libusb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libusb-compat/0.1.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/libusb/default.nix rename to third_party/nixpkgs/pkgs/development/libraries/libusb-compat/0.1.nix diff --git a/third_party/nixpkgs/pkgs/development/libraries/libva-utils/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libva-utils/default.nix index a3c7cf05cf..a4de995ada 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libva-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libva-utils/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { inherit (libva) version; src = fetchFromGitHub { - owner = "01org"; + owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "1yk9bg1wg4nqva3l01s6bghcvc3hb02gp62p1sy5qk0r9mn5kpik"; + sha256 = "13a0dccphi4cpr2cx45kg4djxsssi3d1fcjrkx27b16xiayp5lx9"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; @@ -26,10 +26,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "VAAPI tools: Video Acceleration API"; - homepage = "http://www.freedesktop.org/wiki/Software/vaapi"; + description = "A collection of utilities and examples for VA-API"; + longDescription = '' + libva-utils is a collection of utilities and examples to exercise VA-API + in accordance with the libva project. + ''; + homepage = "https://github.com/intel/libva-utils"; + changelog = "https://raw.githubusercontent.com/intel/libva-utils/${version}/NEWS"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ primeos ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix index be374eaf89..86c6a88b1e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { name = "libva-${lib.optionalString minimal "minimal-"}${version}"; - version = "2.6.1"; + version = "2.7.1"; # Also update the hash for libva-utils! # update libva-utils and vaapiIntel as well src = fetchFromGitHub { - owner = "01org"; + owner = "intel"; repo = "libva"; rev = version; - sha256 = "1x34kf38p5rf52bf54ljr9f7knnbilm7kbszqnfk3lzsqrfc7r2g"; + sha256 = "0ywasac7z3hwggj8szp83sbxi2naa0a3amblx64y7i1hyyrn0csq"; }; outputs = [ "dev" "out" ]; @@ -38,10 +38,17 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "VAAPI library: Video Acceleration API"; - homepage = "http://www.freedesktop.org/wiki/Software/vaapi"; + description = "An implementation for VA-API (Video Acceleration API)"; + longDescription = '' + VA-API is an open-source library and API specification, which provides + access to graphics hardware acceleration capabilities for video + processing. It consists of a main library (this package) and + driver-specific acceleration backends for each supported hardware vendor. + ''; + homepage = "https://01.org/linuxmedia/vaapi"; + changelog = "https://raw.githubusercontent.com/intel/libva/${version}/NEWS"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ primeos ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/lirc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lirc/default.nix index 30d114122b..97079be096 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lirc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lirc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, help2man, python3, - alsaLib, xlibsWrapper, libxslt, systemd, libusb, libftdi1 }: + alsaLib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }: stdenv.mkDerivation rec { name = "lirc-0.10.1"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig help2man (python3.withPackages (p: with p; [ pyyaml setuptools ])) ]; - buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb libftdi1 ]; + buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb-compat-0_1 libftdi1 ]; configureFlags = [ "--sysconfdir=/etc" @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Allows to receive and send infrared signals"; - homepage = "http://www.lirc.org/"; + homepage = "https://www.lirc.org/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix index c4d8622008..22b6644230 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix @@ -1,35 +1,60 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig -, boost, openssl, zlib, libsodium, olm, nlohmann_json }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, pkgconfig +, boost17x +, openssl +, zlib +, libsodium +, olm +, spdlog +, nlohmann_json +}: stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "0pycznrvj57ff6gbwfn1xj943d2dr4vadl79hii1z16gn0nzxpmj"; + sha256 = "0vf5xmn6yfi5lvskfgrdmnalvclzrapcrml92bj9qaa8vq8mfsf2"; }; cmakeFlags = [ + # Network requiring tests can't be disabled individually: + # https://github.com/Nheko-Reborn/mtxclient/issues/22 "-DBUILD_LIB_TESTS=OFF" "-DBUILD_LIB_EXAMPLES=OFF" "-Dnlohmann_json_DIR=${nlohmann_json}/lib/cmake/nlohmann_json" + # Can be removed once either https://github.com/NixOS/nixpkgs/pull/85254 or + # https://github.com/NixOS/nixpkgs/pull/73940 are merged + "-DBoost_NO_BOOST_CMAKE=TRUE" ]; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ boost openssl zlib libsodium olm ]; + nativeBuildInputs = [ + cmake + pkgconfig + ]; + buildInputs = [ + spdlog + boost17x + openssl + zlib + libsodium + olm + ]; meta = with stdenv.lib; { description = "Client API library for Matrix, built on top of Boost.Asio"; homepage = "https://github.com/Nheko-Reborn/mtxclient"; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; - platforms = platforms.unix; - - # As of 2019-06-30, all of the dependencies are available on macOS but the - # package itself does not build. - broken = stdenv.isDarwin; + platforms = platforms.all; + # Should be fixable if a higher clang version is used, see: + # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 + broken = stdenv.targetPlatform.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/ndi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ndi/default.nix index 7a4407a17f..ec39bbd659 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ndi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ndi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ndi"; - fullVersion = "4.1.6"; + fullVersion = "4.5.1"; version = builtins.head (builtins.splitVersion fullVersion); src = requireFile rec { name = "InstallNDISDK_v${version}_Linux.tar.gz"; - sha256 = "0hki805j3hlci6w5ca2cajm5q0y9yihgvpsykkn8dzx8chw4pmsk"; + sha256 = "04l57cfc88cdqa9015h5g1csr7xfjxp75x8qz8bsqk1dizp9ir6r"; message = '' In order to use NDI SDK version ${fullVersion}, you need to comply with NewTek's license and download the appropriate Linux tarball from: diff --git a/third_party/nixpkgs/pkgs/development/libraries/openct/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openct/default.nix index f8977c1b59..27a832daf4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openct/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcsclite, libusb +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcsclite, libusb-compat-0_1 , doxygen, libxslt }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ pcsclite libusb doxygen libxslt ]; + buildInputs = [ pcsclite libusb-compat-0_1 doxygen libxslt ]; preInstall = '' mkdir -p $out/etc diff --git a/third_party/nixpkgs/pkgs/development/libraries/openexr/bootstrap.patch b/third_party/nixpkgs/pkgs/development/libraries/openexr/bootstrap.patch deleted file mode 100644 index af6669c16a..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/openexr/bootstrap.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ur openexr-v2.2.0-src-orig/OpenEXR/bootstrap openexr-v2.2.0-src/OpenEXR/bootstrap ---- OpenEXR/bootstrap 2015-03-31 01:02:41.000000000 -0400 -+++ OpenEXR/bootstrap 2015-03-31 01:03:35.000000000 -0400 -@@ -47,11 +47,6 @@ - fi - } - --# Check if /usr/local/share/aclocal exists --if [ -d /usr/local/share/aclocal ]; then -- ACLOCAL_INCLUDE="$ACLOCAL_INCLUDE -I /usr/local/share/aclocal" --fi -- - run_cmd aclocal -I m4 $ACLOCAL_INCLUDE - run_cmd $LIBTOOLIZE --automake --copy - run_cmd automake --add-missing --copy diff --git a/third_party/nixpkgs/pkgs/development/libraries/openexr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openexr/default.nix index 328bce3535..81a5ab1db9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openexr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openexr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchurl, autoconf, automake, libtool, pkgconfig, +{ lib, stdenv, buildPackages, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, zlib, ilmbase, fetchpatch }: let @@ -8,22 +8,16 @@ in stdenv.mkDerivation rec { pname = "openexr"; - version = lib.getVersion ilmbase; + version = "2.4.1"; - src = fetchurl { - url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "19jywbs9qjvsbkvlvzayzi81s976k53wg53vw4xj66lcgylb6v7x"; + src = fetchFromGitHub { + owner = "AcademySoftwareFoundation"; + repo = "openexr"; + rev = "v${version}"; + sha256 = "020gyl8zv83ag6gbcchmqiyx9rh2jca7j8n52zx1gk4rck7kwc01"; }; - patches = [ - ./bootstrap.patch - (fetchpatch { - name = "CVE-2018-18444.patch"; - url = "https://github.com/openexr/openexr/commit/1b0f1e5d7dcf2e9d6cbb4e005e803808b010b1e0.patch"; - sha256 = "0f5m4wdwqqg8wfg7azzsz5yfpdrvws314rd4sqfc74j1g6wrcnqj"; - stripLen = 1; - }) - ]; + sourceRoot = "source/OpenEXR"; outputs = [ "bin" "dev" "out" "doc" ]; @@ -48,6 +42,9 @@ stdenv.mkDerivation rec { ./bootstrap ''; + # otherwise, the pkgconfig info for the libraries will not match the filenames + configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--enable-namespaceversioning=no"; + nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; propagatedBuildInputs = [ ilmbase zlib ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix index cc9e44d990..b5adc78c7c 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.49"; + name = "openldap-2.4.50"; src = fetchurl { url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; - sha256 = "0vp524rsngdcykf6ki7vprsyg7gj8z7hszg8xwxz50219fa1gcg3"; + sha256 = "1f46nlfwmys110j36sifm7ah8m8f3s10c3vaiikmmigmifapvdaw"; }; # 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 30085e950a..627ac68d68 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, fetchpatch, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc, pkgsTargetTarget, symlinkJoin +, libpsm2, libfabric # Enable CUDA support , cudaSupport ? false, cudatoolkit ? null @@ -9,6 +10,10 @@ # Pass PATH/LD_LIBRARY_PATH to point to current mpirun by default , enablePrefix ? false + +# Enable libfabric support (necessary for Omnipath networks) on x86_64 linux +, fabricSupport ? stdenv.isLinux && stdenv.isx86_64 + }: assert !cudaSupport || cudatoolkit != null; @@ -44,7 +49,8 @@ in stdenv.mkDerivation rec { ++ lib.optionals isLinux [ libnl numactl ] ++ lib.optionals cudaSupport [ cudatoolkit ] ++ [ libevent hwloc ] - ++ lib.optional (isLinux || isFreeBSD) rdma-core; + ++ lib.optional (isLinux || isFreeBSD) rdma-core + ++ lib.optional fabricSupport [ libpsm2 libfabric ]; nativeBuildInputs = [ perl ]; @@ -56,6 +62,7 @@ in stdenv.mkDerivation rec { # https://github.com/openucx/ucx # https://www.open-mpi.org/faq/?category=buildcuda ++ lib.optionals cudaSupport [ "--with-cuda=${cudatoolkit_joined}" "--enable-dlopen" ] + ++ lib.optionals fabricSupport [ "--with-psm2=${libpsm2}" "--with-libfabric=${libfabric}" ] ; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix index d821a6c8f5..43170f25d3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -155,8 +155,8 @@ in { }; openssl_1_1 = common { - version = "1.1.1f"; - sha256 = "186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35"; + version = "1.1.1g"; + sha256 = "0ikdcc038i7jk8h7asq5xcn8b1xc2rrbc88yfm4hqbz3y5s4gc6x"; patches = [ ./1.1/nix-ssl-cert-file.patch 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 a13e674646..204de957f3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix @@ -26,14 +26,16 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" - "--without-trust-paths" - ]; # TODO: store trust anchors in a directory common to Nix and NixOS + "--with-trust-paths=/etc/ssl/certs/ca-certificates.crt" + ]; enableParallelBuilding = true; doCheck = !stdenv.isDarwin; - installFlags = [ "exampledir=\${out}/etc/pkcs11" ]; + installFlags = [ + "exampledir=${placeholder "out"}/etc/pkcs11" + ]; meta = with stdenv.lib; { description = "Library for loading and sharing PKCS#11 modules"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/packr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/packr/default.nix index 4482a9cd31..6a53743a10 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/packr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/packr/default.nix @@ -1,22 +1,46 @@ { buildGoModule , fetchFromGitHub , lib +, stdenv +, symlinkJoin }: -buildGoModule rec { - pname = "packr"; - version = "2.7.1"; +let p2 = buildGoModule rec { + pname = "packr2"; + version = "2.8.0"; src = fetchFromGitHub { owner = "gobuffalo"; - repo = pname; + repo = "packr"; rev = "v${version}"; - sha256 = "0m5kl2fq8gf1v4vllgag2xl8fd382sdgqrcdb8f5alsnrdn08kb9"; + sha256 = "1x78yq2yg0r82h7a67078llni85gk9nbd2ismlbqgppap7fcpyai"; + }+"/v2"; + + subPackages = [ "packr2" ]; + + modSha256 = "1xxqyn78074jna0iri7sks6b2l4sdnn5sg57n09vrrf6kh39h2y9"; + + meta = with stdenv.lib; { + description = "The simple and easy way to embed static files into Go binaries"; + homepage = "https://github.com/gobuffalo/packr"; + license = licenses.mit; + maintainers = with maintainers; [ mmahut ]; + }; +}; +p1 = buildGoModule rec { + pname = "packr1"; + version = "2.8.0"; + + src = fetchFromGitHub { + owner = "gobuffalo"; + repo = "packr"; + rev = "v${version}"; + sha256 = "1x78yq2yg0r82h7a67078llni85gk9nbd2ismlbqgppap7fcpyai"; }; - subPackages = [ "packr" "v2/packr2" ]; + subPackages = [ "packr" ]; - modSha256 = "0afhkvivma16bi8rz3kwcsz9mhmcn4zm6rrymxkvazx6b844hcdv"; + modSha256 = "045qfdi82yhpghjd0cimxhas4nkj7g30n9qyvkrl9ck01sahx76f"; meta = with lib; { description = "The simple and easy way to embed static files into Go binaries"; @@ -24,4 +48,9 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ mmahut ]; }; +}; +in +symlinkJoin{ + name = "packr"; + paths = [p1 p2]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcg-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcg-c/default.nix index 550842e9f9..593794c9c4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pcg-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pcg-c/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "A family of better random number generators"; - homepage = "http://www.pcg-random.org/"; + homepage = "https://www.pcg-random.org/"; license = stdenv.lib.licenses.asl20; longDescription = '' PCG is a family of simple fast space-efficient statistically good diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix index 197282c5ac..d873555c0f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitLab +, fetchpatch , meson , ninja , pkgconfig @@ -72,6 +73,13 @@ stdenv.mkDerivation rec { vulkan-loader xorg.libX11 ]; + patches = [ + # fix SIGILL in fmt-ops: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/227 + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1b3aaba206f48e75bb34ff0cd00321bd3d6db2b4.patch"; + sha256 = "08bmr9k2r0q4r7vhhm28k558nk3mz3jfnqswvq9mcj7p0srmfb4x"; + }) + ]; mesonFlags = [ "-Ddocs=true" diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.11.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.11.nix index fa238fdca5..c5d8b21b1a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.11.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.11.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.11.3"; - sha256 = "0cn6h6fg5h64q5h3ncfwr3m7yszf5n9gpvgpv7s1csndp0ffzmin"; + version = "3.11.4"; + sha256 = "00g61f1yd8z5l0z0svmr3hms38ph35lcx2y7hivw6fahslw0l8yw"; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix b/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix index 201c332dfd..ed3d7ae9e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "raft-canonical"; - version = "0.9.17"; + version = "0.9.18"; src = fetchFromGitHub { owner = "canonical"; repo = "raft"; rev = "v${version}"; - sha256 = "0q444wd6wz85g4zjkdsrf8z7chkjq9rxzq8l6fh37mgf7c23hv09"; + sha256 = "0f613aiyxqskz9d10f7r37ar9ngqsf9qsyk3jjf7s5l14wh6vl5k"; }; nativeBuildInputs = [ autoreconfHook file pkgconfig ]; 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 599c1be664..5a2c28d3c0 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.2.1"; + version = "3.2.2"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "AAwwzrpKFHy40Ldm6hTO6L0FWPYwi3kJj3zrshFwYas="; + sha256 = "04hprrgj0f44ml2f0w4jfwgrvy8l2s6ya0c9xc8gwlbmkc7a4c62"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/scmccid/default.nix b/third_party/nixpkgs/pkgs/development/libraries/scmccid/default.nix index 5b07482507..0d980d9d1a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/scmccid/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/scmccid/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, patchelf, libusb}: +{stdenv, fetchurl, patchelf, libusb-compat-0_1}: assert stdenv ? cc && stdenv.cc.libc != null; @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ patchelf ]; installPhase = '' - RPATH=${libusb.out}/lib:${stdenv.cc.libc.out}/lib + RPATH=${libusb-compat-0_1.out}/lib:${stdenv.cc.libc.out}/lib for a in proprietary/*/Contents/Linux/*.so*; do if ! test -L $a; then diff --git a/third_party/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix index 1c74ced309..52b39ddc25 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentencepiece"; - version = "0.1.85"; + version = "0.1.86"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "1ncvyw9ar0z7nd47cysxg5xrjm01y1shdlhp8l2pdpx059p3yx3w"; + sha256 = "0r4z5n3dx0bg1pm2kgfllyj65s7ljn2ny7i7c5bz618r7h8bax9p"; }; nativeBuildInputs = [ cmake ] ++ lib.optional withGPerfTools gperftools; diff --git a/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix index f418ecda89..22370cee44 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix @@ -1,35 +1,36 @@ { stdenv , fetchurl -, pkgconfig +, acl +, cyrus_sasl +, docbook_xsl +, epoxy +, gettext +, gobject-introspection +, gst_all_1 +, gtk-doc +, gtk3 +, json-glib +, libcacard +, libdrm +, libjpeg_turbo +, libopus +, libsoup +, libusb1 +, lz4 , meson , ninja +, openssl +, perl +, phodav +, pixman +, pkgconfig +, polkit , python3 , spice-protocol -, gettext -, openssl -, pixman -, gobject-introspection -, libjpeg_turbo -, zlib -, cyrus_sasl , usbredir -, libsoup -, polkit -, acl , usbutils , vala -, gtk3 -, epoxy -, libdrm -, gst_all_1 -, phodav -, libopus -, gtk-doc -, json-glib -, lz4 -, libcacard -, perl -, docbook_xsl +, zlib , withPolkit ? true }: @@ -99,9 +100,10 @@ stdenv.mkDerivation rec { libcacard libdrm libjpeg_turbo + libopus + libusb1 lz4 openssl - libopus phodav pixman spice-protocol diff --git a/third_party/nixpkgs/pkgs/development/libraries/ti-rpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ti-rpc/default.nix index 8bc3c0a6e0..db434a5e62 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ti-rpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ti-rpc/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, autoreconfHook, libkrb5 }: stdenv.mkDerivation rec { - name = "libtirpc-1.2.5"; + name = "libtirpc-1.2.6"; src = fetchurl { url = "mirror://sourceforge/libtirpc/${name}.tar.bz2"; - sha256 = "1jl6a5kkw2vrp4gb6pmvf72rqimywvwfb9f7iz2xjg4wgq63bdpk"; + sha256 = "1k6i6wma3xs7gmp54z587nd4yi5wrvg2ycl5g36zjnhx32jyjy22"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tweeny/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tweeny/default.nix new file mode 100644 index 0000000000..d3c30028ba --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/tweeny/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "tweeny"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "mobius3"; + repo = "tweeny"; + rev = "v${version}"; + sha256 = "0qvby57g9a2m4afd1mgard3k7nm4ynbvali7nzm1qn3ygdmqid7n"; + }; + + nativeBuildInputs = [ + cmake + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "A modern C++ tweening library"; + license = licenses.mit; + homepage = "http://mobius3.github.io/tweeny"; + maintainers = [ maintainers.doronbehar ]; + platforms = with platforms; darwin ++ linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/unicap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/unicap/default.nix index 2c2b814b68..87ca28fee9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/unicap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/unicap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l-utils }: +{ stdenv, fetchurl, libusb-compat-0_1, libraw1394, dcraw, intltool, perl, v4l-utils }: stdenv.mkDerivation rec { pname = "libunicap"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9"; }; - buildInputs = [ libusb libraw1394 dcraw intltool perl v4l-utils ]; + buildInputs = [ libusb-compat-0_1 libraw1394 dcraw intltool perl v4l-utils ]; patches = [ # Debian has a patch that fixes the build. diff --git a/third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix b/third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix index 971e053d4f..de621b30e2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix @@ -1,19 +1,30 @@ -{ lib, stdenv, fetchurl, gtest, pkgconfig, doxygen, graphviz }: +{ lib, stdenv, fetchurl, fetchpatch, cmake, gtest }: stdenv.mkDerivation rec { pname = "uriparser"; - version = "0.9.1"; + version = "0.9.3"; # Release tarball differs from source tarball src = fetchurl { url = "https://github.com/uriparser/uriparser/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2"; - sha256 = "1gisi7h8hd6mswbiaaa3s25bnb77xf37pzrmjy63rcdpwcyqy93m"; + sha256 = "13z234jdaqs9jj7i66gcv4q1rgsypjz6cighnlm1j4g80pdlmbr8"; }; - nativeBuildInputs = [ pkgconfig doxygen graphviz ]; - buildInputs = lib.optional doCheck gtest; - configureFlags = lib.optional (!doCheck) "--disable-tests"; + patches = [ + # fixes tests + (fetchpatch { + url = "https://github.com/uriparser/uriparser/commit/f870e6c68696a6018702caa5c8a2feba9b0f99fa.diff"; + sha256 = "1nd6bhys9hwy6ippa42vm95zhw6hldm1s4xbdzmdjswc96as1ff5"; + }) + ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DURIPARSER_BUILD_DOCS=OFF" + ]; + + checkInputs = [ gtest ]; doCheck = stdenv.targetPlatform.system == stdenv.hostPlatform.system; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/usbredir/default.nix b/third_party/nixpkgs/pkgs/development/libraries/usbredir/default.nix index 79cac73849..2ac7c823e2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/usbredir/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/usbredir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb }: +{ stdenv, fetchurl, pkgconfig, libusb1 }: stdenv.mkDerivation rec { pname = "usbredir"; @@ -12,14 +12,13 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb ]; - propagatedBuildInputs = [ libusb ]; + propagatedBuildInputs = [ libusb1 ]; outputs = [ "out" "dev" ]; meta = with stdenv.lib; { description = "USB traffic redirection protocol"; - homepage = "http://spice-space.org/page/UsbRedir"; + homepage = "https://www.spice-space.org/usbredir.html"; license = licenses.lgpl21; maintainers = [ maintainers.offline ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vtk/default.nix index a7e1bc4329..6a7e26c753 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vtk/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { # At least, we use -fPIC for other packages to be able to use this in shared # objects. cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" ] - ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ] + ++ optional (qtLib != null) [ "-DVTK_Group_Qt:BOOL=ON" ] ++ optional stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] ++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ]; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source libraries for 3D computer graphics, image processing and visualization"; - homepage = "http://www.vtk.org/"; + homepage = "https://www.vtk.org/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; platforms = with stdenv.lib.platforms; unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index f1a5ddfd4a..84ffd2cd81 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -61,13 +61,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.28.1"; + version = "2.28.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "rLwmo+1cE/OeRodc9EepwFQbbPsX+eeIQyNDHLMn89g="; + sha256 = "udI1Jc/Y0iw3tdlkqf6ajOdYMEKi+NOSLnHmu8aMML0="; }; patches = optionals stdenv.isLinux [ diff --git a/third_party/nixpkgs/pkgs/development/misc/amdadl-sdk/default.nix b/third_party/nixpkgs/pkgs/development/misc/amdadl-sdk/default.nix deleted file mode 100644 index 236480598b..0000000000 --- a/third_party/nixpkgs/pkgs/development/misc/amdadl-sdk/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ requireFile, stdenv, unzip }: - -stdenv.mkDerivation { - version = "6.0"; - pname = "amdadl-sdk"; - - src = requireFile { - name = "ADL_SDK_6.0.zip"; - url = "http://developer.amd.com/tools-and-sdks/graphics-development/display-library-adl-sdk/"; - sha256 = "429f4fd1edebb030d6366f4e0a877cf105e4383f7dd2ccf54e5aef8f2e4242c9"; - }; - - buildInputs = [ unzip ]; - - doCheck = false; - - unpackPhase = '' - unzip $src - ''; - - patchPhase = '' - sed -i -e '/include/a \#include ' include/adl_structures.h || die - ''; - - buildPhase = '' - #Build adlutil - cd adlutil - gcc main.c -o adlutil -DLINUX -ldl -I ../include/ - cd .. - ''; - - installPhase = '' - #Install SDK - mkdir -p $out/bin - cp -r include "$out/" - cp "adlutil/adlutil" "$out/bin/adlutil" - - #Fix modes - chmod -R 755 "$out/bin/" - ''; - - meta = with stdenv.lib; { - description = "API to access display driver functionality for ATI graphics cards"; - homepage = "https://developer.amd.com/tools/graphics-development/display-library-adl-sdk/"; - license = licenses.unfree; - maintainers = [ maintainers.offline ]; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/misc/amdapp-sdk/01-remove-aparapi-samples.patch b/third_party/nixpkgs/pkgs/development/misc/amdapp-sdk/01-remove-aparapi-samples.patch deleted file mode 100644 index f474f76f01..0000000000 --- a/third_party/nixpkgs/pkgs/development/misc/amdapp-sdk/01-remove-aparapi-samples.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- samples/Makefile 2012-11-29 05:58:48.000000000 +0100 -+++ samples/Makefile 2012-12-30 20:13:30.926576277 +0100 -@@ -3,7 +3,6 @@ - include $(DEPTH)/make/openclsdkdefs.mk - - SUBDIRS = opencl --SUBDIRS += aparapi - ifneq ($(OS), lnx) - SUBDIRS += C++Amp - ifeq ($(BITS), 64) diff --git a/third_party/nixpkgs/pkgs/development/misc/amdapp-sdk/default.nix b/third_party/nixpkgs/pkgs/development/misc/amdapp-sdk/default.nix deleted file mode 100644 index 68109e05e6..0000000000 --- a/third_party/nixpkgs/pkgs/development/misc/amdapp-sdk/default.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, perl, libGLU, libGL, xorg, - version? "2.8", # What version - samples? false # Should samples be installed -}: - -let - - bits = if stdenv.hostPlatform.system == "x86_64-linux" then "64" - else "32"; - - arch = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" - else "x86"; - - src_info = { - "2.6" = { - url = "http://download2-developer.amd.com/amd/APPSDK/AMD-APP-SDK-v2.6-lnx${bits}.tgz"; - x86 = "03vyvqp44f96036zsyy8n21ymbzy2bx09hlbd6ci3ikj8g7ic1dm"; - x86_64 = "1fj55358s4blxq9bp77k07gqi22n5nfkzwjkbdc62gmy1zxxlhih"; - }; - - "2.7" = { - url = "http://download2-developer.amd.com/amd/APPSDK/AMD-APP-SDK-v2.7-lnx${bits}.tgz"; - x86 = "1v26n7g1xvlg5ralbfk3qiy34gj8fascpnjzm3120b6sgykfp16b"; - x86_64 = "08bi43bgnsxb47vbirh09qy02w7zxymqlqr8iikk9aavfxjlmch1"; - patches = [ ./gcc-5.patch]; - }; - - "2.8" = { - url = "https://developer.amd.com/wordpress/media/2012/11/AMD-APP-SDK-v2.8-lnx${bits}.tgz"; - x86 = "99610737f21b2f035e0eac4c9e776446cc4378a614c7667de03a82904ab2d356"; - x86_64 = "d9c120367225bb1cd21abbcf77cb0a69cfb4bb6932d0572990104c566aab9681"; - - # TODO: Add support for aparapi, java parallel api - patches = [ ./01-remove-aparapi-samples.patch ./gcc-5.patch]; - }; - }; - -in stdenv.mkDerivation { - pname = "amdapp-sdk"; - inherit version; - - src = fetchurl { - url = stdenv.lib.getAttrFromPath [version "url"] src_info; - sha256 = stdenv.lib.getAttrFromPath [version arch] src_info; - }; - - patches = stdenv.lib.attrByPath [version "patches"] [] src_info; - - patchFlags = [ "-p0" ]; - buildInputs = [ makeWrapper perl libGLU libGL xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ]; - propagatedBuildInputs = [ stdenv.cc ]; - NIX_LDFLAGS = "-lX11 -lXext -lXmu -lXi -lXxf86vm"; - doCheck = false; - - unpackPhase = '' - tar xvzf $src - tar xf AMD-APP-SDK-v${version}-*-lnx${bits}.tgz - cd AMD-APP-SDK-v${version}-*-lnx${bits} - ''; - - buildPhase = if !samples then ''echo "nothing to build"'' else null; - - installPhase = '' - # Install SDK - mkdir -p $out - cp -r {docs,include} "$out/" - mkdir -p "$out/"{bin,lib,samples/opencl/bin} - cp -r "./bin/${arch}/clinfo" "$out/bin/clinfo" - cp -r "./lib/${arch}/"* "$out/lib/" - - # Register ICD - mkdir -p "$out/etc/OpenCL/vendors" - echo "$out/lib/libamdocl${bits}.so" > "$out/etc/OpenCL/vendors/amd.icd" - # The OpenCL ICD specifications: http://www.khronos.org/registry/cl/extensions/khr/cl_khr_icd.txt - - # Install includes - mkdir -p "$out/usr/include/"{CAL,OpenVideo} - install -m644 './include/OpenVideo/'{OVDecode.h,OVDecodeTypes.h} "$out/usr/include/OpenVideo/" - - ${ if samples then '' - # Install samples - find ./samples/opencl/ -mindepth 1 -maxdepth 1 -type d -not -name bin -exec cp -r {} "$out/samples/opencl" \; - cp -r "./samples/opencl/bin/${arch}/"* "$out/samples/opencl/bin" - for f in $(find "$out/samples/opencl/bin/" -type f -not -name "*.*"); - do - wrapProgram "$f" --prefix PATH ":" "${stdenv.cc}/bin" - done'' else "" - } - - # Create wrappers - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/clinfo - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib $out/bin/clinfo - - # Fix modes - find "$out/" -type f -exec chmod 644 {} \; - chmod -R 755 "$out/bin/" - find "$out/samples/opencl/bin/" -type f -name ".*" -exec chmod 755 {} \; - find "$out/samples/opencl/bin/" -type f -not -name "*.*" -exec chmod 755 {} \; - ''; - - meta = with stdenv.lib; { - description = "AMD Accelerated Parallel Processing (APP) SDK, with OpenCL 1.2 support"; - homepage = "https://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/"; - license = licenses.amd; - maintainers = [ maintainers.offline ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/misc/amdapp-sdk/gcc-5.patch b/third_party/nixpkgs/pkgs/development/misc/amdapp-sdk/gcc-5.patch deleted file mode 100644 index dc8538db4c..0000000000 --- a/third_party/nixpkgs/pkgs/development/misc/amdapp-sdk/gcc-5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- include/CL/cl.hpp -+++ include/CL/cl.hpp -@@ -201,7 +201,7 @@ - #include - #define __CL_FUNCTION_TYPE typename std::function - #define CL_USE_CPP_FUNCTORS --#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 1 && !defined(STLPORT)) || defined(__APPLE__) || defined(__MACOSX) -+#elif (((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ >= 5)) && !defined(STLPORT)) || defined(__APPLE__) || defined(__MACOSX) - #include - #define __CL_FUNCTION_TYPE typename std::tr1::function - #define CL_USE_CPP_FUNCTORS diff --git a/third_party/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix b/third_party/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix index 6bb6b683f5..3c7ff00151 100644 --- a/third_party/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix +++ b/third_party/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libusb, readline ? null }: +{ stdenv, fetchFromGitHub, libusb-compat-0_1, readline ? null }: let version = "0.25"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { sha256 = "0prgwb5vx6fd4bj12ss1bbb6axj2kjyriyjxqrzd58s5jyyy8d3c"; }; - buildInputs = [ libusb readline ]; + buildInputs = [ libusb-compat-0_1 readline ]; makeFlags = [ "PREFIX=$(out)" "INSTALL=install" ] ++ (if readline == null then [ "WITHOUT_READLINE=1" ] else []); diff --git a/third_party/nixpkgs/pkgs/development/mobile/webos/novacomd.nix b/third_party/nixpkgs/pkgs/development/mobile/webos/novacomd.nix index 4d62dd305d..932ec0e59d 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/webos/novacomd.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/webos/novacomd.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, webos, cmake, pkgconfig, -libusb }: +libusb-compat-0_1 }: stdenv.mkDerivation rec { pname = "novacomd"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig webos.cmake-modules ]; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; cmakeFlags = [ "-DWEBOS_TARGET_MACHINE_IMPL=host" ]; diff --git a/third_party/nixpkgs/pkgs/development/mobile/xpwn/default.nix b/third_party/nixpkgs/pkgs/development/mobile/xpwn/default.nix index 9ec5977d59..0c49a29b32 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/xpwn/default.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/xpwn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, libpng, bzip2, libusb, openssl }: +{ stdenv, fetchFromGitHub, cmake, zlib, libpng, bzip2, libusb-compat-0_1, openssl }: stdenv.mkDerivation rec { pname = "xpwn"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib libpng bzip2 libusb openssl ]; + buildInputs = [ zlib libpng bzip2 libusb-compat-0_1 openssl ]; meta = with stdenv.lib; { homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn"; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/default-v10.nix b/third_party/nixpkgs/pkgs/development/node-packages/default-v10.nix index 5d7e2c7668..9e9d8894f0 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/default-v10.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/default-v10.nix @@ -125,5 +125,8 @@ nodePackages // { thelounge = nodePackages.thelounge.override { buildInputs = [ nodePackages.node-pre-gyp ]; + postInstall = '' + echo /var/lib/thelounge > $out/lib/node_modules/thelounge/.thelounge_home + ''; }; } diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages-v10.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages-v10.json index 177b7fdf12..9ea5b2ec15 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages-v10.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages-v10.json @@ -35,6 +35,7 @@ , "coc-python" , "coc-r-lsp" , "coc-rls" +, "coc-rust-analyzer" , "coc-smartf" , "coc-snippets" , "coc-solargraph" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages-v10.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages-v10.nix index 434cc707ba..95edbef44e 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages-v10.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages-v10.nix @@ -54491,6 +54491,24 @@ in bypassCache = true; reconstructLock = true; }; + coc-rust-analyzer = nodeEnv.buildNodePackage { + name = "coc-rust-analyzer"; + packageName = "coc-rust-analyzer"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.5.5.tgz"; + sha512 = "l44UBTzSWkEL/uHb5GCR5m6HnheJmuJFbYqqJ+5n6Q+PJIpKSyzyNgMiC3nmsOWCT6W3Js83s1i6zTAu8Zy8LA=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "rust-analyzer for Vim/Neovim, works as an extension with coc.nvim"; + homepage = "https://github.com/fannheyward/coc-rust-analyzer#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; coc-smartf = nodeEnv.buildNodePackage { name = "coc-smartf"; packageName = "coc-smartf"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix index 21482266c2..b05190ed49 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix @@ -2,15 +2,15 @@ buildDunePackage rec { pname = "angstrom"; - version = "0.12.1"; + version = "0.13.0"; - minimumOCamlVersion = "4.03"; + minimumOCamlVersion = "4.04"; src = fetchFromGitHub { owner = "inhabitedtype"; repo = pname; rev = version; - sha256 = "0w0wavqzdy2hrh7cjyl9w72ad4vndhwhknwvyacvkwkja5wys5b2"; + sha256 = "0vzbwd8j34iv7n6gwqq2mf25q7rqpnpxnifb9ssxhq55p5dd1kp4"; }; checkInputs = [ alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/async_shell/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/async_shell/default.nix deleted file mode 100644 index 62b64a492d..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/async_shell/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{stdenv, buildOcaml, fetchurl, async_p4, core_p4, core_extended_p4}: - -buildOcaml rec { - name = "async_shell"; - version = "109.28.03"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/async_shell/archive/${version}.tar.gz"; - sha256 = "0b4497bea9124c5a665ee58fb0a73c5cbf2f757479df902e6870627196e6c105"; - }; - - propagatedBuildInputs = [ async_p4 core_p4 core_extended_p4 ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/async_shell"; - description = "Shell helpers for Async"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigstring/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigstring/default.nix new file mode 100644 index 0000000000..c74676e4a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigstring/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildDunePackage }: + +buildDunePackage rec { + pname = "bigstring"; + version = "0.2"; + + minimumOCamlVersion = "4.03"; + + src = fetchFromGitHub { + owner = "c-cube"; + repo = "ocaml-bigstring"; + rev = version; + sha256 = "0ypdf29cmwmjm3djr5ygz8ls81dl41a4iz1xx5gbcdpbrdiapb77"; + }; + + doCheck = true; + + meta = with lib; { + homepage = https://github.com/c-cube/ocaml-bigstring; + description = "Bigstring built on top of bigarrays, and convenient functions"; + license = licenses.bsd2; + maintainers = [ maintainers.alexfmpe ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/core_extended/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/core_extended/default.nix deleted file mode 100644 index b657e812fd..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/core_extended/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, buildOcaml, fetchurl, bin_prot_p4, comparelib, core_p4, custom_printf, - fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils_p4, re2_p4, sexplib_p4}: - -buildOcaml rec { - name = "core_extended"; - version = "112.24.00"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/core_extended/archive/${version}.tar.gz"; - sha256 = "f87b0661b6c2cfb545ec61d1cb2ab1b9c4967b6ac14e651de41d3a6fb7f0f1e3"; - }; - - preConfigure = stdenv.lib.optionalString stdenv.isLinux '' - patch lib/extended_unix_stubs.c < #define _LINUX_QUOTA_VERSION 2 - EOF - ''; - - hasSharedObjects = true; - buildInputs = [ pa_bench pa_test pa_ounit ]; - propagatedBuildInputs = [bin_prot_p4 comparelib core_p4 custom_printf fieldslib_p4 - pipebang textutils_p4 re2_p4 sexplib_p4 ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/core_extended"; - description = "Jane Street Capital's standard library overlay"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix index 2a4d7004fa..787854f8e4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix @@ -1,30 +1,29 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib -, ocamlbuild, topkg +{ lib, fetchurl, buildDunePackage, alcotest , uri, xmlm, omd, ezjsonm }: -stdenv.mkDerivation rec { - version = "2.2.0"; - pname = "ocaml-cow"; +buildDunePackage rec { + minimumOCamlVersion = "4.02.3"; - src = fetchFromGitHub { - owner = "mirage"; - repo = "ocaml-cow"; - rev = "v${version}"; - sha256 = "0snhabg7rfrrcq2ksr3qghiawd61cw3y4kp6rl7vs87j4cnk3kr2"; + version = "2.4.0"; + pname = "cow"; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-cow/releases/download/v${version}/cow-v${version}.tbz"; + sha256 = "1x77lwpskda4zyikwxh500xjn90pgdwz6jm7ca7f36pyav4vl6zx"; }; - buildInputs = [ ocaml ocamlbuild findlib topkg ]; propagatedBuildInputs = [ xmlm uri ezjsonm omd ]; + checkInputs = [ alcotest ]; + doCheck = true; - inherit (topkg) buildPhase installPhase; - - meta = with stdenv.lib; { + meta = with lib; { description = "Caml on the Web"; longDescription = '' - Caml on the Web (COW) is a set of parsers and syntax extensions to let you manipulate HTML, CSS, XML, JSON and Markdown directly from OCaml code. + Writing web-applications requires a lot of skills: HTML, XML, JSON and + Markdown, to name but a few! This library provides OCaml combinators + for these web formats. ''; license = licenses.isc; maintainers = [ maintainers.sternenseemann ]; - inherit (ocaml.meta) platforms; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client.nix index d007533fe4..0dd0541138 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client.nix @@ -1,10 +1,14 @@ -{ lib, buildDunePackage, dns, ocaml_lwt, mirage-clock, mirage-random, mirage-stack, mtime, randomconv }: +{ lib, buildDunePackage, dns, ocaml_lwt, mirage-clock, mirage-time +, mirage-random, mirage-stack, mirage-crypto-rng, mtime, randomconv }: buildDunePackage { pname = "dns-client"; inherit (dns) src version; - propagatedBuildInputs = [ dns mtime ocaml_lwt mirage-clock mirage-random mirage-stack randomconv ]; + useDune2 = true; + + propagatedBuildInputs = [ dns mtime ocaml_lwt randomconv mirage-clock mirage-time + mirage-random mirage-stack mirage-crypto-rng ]; meta = dns.meta // { description = "Pure DNS resolver API"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix index e2aac3367b..01bbffd40b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "dns"; - version = "4.4.1"; + version = "4.5.0"; minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz"; - sha256 = "18c09jf0kicv2xz40n367y774rg8qs07rr1vdk8bx8f7hnaa9cn8"; + sha256 = "10jrnnxvp06rvzk285wibyi9hn15qhjnqjy9xsfbwl8yhmzzqnq0"; }; propagatedBuildInputs = [ cstruct domain-name duration gmap ipaddr logs lru metrics ptime rresult ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/core-extended.nix deleted file mode 100644 index 19550a8232..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/core-extended.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv, buildOcamlJane, - core, - bin_prot, fieldslib, sexplib, typerep, variantslib, - ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, - re2, textutils}: - -buildOcamlJane { - name = "core_extended"; - hash = "1j4ipcn741j8w3h4gpv5sygjzg6b5g6gc2jcrr4n0jyn5dq8b0p5"; - propagatedBuildInputs = - [ core bin_prot fieldslib sexplib typerep variantslib - ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane - re2 textutils ]; - - patchPhase = stdenv.lib.optionalString stdenv.isLinux '' - patch src/extended_unix_stubs.c < #define _LINUX_QUOTA_VERSION 2 -EOF - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/core_extended"; - description = "Jane Street Capital's standard library overlay"; - license = licenses.asl20; - maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-time/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-time/default.nix new file mode 100644 index 0000000000..b98fd3b627 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-time/default.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage, fetchurl, ocaml_lwt }: + +buildDunePackage rec { + minimumOCamlVersion = "4.06"; + + pname = "mirage-time"; + version = "2.0.1"; + + src = fetchurl { + url = "https://github.com/mirage/mirage-time/releases/download/v${version}/mirage-time-v${version}.tbz"; + sha256 = "1w6mm4g7fc19cs0ncs0s9fsnb1k1s04qqzs9bsqvq8ngsb90cbh0"; + }; + + propagatedBuildInputs = [ ocaml_lwt ]; + + meta = with lib; { + homepage = "https://github.com/mirage/mirage-time"; + description = "Time operations for MirageOS"; + license = licenses.isc; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-time/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-time/unix.nix new file mode 100644 index 0000000000..da5326bc07 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-time/unix.nix @@ -0,0 +1,13 @@ +{ buildDunePackage, fetchurl, mirage-time, ocaml_lwt, duration }: + +buildDunePackage { + pname = "mirage-time-unix"; + + inherit (mirage-time) src version minimumOCamlVersion; + + propagatedBuildInputs = [ mirage-time ocaml_lwt duration ]; + + meta = mirage-time.meta // { + description = "Time operations for MirageOS on Unix"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix index 1bac71d301..f614c47614 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, ocb-stubblr }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !stdenv.lib.versionAtLeast ocaml.version "4.03" then throw "tsdl is not available for OCaml ${ocaml.version}" else let pname = "tsdl"; - version = "0.9.4"; + version = "0.9.7"; webpage = "https://erratique.ch/software/${pname}"; in @@ -15,11 +15,11 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "13af37w2wybx8yzgjr5zz5l50402ldl614qiwphl1q69hig5mag2"; + sha256 = "1zwv0ixkigh1gzk5n49rwvz2f2m62jdkkqg40j7dclg4gri7691f"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib ocamlbuild topkg result ocb-stubblr ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ SDL2 ctypes ]; preConfigure = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = webpage; description = "Thin bindings to the cross-platform SDL library"; - license = licenses.bsd3; + license = licenses.isc; platforms = ocaml.meta.platforms or []; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix index cfbcc27ba9..6a7c03b9bb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix @@ -3,6 +3,7 @@ }: buildDunePackage rec { + minimumOCamlVersion = "4.03"; pname = "uri"; version = "3.1.0"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/legacy.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/legacy.nix deleted file mode 100644 index 474ab92788..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/legacy.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, re, stringext, ounit -, sexplib, ppx_sexp_conv -, legacyVersion ? false -, sexplib_p4 -}: - -if !stdenv.lib.versionAtLeast ocaml.version "4" -|| legacyVersion && stdenv.lib.versionAtLeast ocaml.version "4.03" -then throw "uri${stdenv.lib.optionalString legacyVersion "_p4"} is not available for OCaml ${ocaml.version}" else - -with - if legacyVersion - then { - version = "1.9.1"; - sha256 = "0v3jxqgyi4kj92r3x83rszfpnvvzy9lyb913basch4q64yka3w85"; - } else { - version = "1.9.2"; - sha256 = "137pg8j654x7r0d1664iy2zp3l82nki1kkh921lwdrwc5qqdl6jx"; - }; - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-uri-${version}"; - - src = fetchzip { - url = "https://github.com/mirage/ocaml-uri/archive/v${version}.tar.gz"; - inherit sha256; - }; - - buildInputs = [ ocaml findlib ocamlbuild ounit ] - ++ stdenv.lib.optional (!legacyVersion) ppx_sexp_conv; - propagatedBuildInputs = [ re (if legacyVersion then sexplib_p4 else sexplib) stringext ]; - - configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; - buildPhase = '' - ocaml setup.ml -build - ocaml setup.ml -doc - ''; - doCheck = true; - checkPhase = "ocaml setup.ml -test"; - installPhase = "ocaml setup.ml -install"; - - createFindlibDestdir = true; - - meta = { - homepage = "https://github.com/mirage/ocaml-uri"; - platforms = ocaml.meta.platforms or []; - description = "RFC3986 URI parsing library for OCaml"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix index d30b23aa3e..eae40d4dfa 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix @@ -8,11 +8,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; pname = "x509"; - version = "0.11.0"; + version = "0.11.1"; src = fetchurl { url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz"; - sha256 = "0gcs3vpmixxxx2q4b2iphb1xw1jffya1wkp0p1xbmsfcghzrj20m"; + sha256 = "1vmjqwmxf7zz157rlp3wp3zp88kw62m4f22i0xmxhinssd0dvr9c"; }; useDune2 = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asttokens/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asttokens/default.nix index c6e4f3752e..0f090d14ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asttokens/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asttokens/default.nix @@ -1,27 +1,19 @@ -{ lib, fetchPypi, buildPythonPackage, fetchpatch, astroid, six, coverage -, lazy-object-proxy, nose, wrapt +{ lib, fetchPypi, buildPythonPackage, + setuptools_scm, toml, six, astroid, pytest }: buildPythonPackage rec { pname = "asttokens"; - version = "1.1.13"; + version = "2.0.4"; src = fetchPypi { inherit pname version; - sha256 = "1vd4djlxmgznz84gzakkv45avnrcpgl1kir92l1pxyp0z5c0dh2m"; + sha256 = "0a2ixiz04aw4p0aivxh47k3fa9ql804l3y5iv5gcih9aizi5fbm4"; }; - patches = [ - # Fix tests for astroid 2.2 in python 3. Remove with the next release - (fetchpatch { - url = "https://github.com/gristlabs/asttokens/commit/21caaaa74105c410b3d84c3d8ff0dc2f612aac9a.patch"; - sha256 = "182xfr0cx4pxx0dv1l50a1c281h8ywir8vvd1zh5iicflivim1nv"; - }) - ]; + propagatedBuildInputs = [ setuptools_scm toml six astroid ]; - propagatedBuildInputs = [ lazy-object-proxy six wrapt astroid ]; - - checkInputs = [ coverage nose ]; + checkInputs = [ pytest ]; meta = with lib; { homepage = "https://github.com/gristlabs/asttokens"; 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 new file mode 100644 index 0000000000..7e2b09cca6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, mock +}: + +buildPythonPackage rec { + pname = "auth0-python"; + version = "3.9.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "c2fdc3ff230638a2776d2b3761e787ca93dc33a26f841504fc260f947256f453"; + }; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + mock + ]; + + meta = with lib; { + description = "Auth0 Python SDK"; + homepage = "https://github.com/auth0/auth0-python"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix index 78fd740209..d1baeb3803 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.3.0"; + version = "1.3.1"; disabled = isPy38; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "17fa904e0447fd2a2dc19909379edb769b05656dbaf4863b8c4fdfb2bb54350c"; + sha256 = "5a59c36b4b05bdaec455c390feda71b6495fc828246593404351b9a41c2e877a"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-certificates/default.nix new file mode 100644 index 0000000000..1e4b8f09c5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-certificates/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, isPy3k +, azure-core +, msrest +, msrestazure +}: + +buildPythonPackage rec { + pname = "azure-keyvault-certificates"; + version = "4.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "069l6m80rq4smyqbrmjb2w18wxxg49xi2yrf1wsxpq8r0r45cksl"; + }; + + propagatedBuildInputs = [ + azure-core + msrest + msrestazure + ]; + + pythonNamespaces = [ "azure.keyvault" ]; + + # has no tests + doCheck = false; + pythonImportsCheck = [ "azure.keyvault.certificates" ]; + + meta = with lib; { + description = "Microsoft Azure Key Vault Certificates Client Library for Python"; + 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-keyvault/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault/default.nix index 035871ab93..f5b83df266 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault/default.nix @@ -1,20 +1,22 @@ { lib, buildPythonPackage, isPy27, fetchPypi +, azure-keyvault-certificates , azure-keyvault-keys , azure-keyvault-secrets }: buildPythonPackage rec { pname = "azure-keyvault"; - version = "4.0.0"; + version = "4.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e85f5bd6cb4f10b3248b99bbf02e3acc6371d366846897027d4153f18025a2d7"; + sha256 = "69002a546921a8290eb54d9a3805cfc515c321bc1d4c0bfcfb463620245eca40"; }; propagatedBuildInputs = [ + azure-keyvault-certificates azure-keyvault-keys azure-keyvault-secrets ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-advisor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-advisor/default.nix index 83ca8809fc..f801d2a059 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-advisor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-advisor/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-advisor"; - version = "3.0.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c52a4cf91d736c0ecdcb4d555e3b7713ff892343f610e7d65c63549edb98c221"; + sha256 = "1ecea7a9dc48c099c06aab68aace7fdbded91a5522932882b1707c29fa055054"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix index 9f5c04adb2..759467aa90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.1.0"; + version = "0.2.0"; pname = "azure-mgmt-apimanagement"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "06bqqkn5mx127x1z7ycm6rl8ajxlrmrm2kcdpgkbl4baii1x6iax"; + sha256 = "790f01c0b32583706b8b8c59667c0f5a51cd70444eee76474e23a598911e1d72"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index 76a0d71b15..0208d08228 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-applicationinsights"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1hm6s7vym1y072jqypjgbhps8lza1d5kb8qcpyxnw4zsmsvshdp5"; + sha256 = "3c788a54db4fbca1a8850151462ec1471ff59c86b3a10d6082952bbdaa7e6651"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index 2dadb1d2cb..c168147609 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "6.0.0"; + version = "6.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d03641336f4b2ec561112655c93ee80bc28d8e8daa45a57abc36169bd19c07a0"; + sha256 = "e0c4bbe656ababb942d708ee04f3f3305a2023e322a8b3fb1d8503aa682f59c4"; }; propagatedBuildInputs = [ 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 20861a9efe..d77d28479a 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.0.0"; + version = "9.0.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "6f05948bbd19ceb894f46f037b77c54116183364a671e180c007b5737c8d4590"; + sha256 = "7e4459679bdba4aa67a4b5848e63d94e965a304a7418ef7607eb7a9ce295d886"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix new file mode 100644 index 0000000000..54b4842747 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -0,0 +1,36 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, python +, azure-core +, isPy3k +}: + +buildPythonPackage rec { + version = "1.0.0"; + pname = "azure-mgmt-core"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0pm565v05480f672l0n8z2sg6zk6iqyi91n0dhscibhdl54sy3si"; + }; + + propagatedBuildInputs = [ + azure-core + ]; + + pythonNamespaces = "azure.mgmt"; + + # not included + doCheck = false; + + pythonImportsCheck = [ "azure.mgmt.core" "azure.core" ]; + + meta = with pkgs.lib; { + description = "Microsoft Azure Management Core Library for Python"; + 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-mgmt-cosmosdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index d3605e3929..66c4e52e23 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.12.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "07c0hr7nha9789x1wz0ndca0sr0zscq63m9vd8pm1c6y0ss4iyn5"; + sha256 = "e83d21462f9d5b02e90f5590c4247ab73e0ff85fc4ac1fba32be119a15b10c98"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index c149d5ef6f..eb4772ce54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-loganalytics"; - version = "0.2.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c7315ff0ee4d618fb38dca68548ef4023a7a20ce00efe27eb2105a5426237d86"; + sha256 = "16f4c4f676ea718b7e1c59bd9a516fcfc796f1aff844b183a7ce9afe69fb214d"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 6bf207c6e4..42ebac80e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.8.0"; + version = "0.10.0"; pname = "azure-mgmt-netapp"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0vbg5mpahrnnnbj80flgzxxiffic94wsc9srm4ir85y2j5rprpv7"; + sha256 = "380b2153c52a861ae9069fcd601cbaeb9a6f91c49cba823443a9b5fe461c3998"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix index 00480ac38b..82aa1d6fa0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "10.0.0"; + version = "10.1.0"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3978da4641b3396d4a00c7ddd53d87ece7e7d45b5bc41a157639bdd2f2c5b9b3"; + sha256 = "e5ac0ee14b71ab57035c45bef15d3698b0b6026ecafb8320a7c704eb3f6fba3a"; }; postInstall = if isPy3k then "" else '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix index 5747881fd4..224f7971b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservices"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e1e794760232239f8a9328d5de1740565ff70d1612a2921c9609746ba5671e6c"; + sha256 = "3c90e6b2e358dbe6d5c6d7204955bdf52c3e977c6f8b727cbbb8811427d7fd52"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix new file mode 100644 index 0000000000..323aa26472 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, msrest +, msrestazure +, azure-common +, isPy27 +}: + +buildPythonPackage rec { + version = "0.1.0"; + pname = "azure-mgmt-redhatopenshift"; + disabled = isPy27; # don't feel like fixing namespace issues on python2 + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ]; + + pythonNamespaces = "azure.mgmt"; + + # no included + doCheck = false; + + pythonImportsCheck = [ "azure.mgmt.redhatopenshift" ]; + + meta = with lib; { + description = "Microsoft Azure Red Hat Openshift Management Client Library for Python"; + 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-mgmt-web/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix index 3b25c93a1b..48f7296d99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "0.45.0"; + version = "0.46.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "04wdb7vksjhcvv0gkjjr37lmb5ads5pr00cjac8r3szimr64zspr"; + sha256 = "e1988aa2b91e6b5aa84e48ac02d5546945bdc2d8331744869e923ba15066c4a6"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure/default.nix deleted file mode 100644 index 0a2e733ea1..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ pkgs -, buildPythonPackage -, fetchPypi -, dateutil -, futures -, pyopenssl -, requests -, isPy3k -}: - -buildPythonPackage rec { - version = "4.0.0"; - pname = "azure"; - - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "7d6afa332fccffe1a9390bcfac5122317eec657c6029f144d794603a81cd0e50"; - }; - - propagatedBuildInputs = [ dateutil pyopenssl requests ] - ++ pkgs.lib.optionals (!isPy3k) [ futures ]; - - # depends on futures for python 3 (not necissary) - patchPhase = if (!isPy3k) then "" else '' - sed -i -e "s/'futures'//" setup.py - ''; - - # tests are not packaged in pypi release - doCheck = false; - - meta = with pkgs.lib; { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; - broken = true; # this should propagate over 70 azure packages, many of which are not added yet - }; -} 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 001c3cc19a..63aa7883e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix @@ -1,30 +1,36 @@ { lib , buildPythonPackage , isPy27 -, fetchPypi +, fetchFromGitHub , pytest , unittest2 , future , numpy +, pillow , scipy , scikitlearn , scikitimage , threadpoolctl }: - buildPythonPackage rec { pname = "batchgenerators"; - version = "0.19.7"; + version = "0.20.0"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "0qqzwqf5r0q6jh8avz4f9kf8x96crvdnkznhf24pbm0faf8yk67q"; + src = fetchFromGitHub { + owner = "MIC-DKFZ"; + repo = pname; + rev = "v${version}"; + sha256 = "0cc3i4wznqb7lk8n6jkprvkpsby6r7khkxqwn75k8f01mxgjfpvf"; + }; - propagatedBuildInputs = [ future numpy scipy scikitlearn scikitimage threadpoolctl ]; + propagatedBuildInputs = [ + future numpy pillow scipy scikitlearn scikitimage threadpoolctl + ]; + checkInputs = [ pytest unittest2 ]; checkPhase = "pytest tests"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix index 97c6b957a4..e8a20b6df4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix @@ -7,7 +7,6 @@ , gzip , bzip2 , gnutar -, p7zip , cabextract , lzma , nose @@ -29,7 +28,7 @@ buildPythonPackage { sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"; }; - propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma pycrypto ] + propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar cabextract lzma pycrypto ] ++ stdenv.lib.optional visualizationSupport pyqtgraph; # setup.py only installs version.py during install, not test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix index 4b4d2e4a90..997f20e137 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "The uncompromising Python code formatter"; - homepage = "https://github.com/ambv/black"; + homepage = "https://github.com/psf/black"; license = licenses.mit; maintainers = with maintainers; [ sveitser ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bluepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bluepy/default.nix new file mode 100644 index 0000000000..8d247b41d2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bluepy/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pkg-config +, glib +}: + +buildPythonPackage rec { + pname = "bluepy"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1v0wjy1rz0rbwghr1z3xhdm06lqn9iig6vr5j2wmymh3w6pysw9a"; + }; + + buildInputs = [ glib ]; + nativeBuildInputs = [ pkg-config ]; + + # tests try to access hardware + checkPhase = '' + $out/bin/blescan --help > /dev/null + $out/bin/sensortag --help > /dev/null + $out/bin/thingy52 --help > /dev/null + ''; + pythonImportsCheck = [ "bluepy" ]; + + meta = with stdenv.lib; { + description = "Python interface to Bluetooth LE on Linux"; + homepage = "https://github.com/IanHarvey/bluepy"; + maintainers = with maintainers; [ georgewhewell ]; + license = licenses.gpl2; + }; + +} 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 35df76e68c..04ae5a78bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certifi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certifi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = { - homepage = "http://certifi.io/"; + homepage = "https://certifi.io/"; description = "Python package for providing Mozilla's CA Bundle"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ koral ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix new file mode 100644 index 0000000000..02454b74ef --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, future +, pyyaml +, jsonlines +}: + +buildPythonPackage rec { + pname = "cloudflare"; + version = "2.6.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "4463d5f2927338384169315f34c2a8ac0840075b59489f8d1d773b91caba6c39"; + }; + + propagatedBuildInputs = [ + requests + future + pyyaml + jsonlines + ]; + + # no tests associated with package + doCheck = false; + pythonImportsCheck = [ "CloudFlare" ]; + + meta = with lib; { + description = "Python wrapper for the Cloudflare v4 API"; + homepage = "https://github.com/cloudflare/python-cloudflare"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} 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 9b14f4a6fc..ba807cc99f 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 = "2.9"; # Also update the hash in vectors.nix + version = "2.9.1"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "0vlqy2pki0fh1h6l6cbb43z3g2n9fv0849dzb5gqwjv0bkpx7b0c"; + sha256 = "13inbbc3vqv0vpfww65f8pj3isghbcrd3m63xfyd8swl9f5xc2yf"; }; 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 6fd8259d78..520e44cccc 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 = "1h7dcgwrjxqk1bzkangbvlhhlgyqd7cfi894dv1cd5m2sp7csblc"; + sha256 = "1ydkrj67jf26ys8v5qflqsnlj3hd4494ym44120dpvk7b7v037ci"; }; # No tests included diff --git a/third_party/nixpkgs/pkgs/development/python-modules/evernote/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/evernote/default.nix index 55b60315c5..b245ff1174 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/evernote/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/evernote/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Evernote SDK for Python"; - homepage = "http://dev.evernote.com"; + homepage = "https://dev.evernote.com"; license = licenses.asl20; maintainers = with maintainers; [ hbunke ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fasttext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fasttext/default.nix index 050b3873a0..42e6446e86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fasttext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fasttext/default.nix @@ -1,18 +1,12 @@ -{stdenv, buildPythonPackage, fetchFromGitHub, numpy, pybind11}: +{stdenv, buildPythonPackage, fetchFromGitHub, numpy, pkgs, pybind11 }: buildPythonPackage rec { - pname = "fasttext"; - version = "0.9.1"; - - src = fetchFromGitHub { - owner = "facebookresearch"; - repo = "fastText"; - rev = "v${version}"; - sha256 = "1cbzz98qn8aypp4r5kwwwc9wiq5bwzv51kcsb15xjfs9lz8h3rii"; - }; + inherit (pkgs.fasttext) pname version src; buildInputs = [ pybind11 ]; + pythonImportsCheck = [ "fasttext" ]; + propagatedBuildInputs = [ numpy ]; preBuild = '' 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 6b1b74cae8..9a86acf83b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python geospatial data analysis framework"; - homepage = "http://geopandas.org"; + homepage = "https://geopandas.org"; license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp ]; }; 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 cdb252f743..ecb15cc024 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, darwin, grpc , six, protobuf, enum34, futures, isPy27, pkgconfig -, cython}: +, cython, c-ares, openssl, zlib }: buildPythonPackage rec { inherit (grpc) src version; @@ -9,11 +9,16 @@ buildPythonPackage rec { nativeBuildInputs = [ cython pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; + buildInputs = [ c-ares openssl zlib ]; propagatedBuildInputs = [ six protobuf ] ++ stdenv.lib.optionals (isPy27) [ enum34 futures ]; preBuild = stdenv.lib.optionalString stdenv.isDarwin "unset AR"; + GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = 1; + GRPC_PYTHON_BUILD_SYSTEM_ZLIB = 1; + GRPC_PYTHON_BUILD_SYSTEM_CARES = 1; + meta = with stdenv.lib; { description = "HTTP/2-based RPC framework"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix index 6fcb31a945..437f032767 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix @@ -5,6 +5,8 @@ , pytest , pytz , sqlalchemy +, importlib-metadata +, pythonOlder }: buildPythonPackage rec { @@ -23,7 +25,11 @@ buildPythonPackage rec { --replace "amqp==2.5.1" "amqp~=2.5" ''; - propagatedBuildInputs = [ amqp ]; + propagatedBuildInputs = [ + amqp + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; checkInputs = [ pytest case pytz Pyro4 sqlalchemy ]; # test_redis requires fakeredis, which isn't trivial to package diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msrest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msrest/default.nix index 6f53314bd2..b415537106 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msrest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msrest/default.nix @@ -18,7 +18,7 @@ }: buildPythonPackage rec { - version = "0.6.11"; + version = "0.6.13"; pname = "msrest"; # no tests in PyPI tarball @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Azure"; repo = "msrest-for-python"; rev = "v${version}"; - sha256 = "1lq3bf7kzs9h9sk6ahpf0vidklv0ahx3bm4wpv3qka3jb64yqdmi"; + sha256 = "1s34xp6wgas17mbg6ysciqlgb3qc2p2d5bs9brwr05ys62l6y8cz"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix index 04f7428e6b..a97469e807 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix @@ -12,7 +12,7 @@ }: buildPythonPackage rec { - version = "0.6.2"; + version = "0.6.3"; pname = "msrestazure"; # Pypi tarball doesnt include tests @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Azure"; repo = "msrestazure-for-python"; rev = "v${version}"; - sha256 = "09qwdg4la4jwp5ibypdwsn7h8m2sh8c1kdxvffyxcjan50h14s04"; + sha256 = "0pd3qw96c9fz4qgimnc0qf0pz7m9rr1wzhxj8m792swaf3pb18z8"; }; propagatedBuildInputs = [ adal msrest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix index 4608d3f93e..5850d7e67b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix @@ -1,22 +1,16 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python, protobuf3_6 }: +{ lib, buildPythonPackage, fetchFromGitHub, python }: let - py = python.override { - packageOverrides = self: super: { - protobuf = super.protobuf.override { - protobuf = protobuf3_6; - }; - }; - }; + py = python; in buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.19"; + version = "8.0.20"; src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - sha256 = "1jscmc5s7mwx43gvxjlqc30ylp5jjpmkqx7s3b9nllbh926p3ixg"; + sha256 = "1pm98mjbkhwawhni98cjhp0gg3mim75i0sdby77vzrlcrxajxkbw"; }; propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ]; @@ -33,6 +27,7 @@ in buildPythonPackage rec { implements the DB API v2.0 specification. ''; homepage = "https://github.com/mysql/mysql-connector-python"; + changelog = "https://raw.githubusercontent.com/mysql/mysql-connector-python/${version}/CHANGES.txt"; license = [ lib.licenses.gpl2 ]; maintainers = with lib.maintainers; [ primeos ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix index 1c972b0027..4b85ba47ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pep8-naming"; - version = "0.9.1"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "a33d38177056321a167decd6ba70b890856ba5025f0a8eca6a3eda607da93caf"; + sha256 = "0fmzccbmr0jn9ynamdb9ly2ai8qs5qfk8alfgnzr3fbjvpwsbd7k"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylibftdi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylibftdi/default.nix new file mode 100644 index 0000000000..54058ae198 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylibftdi/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, libftdi1 +, libusb1 +}: + +buildPythonPackage rec { + pname = "pylibftdi"; + version = "0.18.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "17c5h4xz1grynbpffngjflk3dlw2g2zbhkwb7h5v4n9rjdv41l5x"; + }; + + propagatedBuildInputs = [ + libftdi1 + libusb1 + ]; + + postPatch = '' + substituteInPlace pylibftdi/driver.py \ + --replace "self._load_library('libusb')" "cdll.LoadLibrary('${libusb1.out}/lib/libusb-1.0.so')" \ + --replace "self._load_library('libftdi')" "cdll.LoadLibrary('${libftdi1.out}/lib/libftdi1.so')" + ''; + + pythonImportsCheck = [ "pylibftdi" ]; + + meta = with lib; { + homepage = "https://bitbucket.org/codedstructure/pylibftdi/src/default/"; + description = "Minimal pythonic wrapper to Intra2net's libftdi driver for FTDI's USB devices"; + license = licenses.mit; + maintainers = with maintainers; [ matthuszagh ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyprof2calltree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyprof2calltree/default.nix index f86d830635..7244438c6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyprof2calltree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyprof2calltree/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pyprof2calltree"; - version = "1.4.4"; + version = "1.4.5"; # Fetch from GitHub because the PyPi packaged version does not # include all test files. @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "pwaller"; repo = "pyprof2calltree"; rev = "v" + version; - sha256 = "1vrip41ib7nmkwa8rjny1na1wyp7nvvgvm0h9bd21i262kbm4nqx"; + sha256 = "0akighssiswfhi5285rrj37am6flg3ip17c34bayq3r8yyk1iciy"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyusb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyusb/default.nix index d646f7930f..624090e98a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyusb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyusb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, libusb, libusb1 }: +{ stdenv, fetchPypi, buildPythonPackage, libusb1 }: buildPythonPackage rec { pname = "pyusb"; @@ -17,14 +17,12 @@ buildPythonPackage rec { sed -i -e "s|find_library=None|find_library=lambda _:\"$libusb\"|" usb/backend/libusb1.py ''; - propagatedBuildInputs = [ libusb ]; - # No tests included doCheck = false; meta = with stdenv.lib; { description = "Python USB access module (wraps libusb 1.0)"; # can use other backends - homepage = "http://pyusb.sourceforge.net/"; + homepage = "https://pyusb.github.io/pyusb/"; license = licenses.bsd3; maintainers = with maintainers; [ bjornfor ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikitlearn/0.20.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikitlearn/0.20.nix index 790c297037..4d8e8d00f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikitlearn/0.20.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikitlearn/0.20.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A set of python modules for machine learning and data mining"; - homepage = "http://scikit-learn.org"; + homepage = "https://scikit-learn.org"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; 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 d5d5ee8b78..c7519ee396 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A set of python modules for machine learning and data mining"; - homepage = "http://scikit-learn.org"; + homepage = "https://scikit-learn.org"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snitun/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snitun/default.nix index 8212379e3d..901987fbff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snitun/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snitun/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub, attrs, cryptography, async-timeout, pytest-aiohttp, pytest }: +{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub +, attrs, cryptography, async-timeout, pytest-aiohttp, pytestCheckHook +}: buildPythonPackage rec { pname = "snitun"; @@ -13,12 +15,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs cryptography async-timeout ]; - checkInputs = [ pytest pytest-aiohttp ]; + checkInputs = [ pytestCheckHook pytest-aiohttp ]; - checkPhase = '' - # https://github.com/NabuCasa/snitun/issues/61 - pytest ${lib.optionalString stdenv.isDarwin "-k 'not test_multiplexer_data_channel_abort_full'"} tests/ - ''; + disabledTests = lib.optionals stdenv.isDarwin [ + "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61 + # port binding conflicts + "test_snitun_single_runner_timeout" + "test_snitun_single_runner_throttling" + ]; meta = with lib; { homepage = "https://github.com/nabucasa/snitun"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 3ca0423bd1..db23e2ab7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.36.0"; + version = "0.36.3"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - sha256 = "1wkk6jj0jkp2hi3ziqw95q0b19zabpvzm6v5kixgnssj027hq0yv"; + sha256 = "0fj9qiz5hq8gf9pnir077sl58chry7jz63fnj1vgx5rmq1dsys7j"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix index 8c5ab94f9d..c4d57bef0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tool for automatic download/upload subtitles for videofiles using fast hashing"; - homepage = "http://www.subdownloader.net"; + homepage = "https://www.subdownloader.net"; license = licenses.gpl3; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transforms3d/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transforms3d/default.nix new file mode 100644 index 0000000000..8b21e64e9a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/transforms3d/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, pytest +, numpy +, scipy +, sympy +}: + +buildPythonPackage rec { + pname = "transforms3d"; + version = "unstable-2019-12-17"; + + disabled = isPy27; + + # no Git tag or PyPI release in some time + src = fetchFromGitHub { + owner = "matthew-brett"; + repo = pname; + rev = "6b20250c610249914ca5e3a3a2964c36ca35c19a"; + sha256 = "1z789hgk71a6rj6mqp9srpzamg06g58hs2p1l1p344cfnkj5a4kc"; + }; + + propagatedBuildInputs = [ numpy sympy ]; + + checkInputs = [ pytest scipy ]; + checkPhase = "pytest transforms3d"; + + meta = with lib; { + homepage = "https://matthew-brett.github.io/transforms3d"; + description = "Convert between various geometric transformations"; + license = licenses.bsd2; + maintainers = with maintainers; [ bcdarwin ]; + }; +} 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 f8f172e78b..9b8e915a8b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/untangle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/untangle/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convert XML documents into Python objects"; - homepage = "http://github.com/stchris/untangle"; + homepage = "https://github.com/stchris/untangle"; license = licenses.mit; maintainers = [ maintainers.arnoldfarkas ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vdf/default.nix index 73725c8e5e..7d4e3e34b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vdf/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "vdf"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "ValvePython"; repo = pname; rev = "v${version}"; - sha256 = "08rb982hcwc9pr9gl0zfk9266h84fwbz097qjfkss3srwghr1247"; + sha256 = "0d9bhxdznry7kzyma00cxwjn6rqnd6vw8v5ym68k6qswgfzb569i"; }; checkInputs = [ pytest pytestcov mock ]; diff --git a/third_party/nixpkgs/pkgs/development/r-modules/bioc-packages.nix b/third_party/nixpkgs/pkgs/development/r-modules/bioc-packages.nix index c02ea4dda4..aa5e23c40c 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/bioc-packages.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/bioc-packages.nix @@ -197,7 +197,7 @@ in with self; { CrispRVariants = derive2 { name="CrispRVariants"; version="1.10.1"; sha256="0n1mw3ybbdaybbcms12cj4vy21wahq5srny0qnbxjlzyl1zjbpr0"; depends=[AnnotationDbi BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges reshape2 Rsamtools S4Vectors]; }; CytoDx = derive2 { name="CytoDx"; version="1.2.1"; sha256="05apvaf4dmkdfsp2aary14i7znjyzk0k6rqcbsk6m98fkp3d9r8b"; depends=[doParallel dplyr flowCore glmnet rpart rpart_plot]; }; CytoML = derive2 { name="CytoML"; version="1.8.1"; sha256="18isg4kjdn975q8vpziisnyxj1jxm4lkq7hi9jy4imf7bffc234i"; depends=[base64enc Biobase data_table flowCore flowUtils flowWorkspace ggcyto graph jsonlite ncdfFlow openCyto plyr RBGL Rgraphviz XML]; }; - DAPAR = derive2 { name="DAPAR"; version="1.14.5"; sha256="0s09y5kpivaichzmfchksaayxchdmqgldcba0waxfxzsapwfb9p1"; depends=[AnnotationDbi Cairo clusterProfiler cp4p DAPARdata doParallel dplyr factoextra FactoMineR foreach ggplot2 gplots graph highcharter impute knitr lattice limma lme4 Matrix MSnbase norm openxlsx pcaMethods png preprocessCore RColorBrewer readxl reshape2 scales siggenes stringr tidyr tidyverse tmvtnorm vioplot vsn]; }; + DAPAR = derive2 { name="DAPAR"; version="1.14.5"; sha256="0s09y5kpivaichzmfchksaayxchdmqgldcba0waxfxzsapwfb9p1"; depends=[AnnotationDbi Cairo clusterProfiler cp4p DAPARdata doParallel dplyr factoextra FactoMineR foreach ggplot2 gplots graph highcharter imp4p impute knitr lattice limma lme4 Matrix MSnbase norm openxlsx pcaMethods png preprocessCore RColorBrewer readxl reshape2 scales siggenes stringr tidyr tidyverse tmvtnorm vioplot vsn]; }; DART = derive2 { name="DART"; version="1.30.0"; sha256="0dxwy95p43c0shx30y95sj1pl64kqkh2bsnj680q196zgyg937s6"; depends=[igraph]; }; DBChIP = derive2 { name="DBChIP"; version="1.26.0"; sha256="1wk8nvfcfhsymhbi6id0kd1jzcykh6hhikl2040g0v6gi252gv2v"; depends=[DESeq edgeR]; }; DChIPRep = derive2 { name="DChIPRep"; version="1.12.0"; sha256="1avcjr7r54grh3yn5pjbzji3syc8vvah9as7asv3cwmyqzaya4r0"; depends=[assertthat ChIPpeakAnno DESeq2 fdrtool GenomicRanges ggplot2 plyr purrr reshape2 S4Vectors smoothmest soGGi SummarizedExperiment tidyr]; }; @@ -491,8 +491,8 @@ in with self; { MSnID = derive2 { name="MSnID"; version="1.16.1"; sha256="077n6ljcnnl7q4w0qj8v46vm4sjk9vzzfqf7wsc6lz0wmyzqdng3"; depends=[Biobase data_table doParallel dplyr foreach iterators MSnbase mzID mzR ProtGenerics R_cache Rcpp reshape2]; }; MSnbase = derive2 { name="MSnbase"; version="2.8.3"; sha256="1kl1d7byphnfpmbl5fzbgs68dxskhpsdyx7ka51bpfn0nv3pp492"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant MASS mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp S4Vectors scales vsn XML]; }; MSstats = derive2 { name="MSstats"; version="3.14.1"; sha256="1bgvdq1mfq6rxjf5ag2slrhy4056906wghsirrymf53nw3qz5g6s"; depends=[data_table doSNOW dplyr foreach ggplot2 ggrepel gplots limma lme4 marray MASS minpack_lm preprocessCore randomForest reshape2 snow stringr survival tidyr]; }; - MSstatsQC = derive2 { name="MSstatsQC"; version="2.0.1"; sha256="1f6gv1fqm5h6xs91wc1bamyri47qggb872qzriwzvff7ydn0q1ag"; depends=[dplyr ggExtra ggplot2 MSnbase plotly qcmetrics]; }; - MSstatsQCgui = derive2 { name="MSstatsQCgui"; version="1.2.1"; sha256="1k7dhiayf885ax1mg03yg1w4mamk3j1gsm7phszxl3i0j3c2gks7"; depends=[dplyr ggExtra gridExtra MSstatsQC plotly shiny]; }; + MSstatsQC = derive2 { name="MSstatsQC"; version="2.0.1"; sha256="1f6gv1fqm5h6xs91wc1bamyri47qggb872qzriwzvff7ydn0q1ag"; depends=[dplyr ggExtra ggplot2 MSnbase plotly qcmetrics RecordLinkage]; }; + MSstatsQCgui = derive2 { name="MSstatsQCgui"; version="1.2.1"; sha256="1k7dhiayf885ax1mg03yg1w4mamk3j1gsm7phszxl3i0j3c2gks7"; depends=[dplyr ggExtra gridExtra MSstatsQC plotly RecordLinkage shiny]; }; MSstatsTMT = derive2 { name="MSstatsTMT"; version="1.1.2"; sha256="0aaw3qillcfrjczdmd7s21v551hclnq8fn2zvn91wyr4i82q43rr"; depends=[data_table dplyr ggplot2 limma lme4 matrixStats MSstats nlme reshape2 tidyr]; }; MTseeker = derive2 { name="MTseeker"; version="1.0.6"; sha256="0fsb7k6pkl15q8csygpsjrz4jvy20mfd5rfmhl7q7ffj4d7sprxh"; depends=[Biobase BiocGenerics Biostrings circlize GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gmapR Homo_sapiens IRanges jsonlite Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation VariantTools viridis xml2]; }; MVCClass = derive2 { name="MVCClass"; version="1.56.0"; sha256="1hw36gd1z19dir6fl7j3dzqzi5p1668zbwpcz7l21hbyycv27l0j"; depends=[]; }; @@ -670,7 +670,7 @@ in with self; { RUVSeq = derive2 { name="RUVSeq"; version="1.16.1"; sha256="0qk7q3ab7k133divfkp54zsmvsmb9p8r09pkh2caswrzrn8achzv"; depends=[Biobase EDASeq edgeR MASS]; }; RUVcorr = derive2 { name="RUVcorr"; version="1.14.0"; sha256="05lg37rmf9skqcpnd08v6wnh7sfs449hwwq6nw2hkgy9faip14lz"; depends=[BiocParallel bladderbatch corrplot gridExtra lattice MASS psych reshape2 snowfall]; }; RUVnormalize = derive2 { name="RUVnormalize"; version="1.16.0"; sha256="1habqdv35v9ypvfmfaxjqpka67bs6hzf4ph9b0gqd67mbfnb49dv"; depends=[Biobase RUVnormalizeData]; }; - RVS = derive2 { name="RVS"; version="1.4.4"; sha256="1zvbin60p81qyk2c0m88dl94ivzyf4cpjdf2hnw8igmvlxszmb8k"; depends=[gRain kinship2 snpStats]; }; + RVS = derive2 { name="RVS"; version="1.4.4"; sha256="1zvbin60p81qyk2c0m88dl94ivzyf4cpjdf2hnw8igmvlxszmb8k"; depends=[GENLIB gRain kinship2 snpStats]; }; RaggedExperiment = derive2 { name="RaggedExperiment"; version="1.6.0"; sha256="1w02nnxpmx05gn6d9kjnahdn9kynbg1szm96c03gh4961zknn3r3"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors SummarizedExperiment]; }; RandomWalkRestartMH = derive2 { name="RandomWalkRestartMH"; version="1.2.0"; sha256="022vckcc46bkhfhi2fzgawhf54hi6y2p5ia4v3x3lj221d7hcaax"; depends=[dnet igraph Matrix]; }; RankProd = derive2 { name="RankProd"; version="3.8.0"; sha256="0jmpwpmj3y13ylk7riyicywpring14dhq4862jgalsjjwa22zzd0"; depends=[gmp Rmpfr]; }; diff --git a/third_party/nixpkgs/pkgs/development/r-modules/cran-packages.nix b/third_party/nixpkgs/pkgs/development/r-modules/cran-packages.nix index ae6197761d..21e36b509c 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/cran-packages.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/cran-packages.nix @@ -4,7 +4,7 @@ # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix { self, derive }: -let derive2 = derive { snapshot = "2020-04-07"; }; +let derive2 = derive { snapshot = "2020-04-25"; }; in with self; { A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; }; ABACUS = derive2 { name="ABACUS"; version="1.0.0"; sha256="0m1dnkwjr1522l9ddbzzx7ayxvli17sbmk6s28adpmzzjwh2kd1i"; depends=[ggplot2 shiny]; }; @@ -27,7 +27,7 @@ in with self; { ADCT = derive2 { name="ADCT"; version="0.1.0"; sha256="1glf83ydx4v3ld8c4gb9h3jk6srd054bis5l8k57p1ba4fnqnnpp"; depends=[mvtnorm]; }; ADDT = derive2 { name="ADDT"; version="2.0"; sha256="044bb1jw2m8vwk5q8l7rlz4kqphjvy8i9d59rjg0k5q5l9vczfrp"; depends=[coneproj Matrix nlme]; }; ADGofTest = derive2 { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; }; - ADMM = derive2 { name="ADMM"; version="0.3.1"; sha256="121hqglivik65gv657bdv7a8kzgvrwgwckz2h746fcibv2s7dfsi"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo Rdpack]; }; + ADMM = derive2 { name="ADMM"; version="0.3.2"; sha256="0wxjl9pdrcrbbcl1vq48ajgqdm2m1ymaf5xcnr5sf44v50lxyqic"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo Rdpack]; }; ADMMnet = derive2 { name="ADMMnet"; version="0.1"; sha256="15f1zhgv7xai954qz2ahj4kpxyvr2svxpmybz7j43bhjpkq72dmq"; depends=[Matrix Rcpp RcppEigen]; }; ADMMsigma = derive2 { name="ADMMsigma"; version="2.1"; sha256="1943dza086s22pr0yz41wzn9cdg11x7fl9zr3w012865yj219m7l"; depends=[doParallel dplyr foreach ggplot2 Rcpp RcppArmadillo RcppProgress]; }; ADPF = derive2 { name="ADPF"; version="0.0.1"; sha256="1n7302xx77ngvp9i2h582i1mqslzllcdr0bn3pl2zk9jd8k97p7n"; depends=[]; }; @@ -64,7 +64,7 @@ in with self; { AMOEBA = derive2 { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; }; AMORE = derive2 { name="AMORE"; version="0.2-16"; sha256="0vw6hhykg1r6xxja6d4zb2y00x7pfkmhcq9xkidz8p4arinb7xnl"; depends=[]; }; AMPLE = derive2 { name="AMPLE"; version="0.0.2"; sha256="0j19f8rl7gkads4n52l5gfc5k7dx27sswzrypwl7dnxhfp4ivql7"; depends=[dplyr ggplot2 shiny shinyjs tidyr wesanderson]; }; - AMR = derive2 { name="AMR"; version="1.0.1"; sha256="06sqrwxd0zhp2i2shvq0lbh8arvvlfqymcf1jckgpsxidygr3j1q"; depends=[backports cleaner crayon data_table dplyr ggplot2 knitr microbenchmark pillar rlang tidyr]; }; + AMR = derive2 { name="AMR"; version="1.1.0"; sha256="0d157469rkpbxq7b53ibmz84vr6kcf896npn7w1vndfi5rjdlvb4"; depends=[backports cleaner crayon data_table dplyr ggplot2 knitr microbenchmark pillar R6 rlang tidyr vctrs]; }; ANN2 = derive2 { name="ANN2"; version="2.3.3"; sha256="12l02fnnfa42qy4w1bv2zr963k61xn7mbpj9rycdzi8wl18hxrb8"; depends=[ggplot2 Rcpp RcppArmadillo reshape2 testthat viridisLite]; }; ANOM = derive2 { name="ANOM"; version="0.5"; sha256="14nfy9xplbabfprwxz5fvx26nmqhp657vr6d90dc8vk8ds63ckiz"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; }; ANOVA_TFNs = derive2 { name="ANOVA.TFNs"; version="1.0"; sha256="0dwspvxj2gzyvxsd9xyhv47n1hjlqa7z9qza4h3hn1xda12vkjly"; depends=[FuzzyNumbers]; }; @@ -80,10 +80,12 @@ in with self; { APSIMBatch = derive2 { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; }; APfun = derive2 { name="APfun"; version="0.1.4"; sha256="0k4m3zwxcjfb1y4njig6yyjqzsvqi99zmglbfpvp65s829zxd881"; depends=[maptools raster rgdal sp]; }; APtools = derive2 { name="APtools"; version="6.8.8"; sha256="171aydyd7s8qll7djl4ysy596wxdf5wfwpqwfi14jjglc9r9qrrr"; depends=[cmprsk survival]; }; + AQLSchemes = derive2 { name="AQLSchemes"; version="1.6-9"; sha256="0wv2w8nwkfx5j4ds2azasxwy8mafxaxj6pfdkqkf9n57w2q3i1bj"; depends=[]; }; AQuadtree = derive2 { name="AQuadtree"; version="1.0.0"; sha256="159p1cymvgf8grpnkgkf6nind2kv6c62aa96qb32aiayrgrm4y4c"; depends=[dplyr sp]; }; AR = derive2 { name="AR"; version="1.1"; sha256="1wn4g2997c4vc3mzq2pv8ld0ryp0i78v4zlqqryvhshxgnz4f2pr"; depends=[DISTRIB]; }; AR1seg = derive2 { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; }; ARCensReg = derive2 { name="ARCensReg"; version="2.1"; sha256="05zjk1wxqfigzg80lvx1940a059jfdr9zbzgzmz2n01glj1lvj63"; depends=[msm mvtnorm numDeriv tmvtnorm]; }; + ARDL = derive2 { name="ARDL"; version="0.1.0"; sha256="08hjxq961jq46kr6fqpjzv9c1sq63amqm0lr40p4wjl7mpf93xzm"; depends=[aod dplyr dynlm lmtest msm stringr zoo]; }; ARHT = derive2 { name="ARHT"; version="0.1.0"; sha256="1fz81a202r8vk655dg6a03zfq3gfkimqjvmc95k3j02xz0iv58kn"; depends=[]; }; ARIbrain = derive2 { name="ARIbrain"; version="0.2"; sha256="18c7yxkrnqh18gcfzvdc5wqig6ywdmjcy8rlz0fdj3b8fb84dfpr"; depends=[hommel plyr RNifti]; }; AROC = derive2 { name="AROC"; version="1.0-2"; sha256="1a7nxspq9kbzji417mr49i0s19ms8wyq48qz7rnlw1mrkipl4p6d"; depends=[Hmisc MASS Matrix moments nor1mix np spatstat]; }; @@ -123,7 +125,7 @@ in with self; { ActiveDriver = derive2 { name="ActiveDriver"; version="1.0.0"; sha256="10c7ga48fwvpd5mc4dqiyw4kc2l0iz5qn4hg7xk15r1qmm5rsipa"; depends=[MASS]; }; ActiveDriverWGS = derive2 { name="ActiveDriverWGS"; version="1.0.1"; sha256="08l9dj8d3cd74z1dqn8n4yqykwvqjxsfa067wnxyh7xnfvvnm5v1"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb GenomicRanges IRanges plyr S4Vectors]; }; AcuityView = derive2 { name="AcuityView"; version="0.1"; sha256="0f0iclmnwdc8ixiiai4svk4x1g3pjy7dhm3cm58fv6ckx12d3d2l"; depends=[fftwtools imager plotrix]; }; - AdMit = derive2 { name="AdMit"; version="2.1.3"; sha256="150zjxl56axhpgm25hzyhwwc5g77pkgi291d2v56zbjjqycfz2v8"; depends=[mvtnorm]; }; + AdMit = derive2 { name="AdMit"; version="2.1.5"; sha256="1gsskg3ayzyz0wa4abi20zzmkbnal6igwd6m7rafvpgzlffms1r9"; depends=[mvtnorm]; }; AdaSampling = derive2 { name="AdaSampling"; version="1.3"; sha256="1c8dh8lxyb076317n4qk2g3qv5j4mc1dszbh3k1p2b0nxiprqk5i"; depends=[caret class e1071 MASS]; }; AdapEnetClass = derive2 { name="AdapEnetClass"; version="1.2"; sha256="01k3mj4g1ckbng7wkzzn9h0k9yf01cpnnkly0sjda574c5jhj0rc"; depends=[glmnet imputeYn lars quadprog]; }; AdapSamp = derive2 { name="AdapSamp"; version="1.1.1"; sha256="1jayjrsiib2ij4rxxj59g71r3xhzl5yqh0lhi8k6cfy03i7dkvis"; depends=[pracma]; }; @@ -199,17 +201,18 @@ in with self; { AutoStepwiseGLM = derive2 { name="AutoStepwiseGLM"; version="0.2.0"; sha256="0wwi8hg2q1zkf28rq7bj0f9fcxc5hj59hkmk0gl9p8i3rghlyrms"; depends=[caret formula_tools]; }; Autoplotprotein = derive2 { name="Autoplotprotein"; version="1.1"; sha256="13mxqmhhdiq7mz4m6nx39dsq7x3bm8fsgskswx48vsq6x2k6byxa"; depends=[ade4 plotrix plyr seqinr XML]; }; AutoregressionMDE = derive2 { name="AutoregressionMDE"; version="1.0"; sha256="1dmg0q4sp2d2anzhw2my8xjhpyjsx0kf7r202q5bkw8yr57jnhvr"; depends=[]; }; + Autoseed = derive2 { name="Autoseed"; version="0.1.0"; sha256="0xr3sjfccvp8h18jqxzajb2pfn4nm8q9maic6k9zzr15fxvphiy5"; depends=[]; }; AzureAuth = derive2 { name="AzureAuth"; version="1.2.3"; sha256="0vi5888qvsmdwvzz46wabg2244liwfzyjd13h1d3wvbarzy7m8wf"; depends=[httr jose jsonlite openssl R6 rappdirs]; }; AzureCognitive = derive2 { name="AzureCognitive"; version="1.0.0"; sha256="1yg8fq77fbgf21dg9zq7kkgqyx6ax9ma46yv1nhnvdhc3dpvax5a"; depends=[AzureAuth AzureRMR httr jsonlite]; }; AzureContainers = derive2 { name="AzureContainers"; version="1.2.1"; sha256="0ihs0wv91y1klzwcbfy44yx12l8rxpa4g2vm2dbd7g9pz172w7hl"; depends=[AzureGraph AzureRMR httr openssl processx R6]; }; AzureGraph = derive2 { name="AzureGraph"; version="1.1.0"; sha256="0b7bfzvv0115giahs12b0h4qq4fdc5qf5kc8hmvjca6jlgysgvf4"; depends=[AzureAuth httr jsonlite openssl R6]; }; AzureKeyVault = derive2 { name="AzureKeyVault"; version="1.0.3"; sha256="06lz7cg3f9qrl9nzi54fsx37gm517skjl0jn1fwq4s4b07p4klia"; depends=[AzureAuth AzureGraph AzureRMR httr jose jsonlite openssl R6]; }; AzureKusto = derive2 { name="AzureKusto"; version="1.0.5"; sha256="0xzrhqysazcwwp5ismf6pi0kyyncwwp4a0p9s47m0gm8fyhz1h7g"; depends=[AzureAuth AzureRMR DBI dplyr httr jsonlite openssl R6 rlang tibble tidyselect]; }; - AzureRMR = derive2 { name="AzureRMR"; version="2.3.1"; sha256="0i00fkmyh25pih6cjcsxabz2rmpgpvzc708yk98jh89yz8cwxkmy"; depends=[AzureAuth AzureGraph httr jsonlite R6 uuid]; }; - AzureStor = derive2 { name="AzureStor"; version="3.1.1"; sha256="0la91z2d8qnvxar1y3mj8kpg0a44qr8slljaig6padv2wq16xals"; depends=[AzureRMR httr mime openssl R6 xml2]; }; + AzureRMR = derive2 { name="AzureRMR"; version="2.3.2"; sha256="18lr68axnr728mhgydifgrvwj640vyhqhgh9y4ppb2xv5smbxq7n"; depends=[AzureAuth AzureGraph httr jsonlite R6 uuid]; }; + AzureStor = derive2 { name="AzureStor"; version="3.2.0"; sha256="0g5j5kb5kf62md3yjyjm2py823zikhnsdbq51gk66ixnzzily4sc"; depends=[AzureRMR httr mime openssl R6 xml2]; }; AzureVM = derive2 { name="AzureVM"; version="2.1.1"; sha256="0kls78lbyp5i0dg3a7nz183r7chw1hhwzqyvmp27jhihazls90ij"; depends=[AzureRMR jsonlite R6]; }; AzureVMmetadata = derive2 { name="AzureVMmetadata"; version="1.0.0"; sha256="0k99ncp9zkyxl0r51041rfgq49gb65f5d3yc89d1gg2aqavk3g2y"; depends=[httr openssl]; }; - AzureVision = derive2 { name="AzureVision"; version="1.0.0"; sha256="1mvnq65sh3kgxfwxvfp26vv0nwa3xldkp65ya4mm0rqxr4zm3h4w"; depends=[AzureCognitive AzureRMR httr]; }; + AzureVision = derive2 { name="AzureVision"; version="1.0.1"; sha256="0wfnq77rn10wpj0d3s8mbpybc3dgvjc4f3lhgalabif4h11zgz9c"; depends=[AzureCognitive AzureRMR httr]; }; BACA = derive2 { name="BACA"; version="1.3"; sha256="1vbip7wbzix1s2izbm4058wmwar7w5rv3q8bmj9pm7hcapfi19k0"; depends=[ggplot2 RDAVIDWebService rJava]; }; BACCO = derive2 { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[approximator calibrator emulator]; }; BACCT = derive2 { name="BACCT"; version="1.0"; sha256="0bpm4l27vbblzi2hhfbjw2af3ic2jbnyghkvchpq8ww43k8068iv"; depends=[ggplot2 reshape2 rjags]; }; @@ -221,18 +224,17 @@ in with self; { BALLI = derive2 { name="BALLI"; version="0.2.0"; sha256="0qmjwpj56n07dvjwfknqvc02f0y5mlwh2yz4lrw7c4wqgrckcpgi"; depends=[edgeR limma MASS]; }; BAMBI = derive2 { name="BAMBI"; version="2.2.0"; sha256="1ch74zwv01a42vpvr9irdb2a3ivs1zrgdb907p50pq2lasmqdxah"; depends=[bridgesampling coda future_apply gtools label_switching lattice loo mvtnorm qrng RColorBrewer Rcpp RcppArmadillo rootSolve scales]; }; BAMMtools = derive2 { name="BAMMtools"; version="2.1.7"; sha256="1xpks3in0mj1b82z3ax2k3q06bgr3sj0nhr2dbs2crbvszb8hcp2"; depends=[ape gplots Rcpp]; }; - BANEScarparkinglite = derive2 { name="BANEScarparkinglite"; version="0.1.3"; sha256="0z2n4ikj9cr2vcafpn0kmn5v24pdy7cd98asdy7njg5l54hajsxc"; depends=[dplyr httr lubridate RCurl readr rvest XML xml2]; }; BAREB = derive2 { name="BAREB"; version="0.1.0"; sha256="1h3bgfxbs489cywgblrpl8jjhgs1krimdvv6fryjnc9rhw1mymdr"; depends=[Rcpp RcppArmadillo]; }; - BARIS = derive2 { name="BARIS"; version="1.0.0"; sha256="15bydzp1mldp2zxl343qd1fygah6cj1iavwxb0zddzjzgksnn3y9"; depends=[data_table downloader dplyr httr janitor jsonlite magrittr memoise rgdal rio sf stringi stringr XML]; }; + BARIS = derive2 { name="BARIS"; version="1.1.0"; sha256="0ncc1c6bqkh42cgg2pgfwrjypgcb9a08m49hgf6g6h9f30vqqa52"; depends=[data_table downloader dplyr httr janitor jsonlite magrittr memoise miniUI rgdal rio rstudioapi sf shiny stringi stringr XML]; }; BART = derive2 { name="BART"; version="2.7"; sha256="16klaqzp525da6swlcdcr13mjlm88zpqyqnzjk6l4nlcwa3b7z1m"; depends=[nlme nnet Rcpp survival]; }; BAS = derive2 { name="BAS"; version="1.5.5"; sha256="1iakx36r4lnl6xs77m9mfcj5w3mb4g482s2mpzq65v69k10nj8lj"; depends=[]; }; BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; }; BASS = derive2 { name="BASS"; version="0.2.2"; sha256="1q3sihp2iv1ikggzgd2k3vh2myz8bz31rzlaavw0n84d0h1zjxy2"; depends=[]; }; BASiNET = derive2 { name="BASiNET"; version="0.0.4"; sha256="0pmn4znqhpav729ai7zr027a7sx6bz2lmlk086crmwm1fnwipqq4"; depends=[Biostrings igraph randomForest rJava rmcfs RWeka]; }; - BAT = derive2 { name="BAT"; version="2.0.0"; sha256="0fwyarkgxxgckaky2wjf311ymlh78942j51a2dvjkwlbshcdqbij"; depends=[hypervolume nls2 raster spatstat vegan]; }; + BAT = derive2 { name="BAT"; version="2.0.1"; sha256="0vc75a0m4my6f1fwciwaf6qhhqr09lc59zgifhhz1188xsrv28h1"; depends=[hypervolume nls2 raster spatstat vegan]; }; BAYESDEF = derive2 { name="BAYESDEF"; version="0.1.0"; sha256="030xskgqqg0n85mphjv32ks4ysvxb36f6ayy0176gps14jhmhcp7"; depends=[glmnet gWidgets readxl REdaS]; }; BAYSTAR = derive2 { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[coda mvtnorm]; }; - BAwiR = derive2 { name="BAwiR"; version="1.2.2"; sha256="0src5d7bi9d8mcg9rijrz20v0a8gif52j7qggbvl2xa15gksxdag"; depends=[Anthropometry dplyr ggplot2 ggthemes hrbrthemes httr lubridate magrittr plyr purrr reshape2 rvest rworldmap scales stringi stringr tidyr xml2]; }; + BAwiR = derive2 { name="BAwiR"; version="1.2.3"; sha256="0kc4vq2cc6rp2hpy9a9bqmxvfpm9h4k9x7imwa9kgin3didi7vjp"; depends=[Anthropometry dplyr ggplot2 ggthemes hrbrthemes httr lubridate magrittr plyr purrr reshape2 rvest rworldmap scales stringi stringr tibble tidyr xml2]; }; BB = derive2 { name="BB"; version="2019.10-1"; sha256="0kf9sfsm3n036a8a8gjfpc9qdryvadb019kqjh80n1szdv7bdl04"; depends=[quadprog]; }; BBEST = derive2 { name="BBEST"; version="0.1-6"; sha256="1hvgi3679ixpq0c5qbxhkp1j0953k3lklglgxrq9mz2ry6z9n038"; depends=[DEoptim ggplot2 reshape2 shiny wmtsa]; }; BBI = derive2 { name="BBI"; version="0.3.0"; sha256="167sndfp3776p8n9zdpihc9xhqqi8wygzpl49dzkfj53gwa77rnn"; depends=[vegan]; }; @@ -307,7 +309,6 @@ in with self; { BMRV = derive2 { name="BMRV"; version="1.32"; sha256="1j1cwjk3l7f06nqdwrqdyhzm43bb8hj5wgdd14zc1grxyfc9ya95"; depends=[BH]; }; BMS = derive2 { name="BMS"; version="0.3.4"; sha256="0z3mk1xd1fphf80kdbashkn04jwsr2bghms4d7nav3pw73q41wql"; depends=[]; }; BMT = derive2 { name="BMT"; version="0.1.0.3"; sha256="1vdah5bsn41s2qriq15xi7dw9qzngaacmn5gk6yc7hi89dwyy3yj"; depends=[fitdistrplus partitions]; }; - BMTME = derive2 { name="BMTME"; version="1.0.12"; sha256="0v1f1c2nk7f51c017jscyzkx7y21b3lmxp46xgs8hqcfjfw9b65m"; depends=[BGLR doSNOW dplyr foreach matrixcalc mvtnorm progress Rcpp RcppArmadillo snow tidyr]; }; BMisc = derive2 { name="BMisc"; version="1.4.1"; sha256="176sqq24xyw9sz1pq721inmqwjxqqzbcp6w65f0m0n4b64yk5gyd"; depends=[]; }; BNDataGenerator = derive2 { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; }; BNN = derive2 { name="BNN"; version="1.0.2"; sha256="13h9xqfdqnc9d8brx1xlmvb4nrkpwncwjz98y7i3wijih85wkikd"; depends=[mvtnorm]; }; @@ -352,17 +353,16 @@ in with self; { BaPreStoPro = derive2 { name="BaPreStoPro"; version="0.1"; sha256="0zyyyrr5h8dhjsmgaii8jmb8ignvixpc9nzbfishw9yymjswvm57"; depends=[]; }; BaSTA = derive2 { name="BaSTA"; version="1.9.4"; sha256="1j092gsdip7rpw0g74ha0kjsrqpp5swi7wd4sxlmx6zarcqnxlal"; depends=[snowfall]; }; BaTFLED3D = derive2 { name="BaTFLED3D"; version="0.2.11"; sha256="0gab9iz1ra72hw8j31n97ysyr3cclhgvdxriyjk8wwv2nrmbw12h"; depends=[foreach iterators R6 RColorBrewer rTensor]; }; - BacArena = derive2 { name="BacArena"; version="1.8.1"; sha256="0ivrgv0i81hxfd1gpnx4z6akl0rpcb5sqsvk1xp7rbln14pg1pz4"; depends=[deSolve ggplot2 glpkAPI igraph Matrix plyr R_matlab Rcpp RcppArmadillo RcppEigen ReacTran reshape2 stringr sybil]; }; BalanceCheck = derive2 { name="BalanceCheck"; version="0.2"; sha256="0aal641vfbjk3w6ipwbqqmm9nnxs962hjmpph9wnqaqk5r6s7brs"; depends=[ade4 mvtnorm]; }; BalancedSampling = derive2 { name="BalancedSampling"; version="1.5.5"; sha256="01ayvjfs83dbnk0m9xb7y9rnxxpfpb6w4qjdffd6hdhcn2s5f73d"; depends=[Rcpp SamplingBigData]; }; Ball = derive2 { name="Ball"; version="1.3.9"; sha256="1cznrlgj75xwgpqqsnl0vnjd7pwvkna0cakdz4bcya4hn74dx27y"; depends=[gam mvtnorm survival]; }; BallMapper = derive2 { name="BallMapper"; version="0.2.0"; sha256="1hf94d41cks8mbrb985mpd0nqgirvm096cfv7bsy0182bbxlk6s1"; depends=[fields igraph networkD3 scales stringr testthat]; }; BarBorGradient = derive2 { name="BarBorGradient"; version="1.0.5"; sha256="0g2g7hrm23as1xbj79g48r8sj3gsj66fmi895jqlqfbqrl2fl7a5"; depends=[]; }; - BarcodingR = derive2 { name="BarcodingR"; version="1.0-2"; sha256="1mn5rdax8v1s2z3apk9z0kzy4hw19m8ql6j91l6wd29g2n2bjqxx"; depends=[ape class nnet sp]; }; + BarcodingR = derive2 { name="BarcodingR"; version="1.0-3"; sha256="03x26mrlvg00rnfh74wacpgbdk7xr2lq4yd0bx4q2442nli54rdv"; depends=[ape class nnet sp]; }; Barnard = derive2 { name="Barnard"; version="1.8"; sha256="1ki58hjs5kpmp76kwj1qi6hwmdvjphqb1lvrlhnmkgqxg4hw4vqg"; depends=[]; }; Barycenter = derive2 { name="Barycenter"; version="1.3.1"; sha256="0yhc0wwjqms569gnm8z2l9hgcbw8lyy437ynkij47pa4c1a1qvjy"; depends=[Rcpp RcppArmadillo]; }; BatchExperiments = derive2 { name="BatchExperiments"; version="1.4.2"; sha256="0zvcpgzhbna6p37jlf57j7mzrvh5xs5w17janmv9v4210cpbzi1q"; depends=[backports BatchJobs BBmisc checkmate data_table DBI RSQLite]; }; - BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.5.6"; sha256="0cwnr4fxpjfm7l4jf3mmf14fdqnvavj5if0xf6fdx1spn59w8s97"; depends=[crayon curl dplyr furrr future lubridate purrr quantmod rvest scales stringr tibble tidyr XML zoo]; }; + BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.5.7"; sha256="155wwskqagz3qcng71nn0v52mvassdinhmvaf1hv74dakvvfjrj2"; depends=[crayon curl dplyr furrr future lubridate purrr quantmod rvest scales stringr tibble tidyr XML zoo]; }; BatchJobs = derive2 { name="BatchJobs"; version="1.8"; sha256="1zz4sspj596pijxlz321g0jy2rg9ki83j6fihbwisjwr66p2vk1m"; depends=[backports BBmisc brew checkmate data_table DBI digest RSQLite sendmailR stringi]; }; BayHaz = derive2 { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; }; BayLum = derive2 { name="BayLum"; version="0.1.3"; sha256="0hina84s8ax01zpnji4jqqkdap0phvxr78s4rnab0407xrydbf0w"; depends=[ArchaeoPhases coda hexbin KernSmooth Luminescence rjags]; }; @@ -392,15 +392,15 @@ in with self; { BayesMixSurv = derive2 { name="BayesMixSurv"; version="0.9.1"; sha256="19kf39881q00pap9afwvvggk4s4w3qpz17b7065nig1mvk8dnp8r"; depends=[survival]; }; BayesNI = derive2 { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; }; BayesNSGP = derive2 { name="BayesNSGP"; version="0.1.1"; sha256="11c83iafhl8yasyy8xwk9wladbj986xpmgc8d3yd9dxkic71flw8"; depends=[FNN Matrix nimble StatMatch]; }; - BayesNetBP = derive2 { name="BayesNetBP"; version="1.4.0"; sha256="007anxk76rxwskc7fvbmaw7ihjnwqad0xmiy6iyv68lwrjifvpc2"; depends=[bnlearn doBy fields graph igraph qtl qtlnet RColorBrewer Rgraphviz]; }; + BayesNetBP = derive2 { name="BayesNetBP"; version="1.5.2"; sha256="0i5pr9q8fzfxwxp9cb85xs9gaywfbv6h37bg3xz01d292ir56pl9"; depends=[bnlearn doBy fields graph igraph qtl qtlnet RColorBrewer]; }; BayesPieceHazSelect = derive2 { name="BayesPieceHazSelect"; version="1.1.0"; sha256="0znbmv7crqycdx75jh02h6z8d6cifjszbrldv2yva4mkjxsydag5"; depends=[mvtnorm]; }; BayesPiecewiseICAR = derive2 { name="BayesPiecewiseICAR"; version="0.2.1"; sha256="1qrmw7zmygdzz84p76hyh2d8dx88b8xhbbd7radqm39g35zq5wz6"; depends=[mvtnorm]; }; - BayesPostEst = derive2 { name="BayesPostEst"; version="0.2.0"; sha256="0yyf9mawpq8ynw5mx0684f8yw3ajf01wadfdvs2yanjlgqbmy1sj"; depends=[carData caTools coda dplyr ggmcmc ggplot2 ggridges HDInterval R2jags reshape2 rlang ROCR runjags texreg tidyr]; }; BayesRS = derive2 { name="BayesRS"; version="0.1.3"; sha256="0fhvnckabp0z1cdsbjgv3ijnzaxwhrk83fwcflgqbhvm3a9lzr77"; depends=[coda ggplot2 metRology reshape rjags]; }; BayesReversePLLH = derive2 { name="BayesReversePLLH"; version="1.3"; sha256="07ijys5qd29qpa1hh6kbbp6fx97nmxydiijd0k0dh262vqfhh5ll"; depends=[Rcpp RcppArmadillo]; }; BayesS5 = derive2 { name="BayesS5"; version="1.41"; sha256="0vs6s50h4gpxda9lbxfgn76k9kp81l62a6bv22r7ixsjlnd4baql"; depends=[abind Matrix snowfall splines2]; }; BayesSAE = derive2 { name="BayesSAE"; version="1.0-2"; sha256="1xbx9hr254agpcqs1fl7qi7h19fd2bbmjszn44l566n2svgvxwf5"; depends=[coda Formula lattice]; }; - BayesSUR = derive2 { name="BayesSUR"; version="1.0-4"; sha256="1n38k9y1hvymfq556d5v2q69wqycvzdkjjgwzx0sz236wdqi64wv"; depends=[igraph Matrix Rcpp RcppArmadillo tikzDevice xml2]; }; + BayesSUR = derive2 { name="BayesSUR"; version="1.1-1"; sha256="0j5cmw85msqpb4zl4fdg1988d8z316zhbgm6yblfk4fgnszdnfh4"; depends=[igraph Matrix Rcpp RcppArmadillo tikzDevice xml2]; }; + BayesSampling = derive2 { name="BayesSampling"; version="1.0.0"; sha256="06gy902ksa753hn5p4zmsxaw6qg4qx4prd8n5m2w1300561cfbkl"; depends=[MASS Matrix]; }; BayesSpec = derive2 { name="BayesSpec"; version="0.5.3"; sha256="17gchdijcjhbr2y4glbq9szjh4qmgivzh6p4fllh589da18nzjcr"; depends=[mvtnorm pscl trust]; }; BayesSummaryStatLM = derive2 { name="BayesSummaryStatLM"; version="1.0-1"; sha256="05mlgyi4fglvjkpqyw3vcjpipqllx37svcb20c1mrsa46m6fm4s7"; depends=[ff mvnfast]; }; BayesTree = derive2 { name="BayesTree"; version="0.3-1.4"; sha256="0saca1ln582szqzc2c78z24b1lszzhc9hvsin73kb7r2dlg5ciii"; depends=[nnet]; }; @@ -419,7 +419,7 @@ in with self; { Bayesrel = derive2 { name="Bayesrel"; version="0.6.1"; sha256="1mdc53g17c4r078mw74iiir03ks8kv60qh16l8fqy00vzwvbgpi9"; depends=[coda ggplot2 ggridges LaplacesDemon lavaan MASS plotrix Rcsdp Rdpack]; }; BaylorEdPsych = derive2 { name="BaylorEdPsych"; version="0.5"; sha256="1kq6nvzdqwawygp7k62lw5hyccsj81jg82hq60yidgxnmmnnf7y2"; depends=[]; }; BcDiag = derive2 { name="BcDiag"; version="1.0.10"; sha256="1gyinmx5wn2kk70hiy28ghilkhfirfjbfqdrqq5h3wfb4khnq6pz"; depends=[fabia]; }; - Bchron = derive2 { name="Bchron"; version="4.7.0"; sha256="1wzi63szg6x6h8x5ngm8x3scp0qlgld5dyidqic5ibhvxd36rqhy"; depends=[coda dplyr ggforce ggplot2 ggridges magrittr MASS mclust purrr scales stringr]; }; + Bchron = derive2 { name="Bchron"; version="4.7.1"; sha256="1s6rvbxmsj5ksykxlvfzprxapn83wd8wcrq0yxpfd647jq4y7c20"; depends=[coda dplyr ggforce ggplot2 ggridges magrittr MASS mclust purrr scales stringr]; }; Bclim = derive2 { name="Bclim"; version="3.1.2"; sha256="0dd4fx3rlljj3zb1m8q1bam1bswg497l3y8k0h0mkvjn94b4jbag"; depends=[ggplot2 MASS mclust statmod]; }; BeSS = derive2 { name="BeSS"; version="1.0.8"; sha256="1yxinr3bfnk2ryal41l0j7i345aynrr62dd1rarrbyspxfrhimiq"; depends=[glmnet Matrix Rcpp RcppEigen survival]; }; Benchmarking = derive2 { name="Benchmarking"; version="0.28"; sha256="1f13m6fz9wd6zzknglcl0za16dbjsxn9f2714rpg8hcsr3hrlhdl"; depends=[lpSolveAPI ucminf]; }; @@ -430,17 +430,17 @@ in with self; { BetaBit = derive2 { name="BetaBit"; version="1.3"; sha256="1x9mfnijgi8726p82d52g2zgmliwsc97v2g96mz9ccz2vqqnwq4w"; depends=[digest]; }; BetaPASS = derive2 { name="BetaPASS"; version="1.1-1"; sha256="17q1bfmijv38zyaj5fxlylf5zmkqry4ca9wm5km6zpksgsg2kjjq"; depends=[betareg ggplot2 pbapply]; }; BeviMed = derive2 { name="BeviMed"; version="5.7"; sha256="1fjxin14x9i44wq6ad2i70k6sdfzy7zxyq1pibnmsyk4a0k2cfv1"; depends=[Rcpp]; }; - BeyondBenford = derive2 { name="BeyondBenford"; version="1.2"; sha256="0319jva0b43xcx7l0jyn0cxkazv7qi05bzmpas8wphk9f8r9jlim"; depends=[ggplot2]; }; + BeyondBenford = derive2 { name="BeyondBenford"; version="1.3"; sha256="08cfm4knssr5zhcc2xl7xgzxx39wv09hil305hi1s219ba7hzx3q"; depends=[ggplot2]; }; Bhat = derive2 { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; }; BiBitR = derive2 { name="BiBitR"; version="0.3.1"; sha256="0wfwph6nw12hb43j14i9ycj8m2zn0m5ynp7afq9cray8rbgvxfv6"; depends=[biclust cluster dendextend foreign lattice randomcoloR viridis]; }; - BiDAG = derive2 { name="BiDAG"; version="1.3.0"; sha256="0pbb77k0fipbd0bx9dxwlcqkgwyvx34865wc9b98g40zvzqn903f"; depends=[graph pcalg Rcpp Rgraphviz]; }; + BiDAG = derive2 { name="BiDAG"; version="1.3.4"; sha256="16s7925lz59sscj6zpbm9g1irpg21rqr9kn55175wll2gwgmhy4m"; depends=[graph pcalg Rcpp]; }; BiDimRegression = derive2 { name="BiDimRegression"; version="2.0.0"; sha256="0k0708z6xn04zjkc4sk15649wji6hl5q4rvd28sz5kbq7z54j1j5"; depends=[Formula]; }; BiProbitPartial = derive2 { name="BiProbitPartial"; version="1.0.3"; sha256="0y19b8bkwr7rpygmj03013slmfbyd7aj6714hm14w5rdbnckymw3"; depends=[coda Formula mvtnorm numDeriv optimr pbivnorm Rcpp RcppArmadillo RcppTN]; }; BiSEp = derive2 { name="BiSEp"; version="2.2"; sha256="1ha7rc1q54dr2xl4bpkiwl703igmmi9qphsgv2h0flq7iz0gr351"; depends=[AnnotationDbi GOSemSim mclust]; }; BiTrinA = derive2 { name="BiTrinA"; version="1.3"; sha256="0sjq5a21vpsjs0ad0v8gsqlbk3n8virg1hzj0nvgm3h3xqhymh1d"; depends=[diptest]; }; BiasedUrn = derive2 { name="BiasedUrn"; version="1.07"; sha256="13i2lgfnjhlbbm2yxfc2l5hswqw6x03pwba5csjmirv8kpjw4xr3"; depends=[]; }; BibPlots = derive2 { name="BibPlots"; version="0.0.6"; sha256="0gbywbxhqw226mzhxlkl98yky206f9m81wcrp6r4wj8wqhzc2fay"; depends=[]; }; - BifactorIndicesCalculator = derive2 { name="BifactorIndicesCalculator"; version="0.1.0"; sha256="1yawxab606408ribb1mb3aa6a46blv8aqhi9v68cyc0dbd3cjqx8"; depends=[lavaan mirt MplusAutomation tidyr]; }; + BifactorIndicesCalculator = derive2 { name="BifactorIndicesCalculator"; version="0.2.0"; sha256="117l4j9h64rh65zs5j0xzdx1mn172lkak6pvkhlbc9c8g5rkfcv2"; depends=[lavaan mirt MplusAutomation tidyr]; }; BigQuic = derive2 { name="BigQuic"; version="1.1-8"; sha256="1kg48jqm62qmz5x0h6fgvd5fs5dvg51x4spsn1q503ag4dqqdjc0"; depends=[Matrix Rcpp scalreg]; }; BigSEM = derive2 { name="BigSEM"; version="0.2"; sha256="091fdibcxd8a8kf9k4pvc1sah830wh179f28gag9g816h4qclnx9"; depends=[MASS parcor]; }; BigTSP = derive2 { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[gbm glmnet randomForest tree]; }; @@ -448,9 +448,9 @@ in with self; { BimodalIndex = derive2 { name="BimodalIndex"; version="1.1.9"; sha256="1m1dcj0ryjicaqjlkch7aymsklmvjvn2dvnbssi1cpi54bzn8l7g"; depends=[mclust oompaBase]; }; BinGSD = derive2 { name="BinGSD"; version="0.0.1"; sha256="0ygr5na7s82xa6vv9f3j6ns5sfhdacyykl1fg422lpkwbss39dnn"; depends=[mvtnorm]; }; BinMat = derive2 { name="BinMat"; version="0.1.2"; sha256="17f5aaz8csfs1x1x7dxvbi4g97cp75kz7ikijsyk4pgpalld58a4"; depends=[magrittr MASS pvclust]; }; - BinNonNor = derive2 { name="BinNonNor"; version="1.5.1"; sha256="1afxf0lcdsvw7ky3v25jyl9z9krknvw10ryi2fhgjbydq1nyijl6"; depends=[BB corpcor Matrix mvtnorm]; }; - BinNor = derive2 { name="BinNor"; version="2.3.1"; sha256="07f08nn9sbpgddm849rgabka1cb19j3s1yg1c1wydbgfkjakv95x"; depends=[corpcor Matrix mvtnorm psych]; }; - BinOrdNonNor = derive2 { name="BinOrdNonNor"; version="1.5"; sha256="0pw0a4g0v9g5k89hy5jz7hy4f3qg8fwyij6b1lj0b7bpy4mg0kv5"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; }; + BinNonNor = derive2 { name="BinNonNor"; version="1.5.2"; sha256="13zgj4n4jhrmjv1wldvamg6dpd6qpn3nwflvf5qhhbd3r0h0jf9x"; depends=[BB corpcor Matrix mvtnorm]; }; + BinNor = derive2 { name="BinNor"; version="2.3.2"; sha256="1332lffb57si2vay4hcw6zj2mm0pzp3d9cd11vfszgnp17x8b5ss"; depends=[corpcor Matrix mvtnorm psych]; }; + BinOrdNonNor = derive2 { name="BinOrdNonNor"; version="1.5.1"; sha256="1rvzgh0ly349606aw6w4g32c1csy221qizf4wmfzbv19ppixpffy"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; }; BinQuasi = derive2 { name="BinQuasi"; version="0.1-6"; sha256="0jf7zf3yqr2kgcm6h35234x2dqf65d2dzsh63b4q8m5l36r77k59"; depends=[BiocGenerics csaw edgeR GenomicAlignments GenomicRanges IRanges mgcv pracma quadprog RMySQL Rsamtools S4Vectors SummarizedExperiment]; }; BinSegBstrap = derive2 { name="BinSegBstrap"; version="1.0"; sha256="0iia9sbpnqp07h591d7ifvxq74nvnv0xspka2479qy7il9p65d3r"; depends=[Rcpp]; }; Binarize = derive2 { name="Binarize"; version="1.3"; sha256="0xmgxlfyvgkv7xpngy9am6ihzwbjbfgp7psfnyhb1v0kj9iy7ids"; depends=[diptest]; }; @@ -471,7 +471,6 @@ in with self; { Biocomb = derive2 { name="Biocomb"; version="0.4"; sha256="0jqfac81r5731m0i9jq7v5ns9263p8r7i03jyz10y915kfr6ikh6"; depends=[arules class e1071 FSelector gtools MASS nnet pamr pROC randomForest Rcpp rgl ROCR rpart RWeka]; }; Biodem = derive2 { name="Biodem"; version="0.4"; sha256="0k0p4s21089wg3r3pvyy9cxsdf4ijdl598gmxynbzvwpr670qnsh"; depends=[]; }; BiodiversityR = derive2 { name="BiodiversityR"; version="2.11-3"; sha256="1ba19vlxpy88xcryf3xki3h49hbmkz9hf69lni6swl2rh1k7fx41"; depends=[Rcmdr rgl vegan vegan3d]; }; - Biograph = derive2 { name="Biograph"; version="2.0.6"; sha256="0vklqwbifbac3v9ws9fs22yxpqqk5b3m96qzr8j0irnimb5kgh5p"; depends=[Epi etm ggplot2 lubridate msm mstate mvna plyr reshape survival]; }; Bioi = derive2 { name="Bioi"; version="0.2.10"; sha256="1ay8889490nfhxhh72fvk9z4h58xknm2b145xhbx2wbzj65zf9ib"; depends=[assertthat dplyr igraph Rcpp]; }; Biolinv = derive2 { name="Biolinv"; version="0.1-2"; sha256="0g9vw1jcsjawmddkixssm5gbncy17fdd6a3c5b2qd4hx81kxz8q9"; depends=[classInt fields raster sp spatstat]; }; Biopeak = derive2 { name="Biopeak"; version="1.0"; sha256="1l08m1jl8yygbdfzk8klpj1q2m7icvxi98vmk7akxs0sswjc6wd2"; depends=[cluster dbscan factoextra gplots RColorBrewer]; }; @@ -502,7 +501,7 @@ in with self; { BondValuation = derive2 { name="BondValuation"; version="0.1.0"; sha256="1sgnf5a6rm1br6i82bmp7s044012bwfxa9yb6bjkq8kr83mf7i6v"; depends=[Rcpp timeDate]; }; BoolFilter = derive2 { name="BoolFilter"; version="1.0.0"; sha256="14z4fzf8p4wgi939qs6v39a3xizccjcx7j4szsydllpkvxbwggbw"; depends=[BoolNet Rlab]; }; BoolNet = derive2 { name="BoolNet"; version="2.1.5"; sha256="11fysc39vfk3zb9qklryi8gl42c3hqgzlvci4jj0zkqnm0v9amqk"; depends=[igraph XML]; }; - Boom = derive2 { name="Boom"; version="0.9.4"; sha256="0m1yls9wm0p4k7v7760fycb4157k0f00h50gs1h6x17d5z9w2i7q"; depends=[MASS]; }; + Boom = derive2 { name="Boom"; version="0.9.5"; sha256="0k76lh8v25v5k0axmgvkn85kf3d36klqqp9nd8hzzaiwkfjc60kh"; depends=[MASS]; }; BoomSpikeSlab = derive2 { name="BoomSpikeSlab"; version="1.2.2"; sha256="0wz0b7ayhk97zva3mkxbpsf9ddsqdldzl1b1cv9b7qvakn8k7if9"; depends=[Boom]; }; BoostMLR = derive2 { name="BoostMLR"; version="1.0.2"; sha256="1iy8v9jc13wncz6z3rqlbxkf9lclq0qynp4m54b5xl35qz9xq676"; depends=[nlme Rcpp RcppArmadillo]; }; BootMRMR = derive2 { name="BootMRMR"; version="0.1"; sha256="07am80603pv1dh5ma3zb0idnslkzm5m3ym8sd1nhkh8zbc6qqmzs"; depends=[]; }; @@ -550,7 +549,7 @@ in with self; { CATkit = derive2 { name="CATkit"; version="3.3.3"; sha256="01q2ssyg0jcjgahaslfgpakjsv2wil654lc6xrg5xbbrkx7ccb90"; depends=[assertr CombMSC Hmisc magic MASS png rtf season signal]; }; CAinterprTools = derive2 { name="CAinterprTools"; version="1.0.0"; sha256="1ia4qfvj0nzxi6pwqnha2vpfcx3qwaw4vrjqiza11sai274j0pjy"; depends=[ca classInt cluster FactoMineR ggplot2 ggrepel Hmisc RcmdrMisc reshape2]; }; CAvariants = derive2 { name="CAvariants"; version="5.5"; sha256="0bxifvhpjay18k6gkppypc1d0zaln1zhnxabvvld0pz4h59s2hlv"; depends=[ggforce ggplot2 ggrepel gridExtra plotly]; }; - CB2 = derive2 { name="CB2"; version="1.3.0"; sha256="050fpyj0zrgl03a2mdp9xrl72ad0d92kl7s9swgn2a7g8ca34c0k"; depends=[dplyr ggplot2 glue magrittr metap pheatmap R_utils Rcpp RcppArmadillo readr stringr tibble tidyr]; }; + CB2 = derive2 { name="CB2"; version="1.3.1"; sha256="14jx583lgm2yisdz3mkswpgzxz5lb86c9x66b94cn9mrhcnqlfb7"; depends=[dplyr ggplot2 glue magrittr metap pheatmap R_utils Rcpp RcppArmadillo readr stringr tibble tidyr]; }; CBCgrps = derive2 { name="CBCgrps"; version="2.7"; sha256="1hqndrz3snir3pibqsbyzgbllgmdiprgq27a31vl29vkswpiwwsm"; depends=[nortest]; }; CBDA = derive2 { name="CBDA"; version="1.0.0"; sha256="0qm77vvqjgi83i8izly995ziv9ski8kgzqyq4g81i2k7a5dp8vxv"; depends=[doParallel foreach prettydoc SuperLearner]; }; CBPS = derive2 { name="CBPS"; version="0.21"; sha256="0av9lgdn9z57xl9cp53pi9nq971a6fj4przczw7sdb5saml3yr30"; depends=[glmnet MASS MatchIt nnet numDeriv]; }; @@ -591,6 +590,7 @@ in with self; { CIEE = derive2 { name="CIEE"; version="0.1.1"; sha256="03kq9cp0v41y0r2l9j5imcrsail2xsvlzhhhsrw454d4s9gqdql9"; depends=[survival]; }; CIFsmry = derive2 { name="CIFsmry"; version="1.0.1.1"; sha256="1m2m2zvg9ghy3bm2sll7jp4xm2vw58kc5xaxd2c9k82771m3a4j0"; depends=[]; }; CIM = derive2 { name="CIM"; version="1.0.0"; sha256="02l8rspiiv6vj6k0q6wpiazny3f2s4dsivsm7zb9cm90qh1rv2d7"; depends=[]; }; + CIMTx = derive2 { name="CIMTx"; version="0.1.0"; sha256="0z2xxmmlybgl3ydyhkdkyd9frwi8ddqi89dfwa0rdl6gg59rawmk"; depends=[arm BART car class dplyr gam magrittr Matching nnet SuperLearner tidyr tmle twang WeightIt]; }; CINID = derive2 { name="CINID"; version="1.2"; sha256="0pkgzi2j0045p10kjvnq8f4j1agzrqfw0czvvfrzj9yjfpj8xc99"; depends=[]; }; CINNA = derive2 { name="CINNA"; version="1.1.53"; sha256="0mp7fvsxiri6454s7hlpsy9r3ysy6vdb3yslnizgqi38rb17phik"; depends=[centiserve circlize corrplot dendextend factoextra FactoMineR GGally ggplot2 igraph intergraph network pheatmap plyr qdapTools Rtsne sna viridis]; }; CISE = derive2 { name="CISE"; version="0.1.0"; sha256="10mbi4v8dfdc9ngnrrmxpng8fnig5m8nv7799jksbcf6pnj8yv51"; depends=[far gdata glmnet MASS Matrix rARPACK]; }; @@ -614,7 +614,7 @@ in with self; { CNLTreg = derive2 { name="CNLTreg"; version="0.1-2"; sha256="07yi0ajil1113663v3gp5d3453r4l9qm442jnpydx4ygvjk7m2ha"; depends=[adlift miscTools nlt]; }; CNLTtsa = derive2 { name="CNLTtsa"; version="0.1-2"; sha256="1vy0jjg6s8yvsvkx4pin183y5bnikm5cmjcpa9znz9dj1w6hwr5r"; depends=[adlift CNLTreg fields nlt]; }; CNOGpro = derive2 { name="CNOGpro"; version="1.1"; sha256="1frsmhfqrlg1vsa06cabqmrzngq4p5gqwyb9qgnsgg81a9ybm6l8"; depends=[seqinr]; }; - CNVScope = derive2 { name="CNVScope"; version="2.9.4"; sha256="1nkaghrp7wn8h0gq6i4lny2n1lxhk0a6dwyz7d1k5k1vv6xnxwf8"; depends=[BiocManager biomaRt BSgenome_Hsapiens_UCSC_hg19 circlize data_table doParallel dplyr foreach GenomeInfoDb GenomicFeatures GenomicInteractions GenomicRanges ggplot2 heatmaply HiCseg htmltools htmlwidgets igraph InteractionSet IRanges jointseg logging magrittr Matrix matrixStats numbers OpenImageR plotly plyr RCurl reshape2 rslurm rtracklayer S4Vectors shiny shinycssloaders shinyjs shinythemes spatialfil stringr tibble tidyr visNetwork]; }; + CNVScope = derive2 { name="CNVScope"; version="3.0.5"; sha256="0y131sk4dihfnqz30c2jz2pkzk53f266afr56y097vnbhzsqpaiw"; depends=[BiocManager biomaRt BSgenome_Hsapiens_UCSC_hg19 circlize data_table doParallel dplyr DT foreach GenomeInfoDb GenomicFeatures GenomicInteractions GenomicRanges ggplot2 heatmaply HiCseg htmltools htmlwidgets igraph InteractionSet IRanges jointseg logging magrittr Matrix matrixStats numbers OpenImageR plotly plyr RCurl reshape2 rslurm rtracklayer S4Vectors shiny shinycssloaders shinyjs shinythemes spatialfil stringr tibble tidyr visNetwork]; }; CNprep = derive2 { name="CNprep"; version="2.0"; sha256="08dpjikx3ldqzw2kwb12q0kbw15qzl09srjdfs0sz9si0x6bfxs6"; depends=[mclust rlecuyer]; }; CNull = derive2 { name="CNull"; version="1.0"; sha256="14hy86zg18hqxi63bfzrpkz70yrzfxp2v2pva5xnrvx9dmlyz820"; depends=[ape Matrix PhyloMeasures Rcpp]; }; COBRA = derive2 { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; }; @@ -631,7 +631,7 @@ in with self; { COST = derive2 { name="COST"; version="0.1.0"; sha256="06xgnsccd621ihlrdmnnh14vh83q1r2bnp3iqi7vp5553b3y4l3w"; depends=[copula mvtnorm]; }; COUNT = derive2 { name="COUNT"; version="1.3.4"; sha256="02f7779fy0d2bql88x5v9csbxljhnyvl8wb8h83xrmwl7kaxsdpy"; depends=[MASS msme sandwich]; }; COUSCOus = derive2 { name="COUSCOus"; version="1.0.0"; sha256="1ykqi72v8v1b3g9qy6h34dvk5fynzf1rl2mby65p08axmaba5798"; depends=[bio3d matrixcalc]; }; - COVID19 = derive2 { name="COVID19"; version="0.2.1"; sha256="0fchc7a2g2q52ycbhbdrczvfrqvacwvkv72fdv4h4jsjn7j17hpl"; depends=[devtools dplyr gganimate ggplot2 ggthemes reshape2 rgdal sp tidyr]; }; + COVID19 = derive2 { name="COVID19"; version="1.0.0"; sha256="05nnpgiykyi2lk5pddxpwv9j64gvp0b9mb9n760nf226p2f0m7w4"; depends=[dplyr remotes tidyr]; }; CP = derive2 { name="CP"; version="1.6"; sha256="18zblf13riiz3mq3hkvg6vhiwjzpsn6mvgc2p0bqyldy98v4aisd"; depends=[survival]; }; CPAT = derive2 { name="CPAT"; version="0.1.0"; sha256="0zygncwww3cazwmx06bhzq0g41xcqfpw307azdhygc8jmcy6qj71"; depends=[purrr Rcpp RcppArmadillo Rdpack]; }; CPBayes = derive2 { name="CPBayes"; version="1.0.0"; sha256="0m9hy14xmaa0lswn2dlrjvqcsg14smxy3w1nmy48l3af1c2kjnxv"; depends=[forestplot MASS mvtnorm purrr]; }; @@ -677,7 +677,7 @@ in with self; { CVglasso = derive2 { name="CVglasso"; version="1.0"; sha256="1bh09cd0yabhqv5yfahhvayx3f09yqapzl1yr9nc9xqwyx1d0cfd"; depends=[doParallel dplyr foreach ggplot2 glasso]; }; CaDENCE = derive2 { name="CaDENCE"; version="1.2.5"; sha256="1z3p5y1l67r470x6wrhnyjvw1ndppcm08fpj99x122j7kn6byff2"; depends=[pso]; }; CaPO4Sim = derive2 { name="CaPO4Sim"; version="0.1.0"; sha256="1ihkx0swj9adz2pgfm9c20pcipq748czkyg76q3y0zk1j987nfik"; depends=[DT htmltools magrittr plotly purrr rintrojs shiny shinycssloaders shinydashboard shinydashboardPlus shinyjqui shinyjs shinyWidgets visNetwork]; }; - Cairo = derive2 { name="Cairo"; version="1.5-11"; sha256="1k9kpxcg5n4g6x2gydv344f4w0snqbhww14fnbbj1bny0mmv28xg"; depends=[]; }; + Cairo = derive2 { name="Cairo"; version="1.5-12"; sha256="02v29am4fac3fyq6y1w6r89zwbqqkxjsxrafcwb5s124ikxyl22f"; depends=[]; }; CalSim = derive2 { name="CalSim"; version="0.3.2"; sha256="1a4w9kh9ykms1i30hhd7h8gdkbfl6g071jmcy26j1sbshxrnq8s1"; depends=[spatstat]; }; Calculator_LR_FNs = derive2 { name="Calculator.LR.FNs"; version="1.3"; sha256="03qg9rnz623dwnp68xhhsh9788s49n6xp0migg1nnjaqhrahlgdd"; depends=[]; }; CalibratR = derive2 { name="CalibratR"; version="0.1.2"; sha256="1hnmhijckxd35h8mhpzqpglk1ykdih2c5kg17myc7cci5xjk9nfr"; depends=[doParallel fitdistrplus foreach ggplot2 pROC reshape2]; }; @@ -697,12 +697,10 @@ in with self; { CausalGAM = derive2 { name="CausalGAM"; version="0.1-4"; sha256="1riz11hfg96iks7734rg692l75nfrd3hmr9gw563j27rkk1nfkl6"; depends=[gam]; }; CausalImpact = derive2 { name="CausalImpact"; version="1.2.4"; sha256="0nszqvaxmz9jrb7wqdmjjplajk8mxpyyl14n2fm5p4pyx8srwphq"; depends=[assertthat Boom bsts dplyr ggplot2 zoo]; }; CausalKinetiX = derive2 { name="CausalKinetiX"; version="0.2.1"; sha256="0haxw4vvbw48hlvsl1d1y3xm48qm5vl0d3k5lj89ajwc618nk5jg"; depends=[cvTools deSolve fda glmnet pspline quadprog randomForest sundialr]; }; - Causata = derive2 { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[boot data_table foreach ggplot2 glmnet R_utils RCurl rjson RMySQL stringr XML yaml]; }; CautiousLearning = derive2 { name="CautiousLearning"; version="1.0.1"; sha256="1m5x93l4bscrpcxk0pva6d6n2qnzhzxh0a6a81p97l8lqgs1qw2q"; depends=[BH Rcpp sitmo spc]; }; CePa = derive2 { name="CePa"; version="0.7.0"; sha256="0jykh0f168azphjd3h1q81wlvj8zn8qy0c4wi275gvw0xwi104mk"; depends=[graph igraph Rgraphviz]; }; CeRNASeek = derive2 { name="CeRNASeek"; version="2.1.2"; sha256="1bjx474wbxs4wxy6j4n578cggmcj0061kbbkyhfif65qbsfgrcf8"; depends=[gtools igraph survival]; }; CenBAR = derive2 { name="CenBAR"; version="0.1.0"; sha256="0qa1jzgvf33fi0vns7v49hjk0wkaxic7dw67m0wr33wjplf93wnh"; depends=[cvTools foreach glmnet MASS mvtnorm survival]; }; - CensMFM = derive2 { name="CensMFM"; version="2.0"; sha256="1p129x2b6avv7h5ifjmkds2yfw0jwm3q1cqyrpy8j9nkli0crg1y"; depends=[ggplot2 gridExtra MomTrunc mvtnorm tlrmvnmvt]; }; CensRegMod = derive2 { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; }; Census2016 = derive2 { name="Census2016"; version="0.2.0"; sha256="1c88jmd565v19w8dbvai10f9y5lyfmzsxsjblc3gdykf9kharvcq"; depends=[data_table]; }; CepLDA = derive2 { name="CepLDA"; version="1.0.0"; sha256="15vhk7l5mw2kicw2x60r4z71hc415g8kaf2p06jgf7ykxmzkj7kg"; depends=[astsa class MASS multitaper]; }; @@ -718,7 +716,7 @@ in with self; { CheckDigit = derive2 { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; }; ChemoSpec = derive2 { name="ChemoSpec"; version="5.2.12"; sha256="1qr09n2yc009x8ag0lbmn1m93qhck05jc8vx7j5wfa0g4i1b2r7f"; depends=[ChemoSpecUtils plyr readJDX]; }; ChemoSpec2D = derive2 { name="ChemoSpec2D"; version="0.4.147"; sha256="0rmnkk9ddxr32l09bj8qkh1jpffwkyczjr6vwk1qliwfwsbc78rl"; depends=[ChemoSpecUtils colorspace readJDX]; }; - ChemoSpecUtils = derive2 { name="ChemoSpecUtils"; version="0.4.38"; sha256="1b7czs41jsniw1hnrm1c5z6pc5yiybbdnp2bqr810farmv61slzz"; depends=[plyr]; }; + ChemoSpecUtils = derive2 { name="ChemoSpecUtils"; version="0.4.51"; sha256="0wwzv6qkm6iya6gld1jlxk1hnzf6ndpwjppk93bi6pgjkgjq5i5g"; depends=[plyr]; }; ChemometricsWithR = derive2 { name="ChemometricsWithR"; version="0.1.13"; sha256="166va1g3m1wv21qkmw4wpz0bsrclh3jih8smxphdc13l9pqgclpq"; depends=[devtools kohonen MASS pls]; }; ChillModels = derive2 { name="ChillModels"; version="1.0.2"; sha256="06hgg893anh5z8an4l1xl4liz7d0m79n21h116vkdlymayccydbr"; depends=[]; }; ChoR = derive2 { name="ChoR"; version="0.0-4"; sha256="08mildsx542zfm0kcdakcv7c71hb4jgbcq1lhidf0fz76zj1pzk1"; depends=[commonsMath rJava]; }; @@ -748,6 +746,7 @@ in with self; { ClimMobTools = derive2 { name="ClimMobTools"; version="0.3.2"; sha256="1nsisbqsgwk91by6bx8igf1bn94cbcvnw9dbs7gfb14wnng2422l"; depends=[climatrends httr jsonlite Matrix RSpectra tibble]; }; ClimProjDiags = derive2 { name="ClimProjDiags"; version="0.1.0"; sha256="00w7ffcv9axddjvmc0w58c9ncy8z58lf651c5pxsq7492x3vifcm"; depends=[multiApply PCICt plyr]; }; ClinicalTrialSummary = derive2 { name="ClinicalTrialSummary"; version="1.1.1"; sha256="0b5by4sn9yvrvxr9921yqsgp8ma3g1hi2qbp5j9m836db1zjhyla"; depends=[Rcpp]; }; + ClinicalUtilityRecal = derive2 { name="ClinicalUtilityRecal"; version="0.1.0"; sha256="17xj9cmdkjrzx7mshka2hlkxh8887sprdqix7fd8jcr9bmc6ad9r"; depends=[caret cowplot ggplot2 lattice nloptr]; }; CliquePercolation = derive2 { name="CliquePercolation"; version="0.2.0"; sha256="1zllhl1674734sr0hmfgwdyqlk4rcjdqqrd7rx30llqri478jdff"; depends=[colorspace igraph magrittr Matrix Polychrome qgraph]; }; CloneSeeker = derive2 { name="CloneSeeker"; version="1.0.9"; sha256="0xcdknh2fibg86h2ip8jzsv4sbai1yl19ni3g1h5p0zlyigkhs1s"; depends=[combinat gtools quantmod]; }; CluMP = derive2 { name="CluMP"; version="0.8"; sha256="130aqfxdp1pj5z3hnmy06rp5ywcmr389wn114ja5c2imxxkm3fi3"; depends=[amap data_table dplyr ggplot2 MASS NbClust rlang tableone]; }; @@ -755,7 +754,7 @@ in with self; { ClusBoot = derive2 { name="ClusBoot"; version="1.0"; sha256="1wh9mv932zarl8w098lgv2jpanp6r8nzdkyayv8nxk7nddl0bn1k"; depends=[]; }; ClusVis = derive2 { name="ClusVis"; version="1.2.0"; sha256="06yckdl3gxjia1gjjqpc29lvy4f7qf47fncslng9ggjnks6il145"; depends=[MASS mgcv mvtnorm Rcpp RcppArmadillo Rmixmod VarSelLCM]; }; ClussCluster = derive2 { name="ClussCluster"; version="0.1.0"; sha256="1436849m2mnm8j7lf653zv8lcvvg2ch8kkks4bvr39kx21wxy8ss"; depends=[ggplot2 reshape2 rlang scales VennDiagram]; }; - ClustBlock = derive2 { name="ClustBlock"; version="2.1.1"; sha256="0zgrv0bayrfp7hw14zmfl3752l1kjk27lfdgalbx39rgf4pn245g"; depends=[FactoMineR]; }; + ClustBlock = derive2 { name="ClustBlock"; version="2.2.0"; sha256="07hcgfap2bjcwy8bynz1hk2cb1amli204k2fsjc30m9p7bhyrqs3"; depends=[FactoMineR]; }; ClustGeo = derive2 { name="ClustGeo"; version="2.0"; sha256="1p5k2w1k7hnacbazzj2yhxh4z2jngnsl4v5a9b3c8z1dr4nhcwxc"; depends=[sp spdep]; }; ClustImpute = derive2 { name="ClustImpute"; version="0.1.3"; sha256="1rfs8vbpqjskl5ap12x6qmxg4ygaaycaas8x3ylaqvlvyy9ywhki"; depends=[ClusterR copula dplyr magrittr rlang]; }; ClustMMDD = derive2 { name="ClustMMDD"; version="1.0.4"; sha256="0sblf3crpai53dflhyi27yn6mg0xyy9dxhwsk8j57sq5vr50x686"; depends=[Rcpp]; }; @@ -767,7 +766,7 @@ in with self; { ClusterRankTest = derive2 { name="ClusterRankTest"; version="1.0"; sha256="01gzalhibqcdx3a6yc2cm1v77rscva73v5m5m0qkrgqdp9c8ph2a"; depends=[]; }; ClusterStability = derive2 { name="ClusterStability"; version="1.0.3"; sha256="1laa5m3y1rc7jr8q3i9qb3izs7qmadz169w9xm8q3mm3834ngn9b"; depends=[cluster clusterCrit copula Rcpp WeightedCluster]; }; ClusteredMutations = derive2 { name="ClusteredMutations"; version="1.0.1"; sha256="1n31nnvpjh1faw751k8m3ga3wfl0yhdpnszwckqhfzlma1jr8z04"; depends=[seriation]; }; - Clustering = derive2 { name="Clustering"; version="1.1"; sha256="0qc01bgvf7r7v2y24w4g6ha56mr2p7ng23g406pfnj3vykki8h0w"; depends=[advclust amap apcluster cluster ClusterR data_table gama gmp pracma pvclust sqldf xtable]; }; + Clustering = derive2 { name="Clustering"; version="1.6"; sha256="0r0awijhzv611qf2r2n1xwd369s9719r5hfvw2hipiy0jssfqfbv"; depends=[advclust amap apcluster cluster ClusterR data_table gama ggplot2 glue gmp pracma pvclust sqldf xtable]; }; CoClust = derive2 { name="CoClust"; version="0.3-2"; sha256="04xv807785xv9kdspsspx1302ardv8gda06kd590lgawjixai7dh"; depends=[copula gtools]; }; CoDiNA = derive2 { name="CoDiNA"; version="1.1.1"; sha256="00kda4grizdgh9xs0vywg9npjj7i97vbdf0hvzl96657rcillwdh"; depends=[data_table igraph magrittr plyr visNetwork]; }; CoFRA = derive2 { name="CoFRA"; version="0.1002"; sha256="0ldf84dxaanww3qkf64mz5gv3yv2rjp9m6dy64xckds66vw6x0m3"; depends=[gplots stringr]; }; @@ -867,7 +866,7 @@ in with self; { CropDetectR = derive2 { name="CropDetectR"; version="0.0.1"; sha256="14sabqld94if7f2m39bh6652cb62hcwx53k8q5k23anzzsn93qlj"; depends=[dplyr EBImage imager reshape2]; }; CrossClustering = derive2 { name="CrossClustering"; version="4.0.3"; sha256="05lbdmblwmmv24h46ixxabbrp7mpajyv7raw1p5h0dmsbfbq9hi5"; depends=[assertive cli cluster crayon dplyr flip glue magrittr mclust purrr]; }; CrossScreening = derive2 { name="CrossScreening"; version="0.1.1"; sha256="1gig80r8p611ysn35ajx7xdjj5wnkcf1vspcf0i06dmh75xpm3w9"; depends=[plyr tables]; }; - CrossVA = derive2 { name="CrossVA"; version="0.9.9"; sha256="0k2czhnb3jws86p2iv9fv3qarxbh1dd4xxnv2hdwz0y82y6mkkvx"; depends=[stringi]; }; + CrossVA = derive2 { name="CrossVA"; version="0.10.0"; sha256="08mq8d6la5gz3yv5a3lc70dxdgf29q1vngi8lrgdy58p9415pxjv"; depends=[stringi]; }; CrossValidate = derive2 { name="CrossValidate"; version="2.3.4"; sha256="1q5wnw2llvlw3hbjg0zccipk3ns31m2339x1aj6m526zhvgl2wvx"; depends=[Modeler oompaBase]; }; CryptRndTest = derive2 { name="CryptRndTest"; version="1.2.2"; sha256="1cg0agwqp1f7pgxdf9wilwparklyfsv900r47fpihnqw3ycvbdai"; depends=[gmp kSamples LambertW MissMech Rmpfr sfsmisc tseries]; }; CrypticIBDcheck = derive2 { name="CrypticIBDcheck"; version="0.3-3"; sha256="1c7n020i9lxp0fam05k9v4az4rvx8fakhzi9fkma82smpl709x8q"; depends=[car chopsticks ellipse rJPSGCS]; }; @@ -875,7 +874,7 @@ in with self; { Cubist = derive2 { name="Cubist"; version="0.2.3"; sha256="1x71n72n12alyl7d9vdf3xb3ks14lql4pxxxnimk2gq7brc5z10r"; depends=[lattice reshape2]; }; CustomerScoringMetrics = derive2 { name="CustomerScoringMetrics"; version="1.0.0"; sha256="166v0hbxy4xgbfqh7sx6zsrv4pghqpimx5xry3h2qwynnvr4ng1a"; depends=[]; }; CutpointsOEHR = derive2 { name="CutpointsOEHR"; version="0.1.2"; sha256="0r772zb7g10akcfnf2hnyvpvba4px9pgslyns7drmijdsh0ncnvj"; depends=[survival]; }; - Cyclops = derive2 { name="Cyclops"; version="2.0.2"; sha256="0pgarrk6znfsl75bq8rvrfl371cs5qjy9xb8zp607pwlprwapvfp"; depends=[BH bit ff ffbase MASS Matrix Rcpp RcppEigen survival]; }; + Cyclops = derive2 { name="Cyclops"; version="2.0.3"; sha256="1gbr9v2qs542c128zmx8nwvccfc1d5gnmhaiy2pb6hj0cqy5fjzb"; depends=[BH bit ff ffbase MASS Matrix Rcpp RcppEigen survival]; }; CytobankAPI = derive2 { name="CytobankAPI"; version="1.3.0"; sha256="1rrqhsqv5xc58dvkrbs9c83pkqz5np59shm7xjmqxdjj2rxj8zqn"; depends=[curl httr jsonlite]; }; CytobankAPIstats = derive2 { name="CytobankAPIstats"; version="2.0"; sha256="0xczcgaxd8dv6fd1j5c8y4il852lq8859d1y16sxs8a3gqn9fbz2"; depends=[CytobankAPI pheatmap shiny shinyFiles xlsx]; }; CytobankBridgeR = derive2 { name="CytobankBridgeR"; version="1.0.0"; sha256="0m8gxbm3p9gvdszymqx10n5rzb406r4f70a0in798c56mp2rcsl4"; depends=[CytobankAPI]; }; @@ -888,11 +887,11 @@ in with self; { DAIME = derive2 { name="DAIME"; version="2.1.3"; sha256="099pbzgryz9lxhcqlrywcv8zl5af4ir5dyyqvgc16xi5bddxk7ld"; depends=[]; }; DAISIE = derive2 { name="DAISIE"; version="1.4"; sha256="16653wwz20lhf3bpzflpj5d1h7j3cqyfaqk5gn24aifga2jc0wbb"; depends=[DDD deSolve Matrix subplex tensor]; }; DAKS = derive2 { name="DAKS"; version="2.1-3"; sha256="0vmpwxvksnmyq40faimbgpj0y3zbk519986n38ipwdfzllcg0zs4"; depends=[relations sets]; }; - DALEX = derive2 { name="DALEX"; version="1.0.1"; sha256="1jbyn57vn6d281a5y15h5d8ljin8cdb9lr7lbgggc950blyfv4g0"; depends=[ggplot2]; }; + DALEX = derive2 { name="DALEX"; version="1.2.0"; sha256="0mfcci54622gnk8al9fl2jhs9i2vfly7lam04y5rdacbyiam49j6"; depends=[ggplot2 iBreakDown ingredients]; }; DALEXtra = derive2 { name="DALEXtra"; version="0.2.1"; sha256="0r1vdjphmfwa95fpd3fx2hqfb23gb4i920j8l8xxraadr9hdac32"; depends=[DALEX ggdendro ggplot2 glmnet gridExtra reticulate]; }; DALY = derive2 { name="DALY"; version="1.5.0"; sha256="1v7ld01xcn5jiygl1c3xhd5h71ip90lks87fs9gmpnivp8jz5cr5"; depends=[]; }; DAMOCLES = derive2 { name="DAMOCLES"; version="2.2"; sha256="1rmm36k5w6y8pkb1vzkxnizx3my94kgai8h3x83cxr6mlbgn9lb8"; depends=[ape caper DAISIE DDD deSolve expm Hmisc Matrix matrixStats picante]; }; - DAMisc = derive2 { name="DAMisc"; version="1.5.3"; sha256="1lfhbynzbynaspgwc11prj0sd019nq7a7hhydim3znjb3i5q30z5"; depends=[AICcmodavg boot car clarkeTest coda effects fANCOVA gdata ggplot2 glue lattice latticeExtra MASS nnet optiscale rstan VGAM xtable]; }; + DAMisc = derive2 { name="DAMisc"; version="1.5.4"; sha256="1xs9jibpxg6py9ry4mad2yj4x99jnv19df0d6f9yc760wipb5ymk"; depends=[AICcmodavg boot car clarkeTest coda effects fANCOVA gdata ggplot2 glue lattice latticeExtra MASS nnet optiscale rstan xtable]; }; DAP = derive2 { name="DAP"; version="1.0"; sha256="0zzb05yxfaqp6qnr979q20rqy8sl5l825mxs0x9366qr7mz5k5ws"; depends=[MASS]; }; DBEST = derive2 { name="DBEST"; version="1.8"; sha256="1a598g02hpfgv572gchllqkppynnsp4lx764jg0g66w3b66k0kdy"; depends=[zoo]; }; DBGSA = derive2 { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; }; @@ -903,13 +902,13 @@ in with self; { DCA = derive2 { name="DCA"; version="2.0"; sha256="1acy33vyf814kr0aj6kdvi9f1qzgynwwzv57ll01gd0iqq36374f"; depends=[coin elasticnet GPArotation locfdr modeest mvtnorm PMA]; }; DCCA = derive2 { name="DCCA"; version="0.1.1"; sha256="06xdx79r7dr14dlk5vgcyd8ar4sc72imlyk66bnia1kvlynvdy69"; depends=[checkmate]; }; DCD = derive2 { name="DCD"; version="0.1.0"; sha256="0p6vk8fdvpcvb1bb5fwy3h1v8y3djlvcm5jl5lnx30ngqj6d7rcj"; depends=[data_table doParallel foreach ggplot2 igraph lattice lsa Matrix plyr qlcMatrix Rdpack ROCR WGCNA]; }; - DCEM = derive2 { name="DCEM"; version="2.0.1"; sha256="1ma6f7233jm0rzm12f406scgrj4b6xnv39aaplpgcvpx160nv3j1"; depends=[MASS matrixcalc mvtnorm Rcpp]; }; + DCEM = derive2 { name="DCEM"; version="2.0.2"; sha256="0wzbjy70h9agfpmpc5v3y8cdj4d7w2kqq1vmhfsz7vhpxpd1ygd0"; depends=[MASS matrixcalc mvtnorm Rcpp]; }; DCG = derive2 { name="DCG"; version="0.9.3"; sha256="08718x6v3g7kpfv0gpgm19cn3d3ynj7yagzs0jic1j5rwvn04pfb"; depends=[]; }; DCGL = derive2 { name="DCGL"; version="2.1.2"; sha256="1dhkdvdglpsr0fzrfrrr6q76jhwxgrcjsiqn56s082y7v366xvs4"; depends=[igraph limma]; }; DCL = derive2 { name="DCL"; version="0.1.0"; sha256="1ls3x3v0wmddfy7ii7509cglb28l1ix1zaicdc6mhwin0rpp2rx3"; depends=[lattice latticeExtra]; }; DCM = derive2 { name="DCM"; version="0.1.1"; sha256="191gwfv30hdr789jmdrimcc7aqisz635anydsw2v4s28a3zjbipw"; depends=[gWidgets pander readxl]; }; DCODE = derive2 { name="DCODE"; version="1.0"; sha256="19dwms88q0ylxd92l3ivig8p8jjyhk8mhgz0l36m9pcq11gyjc0n"; depends=[seqinr]; }; - DCPO = derive2 { name="DCPO"; version="0.5.0"; sha256="03j0aibh70ghh4nkna1iqsbylih3nc85zv9cb91mc4fp9ygcicag"; depends=[beepr BH dplyr forcats janitor purrr Rcpp RcppEigen rstan rstantools StanHeaders tibble tidyr]; }; + DCPO = derive2 { name="DCPO"; version="0.5.1"; sha256="0kkp59qmr4lpggb3fzp28dxc3vdv32dyy6myv92rrf4s3lyzdxab"; depends=[beepr BH dplyr forcats janitor purrr Rcpp RcppEigen rstan rstantools StanHeaders tibble tidyr]; }; DCchoice = derive2 { name="DCchoice"; version="0.0.16"; sha256="0wwhdpljg1k70kydhh89lk6c461a9vjw6p2ijzhvgkv2pl5rxaag"; depends=[Formula interval MASS]; }; DChaos = derive2 { name="DChaos"; version="0.1-3"; sha256="12qi8m2rvd5r8clmi44hiwpnr6zf1sjw35wvbvm4nz3431xwf4ng"; depends=[entropy NeuralNetTools nnet outliers pracma sandwich xts zoo]; }; DCluster = derive2 { name="DCluster"; version="0.2-7"; sha256="008nyry64s5g80narcc58273v0jhqzfgwynka6mh7jgi7qsqnxjd"; depends=[boot MASS spdep]; }; @@ -931,19 +930,20 @@ in with self; { DET = derive2 { name="DET"; version="2.0.2"; sha256="01vyb3mv4g7zpk7cn44i4069ndk9sn9qqs9k52clqbnf1kl1ynbx"; depends=[doParallel pROC]; }; DEoptim = derive2 { name="DEoptim"; version="2.2-5"; sha256="0nlm2gdvd33yrwambmlrgj76inxz2a65ya7727l98fd4skfdw4mf"; depends=[]; }; DEoptimR = derive2 { name="DEoptimR"; version="1.0-8"; sha256="1vz546hyjyhly70z62h5n3mn62b8llhhmim8ffp9y6jnnb0i2sc4"; depends=[]; }; + DEploid = derive2 { name="DEploid"; version="0.5.3"; sha256="0k5bcpfwf9fhkv0wp6s1nvp4l6xgwmdbz3l8mmiy8q1ym7gpvwml"; depends=[htmlwidgets magrittr plotly Rcpp rmarkdown scales]; }; DFA_CANCOR = derive2 { name="DFA.CANCOR"; version="0.1.6"; sha256="0pyql8xms08qn8kzf1h984ik1pbyy8z1wa1lf588pb6clwmd2mk8"; depends=[MASS MVN]; }; DFIT = derive2 { name="DFIT"; version="1.0-3"; sha256="1h0wvcplb7j7dqz9hkaw30x92ngxzkdvkwpg0142hrqb201zfrac"; depends=[ggplot2 mvtnorm simex]; }; DGCA = derive2 { name="DGCA"; version="1.0.2"; sha256="0k2a24ycagyxdx54dh9w8km25xhmmmhyyl26g76z4g5gqvcw092k"; depends=[matrixStats WGCNA]; }; DGLMExtPois = derive2 { name="DGLMExtPois"; version="0.1.2"; sha256="11gfj1pnfk9f8ap66yswbc1pq6k2n6893jadh2nvnhlkdk47bm28"; depends=[COMPoissonReg nloptr progress]; }; DGM = derive2 { name="DGM"; version="1.7.2"; sha256="0z0f8bazzsahvjkpfif50db700mqb7arcglwsfxcar9qdy082vsn"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; }; DGVM3D = derive2 { name="DGVM3D"; version="1.0.0"; sha256="17cxv8rm7kmxms7v7hzbwbdwa3xl1hwgiljf97ppwswglqyik9iv"; depends=[rgl]; }; - DHARMa = derive2 { name="DHARMa"; version="0.2.7"; sha256="13gs6v5z7lwjas7ln6nnlw125scmk517ma0y3jiwj1rn4vnhy41m"; depends=[ape doParallel foreach gap glmmTMB lme4 lmtest MASS mgcv qrnn sfsmisc spaMM]; }; + DHARMa = derive2 { name="DHARMa"; version="0.3.0"; sha256="160265r53b78lmgn9ynh0f2mqlb632rw8rvkpc72x9kwi7qw4yhw"; depends=[ape doParallel foreach gap glmmTMB lme4 lmtest MASS mgcv qgam sfsmisc spaMM]; }; DHBins = derive2 { name="DHBins"; version="1.1"; sha256="1g69acac7pxw8x0d9czyds7xljhbv9d686c99a3y8b4vh7dnx62s"; depends=[ggplot2]; }; DHS_rates = derive2 { name="DHS.rates"; version="0.7.0"; sha256="11rzwwx6vvr66nfklqh6j86k3d0cdccg6l99azwqif0cmj81rdw5"; depends=[crayon haven matrixStats reshape survey]; }; DIFboost = derive2 { name="DIFboost"; version="0.2"; sha256="0wyjk870n18lq0dwhm9ndsh5vv0d8wkrbcky68w454vzrrw1q9h8"; depends=[mboost penalized stabs]; }; DIFlasso = derive2 { name="DIFlasso"; version="1.0-3"; sha256="195wiy0jjkq6bh2b6wrjmr5l34pzx0i2qqvwp4pzv77sx737ds0v"; depends=[grplasso miscTools penalized]; }; DIFplus = derive2 { name="DIFplus"; version="1.1"; sha256="1k03lr437gx5y762z3h40hz9kcl4m8xgrndxvbyvsgmn2h6pbwsd"; depends=[plyr TestDataImputation]; }; - DIFtree = derive2 { name="DIFtree"; version="3.1.4"; sha256="1q02229vlmyxqasbxiscxvqpcip1r0sbwbp7ja909ljhc5b76pr8"; depends=[gridBase penalized plotrix VGAM]; }; + DIFtree = derive2 { name="DIFtree"; version="3.1.5"; sha256="110m24brsyvkvc03b9i48alg0x2ya69bz79c4cwi2bwr1cb2xfq1"; depends=[gridBase penalized plotrix VGAM]; }; DIME = derive2 { name="DIME"; version="1.2"; sha256="11l6mk6i3kqphrnq4iwk4b0ridbbpg2pr4pyqaqbsb06ng899xw0"; depends=[]; }; DIMORA = derive2 { name="DIMORA"; version="0.1.0"; sha256="0qcy2pqpx7za4ckf6wvmbhz5a52j44ksn81f8j1lj0z90idj6psn"; depends=[minpack_lm numDeriv]; }; DIRECT = derive2 { name="DIRECT"; version="1.0.1"; sha256="00z4xlc9kxn19lw2b8xq6krsf5v3wfbr1ghl5ah5shr9dnv84lc1"; depends=[]; }; @@ -951,7 +951,7 @@ in with self; { DIconvex = derive2 { name="DIconvex"; version="1.0.0"; sha256="0bnrq9nmryshir6ll43nz20aaqmmw0zjvfml72cpwbvrma8a3qmz"; depends=[lpSolveAPI]; }; DJL = derive2 { name="DJL"; version="3.2"; sha256="0vagpvmnbpnlxa1gj3y3gp0npf8hvpn8lyjrcggdn58rbcm2z3q9"; depends=[car lpSolveAPI]; }; DLASSO = derive2 { name="DLASSO"; version="2.0.2"; sha256="0xdygf6h89d9z4kqb46iqfxgdzq9dmkrxf9ypw78l4d8n9xx2gaa"; depends=[MASS]; }; - DLMtool = derive2 { name="DLMtool"; version="5.4.2"; sha256="0ja0729wsjwannjffz0mv0m6f7sq6sy14c1pbpbjm1547d9v01bn"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo snowfall]; }; + DLMtool = derive2 { name="DLMtool"; version="5.4.3"; sha256="0gyzwx419cby9x82i5r8xx6g7m97naj47lkay5kq5943sk7b3dvz"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo snowfall]; }; DMMF = derive2 { name="DMMF"; version="0.5.1.2"; sha256="0p82cfp0561j4ki20rznx46z7vqdxh128a0m0zj8d2wp3csn1aag"; depends=[raster rgdal sp]; }; DMRMark = derive2 { name="DMRMark"; version="1.1.1"; sha256="15wr6j0v9kvbv8y6flkp4svfqy059ziv89nxv91vp0pjmavhpdlz"; depends=[ellipse MCMCpack mvtnorm]; }; DMRnet = derive2 { name="DMRnet"; version="0.2.0"; sha256="1rbba8w4li240gw5z675d7skm72rh0zxzp4rhsn6ivj72jya7jw4"; depends=[glmnet grpreg]; }; @@ -973,7 +973,6 @@ in with self; { DPQ = derive2 { name="DPQ"; version="0.3-5"; sha256="0952aq9nh18mwldcxdi170i6aqz6snnsvl5g6qm8jq2m1i9jryjw"; depends=[sfsmisc]; }; DPWeibull = derive2 { name="DPWeibull"; version="1.5"; sha256="1dxrhd3wklg7q3grvplas6wcbs05kga1b2va6d0wkynld01ww9ii"; depends=[binaryLogic Rcpp truncdist]; }; DPtree = derive2 { name="DPtree"; version="1.0.1"; sha256="0d7zf695lwkx4gv50f08cbi3p3mjjay0qgrbmvybf9m15i4zmyd7"; depends=[MASS MCMCpack plyr Rdpack]; }; - DRAFT = derive2 { name="DRAFT"; version="0.3.0"; sha256="02y644fl5dk3qwvv45vb2zkkp4x1zciickna0pj56myh7ls08hxv"; depends=[coda ggplot2 gridExtra lubridate reshape]; }; DRAYL = derive2 { name="DRAYL"; version="1.0"; sha256="0cf5pyx6nwh8srdylpnmymv3dr67fm6qqpwd1hvj1wmyfc8fznpp"; depends=[cubature pracma RConics rmutil]; }; DREGAR = derive2 { name="DREGAR"; version="0.1.3.0"; sha256="15cplshs85r0z659mc7xmj5db7vc95wxs01c34isc22p8z0a287i"; depends=[msgps]; }; DRHotNet = derive2 { name="DRHotNet"; version="1.1"; sha256="040g9h2a2hmnd20y41xnms01iam68f6xhp2x0ckarmx961995bhg"; depends=[maptools PBSmapping raster sp spatstat spdep]; }; @@ -986,6 +985,7 @@ in with self; { DSBayes = derive2 { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; }; DSI = derive2 { name="DSI"; version="1.0.0"; sha256="0dc9xhmz4pg5d8pm2wiya7b0m793kx1campnaxl8mcs2gvdfahm9"; depends=[progress R6]; }; DSL = derive2 { name="DSL"; version="0.1-7"; sha256="05wj3zypr2kqfbka930qnwnk2r43pqi13pbs5n6lm8vdq4zjblw4"; depends=[]; }; + DSLite = derive2 { name="DSLite"; version="1.0.0"; sha256="05dd3bdlk0xsl5d6pc1sfraypjjppfpairg4k9vh1ca4a3cq8sr8"; depends=[DSI R6]; }; DSSAT = derive2 { name="DSSAT"; version="0.0.1"; sha256="06a5n484pc49ynrzaf3fm04884z6qwhd6kw0n4834fynpnflkkym"; depends=[dplyr glue lubridate purrr readr rlang stringr tidyr]; }; DSpat = derive2 { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[mgcv RandomFields rgeos sp spatstat]; }; DSpoty = derive2 { name="DSpoty"; version="0.1.0"; sha256="18z8gk3zj7k2szxg9579qy5klrqjw6zsk5x9jmwrv4qhb98fyji6"; depends=[dplyr httr purrr stringr]; }; @@ -1001,7 +1001,7 @@ in with self; { DTK = derive2 { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; }; DTMCPack = derive2 { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; }; DTR = derive2 { name="DTR"; version="1.7"; sha256="1lzvk9ar6xf3n2vvy8vb9mvrbx3nafzzhvz5g7vf79jd71yz54jd"; depends=[aod ggplot2 survival]; }; - DTRlearn2 = derive2 { name="DTRlearn2"; version="1.0"; sha256="0aly8byygpgsjfa1lzarcig2dvz852ihdlw7xhb7kx62y8prjzz1"; depends=[foreach glmnet kernlab MASS Matrix]; }; + DTRlearn2 = derive2 { name="DTRlearn2"; version="1.1"; sha256="0l756zb1wkpa1z5zjkc8jndmh2630gckxxfqslabzjmgsjf7fjgm"; depends=[foreach glmnet kernlab MASS Matrix]; }; DTRreg = derive2 { name="DTRreg"; version="1.5"; sha256="0milc5bmks6pxhl5f3zyv3w80ld733v05cvx8i531v2ynac4v6zb"; depends=[]; }; DTSg = derive2 { name="DTSg"; version="0.4.0"; sha256="0if4h5660wl5pb187lfhv00gdr9wp43w5xk1g4hf83jbnq06q424"; depends=[checkmate data_table R6]; }; DTWBI = derive2 { name="DTWBI"; version="1.1"; sha256="06lp4yc5nhacrgic78l014g2w1ibwgs8dp8zrahk5aripaczl25y"; depends=[dtw e1071 entropy lsa rlist]; }; @@ -1069,7 +1069,7 @@ in with self; { Devore7 = derive2 { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[lattice MASS]; }; Dforest = derive2 { name="Dforest"; version="0.4.2"; sha256="19jyph2zqfyq9vv22kb6fqy89l0vcviv19zgk10hbd7q850f6ryn"; depends=[ggplot2 rpart]; }; DiPhiSeq = derive2 { name="DiPhiSeq"; version="0.2.0"; sha256="11l2inf99vxz9k292307j8c2b25kc1066svy3vxrfl72rrm4fqa7"; depends=[]; }; - DiPs = derive2 { name="DiPs"; version="0.6.0"; sha256="03mi4f56896mnj5g0k7zdh90qcn3ahdxf62mvjy03ajvsdradm4p"; depends=[liqueueR mvnfast plyr]; }; + DiPs = derive2 { name="DiPs"; version="0.6.1"; sha256="0r6r0i417z4ax7cw1a7jbjhi0h2i2n43vf0y4770hyrl3m6spwfj"; depends=[liqueueR mvnfast plyr]; }; DiSSMod = derive2 { name="DiSSMod"; version="1.0.0"; sha256="199yipbc2sx2lsl51rpfyh80bfxaahfd2llqmfsp946gvj7339hv"; depends=[MASS matrixcalc psych sfsmisc]; }; DiagrammeR = derive2 { name="DiagrammeR"; version="1.0.5"; sha256="0d73aiv4fra1xwq63n3139anp479ni7dh370lxc3rc15g5qayxq8"; depends=[downloader dplyr glue htmltools htmlwidgets igraph influenceR magrittr purrr RColorBrewer readr rlang rstudioapi scales stringr tibble tidyr viridis visNetwork]; }; DiagrammeRsvg = derive2 { name="DiagrammeRsvg"; version="0.1"; sha256="0j2cm1mx3zrb2k3pcrb96z2z3kws61gyyjsjjv5rqcb5lzdgi65k"; depends=[V8]; }; @@ -1080,7 +1080,7 @@ in with self; { DiceOptim = derive2 { name="DiceOptim"; version="2.0"; sha256="1hx4379yb6d36c494qc237vld4jnfxq18m994p5ii9ks6s7amifn"; depends=[DiceDesign DiceKriging mnormt pbivnorm randtoolbox rgenoud]; }; DiceView = derive2 { name="DiceView"; version="1.3-2"; sha256="0ny9gbaycrq3lr4gqil1yyhkkyxmabl8w6cmkkzlx3yaara0idkf"; depends=[DiceEval DiceKriging rgl]; }; DidacticBoost = derive2 { name="DidacticBoost"; version="0.1.1"; sha256="0z1h61n6nfjvb64fgkzi1sq7ag747crhh593hxkx0cpza29778rz"; depends=[rpart]; }; - Diderot = derive2 { name="Diderot"; version="0.12"; sha256="1cq8yk4r0csnslp286hzs04zzq44q0frz0kyll9jhqjil34qh0x7"; depends=[data_table doParallel foreach igraph RCurl splitstackshape stringi]; }; + Diderot = derive2 { name="Diderot"; version="0.13"; sha256="04d1drxn99r0fqq3zym7yyip9c8rfqhghq20q4zyb42l3hfgv9ai"; depends=[data_table doParallel foreach igraph RCurl splitstackshape stringi]; }; DiffCorr = derive2 { name="DiffCorr"; version="0.4.1"; sha256="1kxp9dbiww086rmvmjvfhbk7jl36dkj88qwii6zg57llf7l5l4hm"; depends=[fdrtool igraph multtest pcaMethods]; }; DiffNet = derive2 { name="DiffNet"; version="1.0-0"; sha256="04dvf0qxnc6jizwfjxw731j7d2fxyapk06rmqvga6h3p075q0mqk"; depends=[data_table doParallel foreach gplots Hmisc igraph lsa Matrix qlcMatrix Rcpp RcppEigen]; }; DiffXTables = derive2 { name="DiffXTables"; version="0.1.0"; sha256="1la512kvq1ziw1b3zzn2khh4cjcq2lwq1r17b84x7f4spbfp5l2b"; depends=[]; }; @@ -1113,7 +1113,7 @@ in with self; { DiversityOccupancy = derive2 { name="DiversityOccupancy"; version="1.0.6"; sha256="16x3fpchgd12mccvr1k11vjka97sy5vjvjcyd5y3pskgnpycc2sv"; depends=[dplyr ggplot2 glmulti MuMIn qpcR raster unmarked vegan]; }; DnE = derive2 { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; }; DoE_MIParray = derive2 { name="DoE.MIParray"; version="0.13"; sha256="0lbcqfizgrnqmp0b2yn14br7xmabbhywy8h7161hx6hnvnam5r99"; depends=[combinat DoE_base]; }; - DoE_base = derive2 { name="DoE.base"; version="1.1-4"; sha256="0x50fjjg5kjinr2yjwb84icw86nhcgc5dv26z1h44bcwablcz74n"; depends=[combinat conf_design lattice MASS numbers partitions vcd]; }; + DoE_base = derive2 { name="DoE.base"; version="1.1-5"; sha256="15m1axp8wpvqdly62chb4p0jzfvmkma6bsw8gagzwm9ibh6xwmkq"; depends=[combinat conf_design lattice MASS numbers partitions vcd]; }; DoE_multi_response = derive2 { name="DoE.multi.response"; version="0.1.0"; sha256="1289jlp10999kvyg5adw3dyc2mhh20i6biyqjbxd6g80a8dajknx"; depends=[DoE_wrapper]; }; DoE_wrapper = derive2 { name="DoE.wrapper"; version="0.11"; sha256="08bgfaiivqqnkhjb18flk1cpa33rh70i6g8v25x1ma3ffxqrwh96"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; }; DoEstRare = derive2 { name="DoEstRare"; version="0.2"; sha256="0y9ymw7114jk1rwiasq400bpgvkxv6rpc954c7v9mgxd3c2nfza7"; depends=[]; }; @@ -1141,7 +1141,7 @@ in with self; { DynTxRegime = derive2 { name="DynTxRegime"; version="4.3"; sha256="1la4y560rcs163cqmvpwsb1n70n6714kprdxpnkd849caaa93zir"; depends=[dfoptim kernlab modelObj rgenoud]; }; DynaRankR = derive2 { name="DynaRankR"; version="1.1.0"; sha256="1fzicainh1dm016cglm2x6j1i2g5r71vgrj0dnsflbxc5v426sqm"; depends=[dplyr rlang]; }; DynamicDistribution = derive2 { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; }; - DynamicGP = derive2 { name="DynamicGP"; version="1.1-5"; sha256="12y56anyi3amn7czwkk4qakmgqq0mf80xrhb8ccy1sxzk7k86pfz"; depends=[lhs]; }; + DynamicGP = derive2 { name="DynamicGP"; version="1.1-6"; sha256="1d3ycx6vcv7rcagaxvfyxgsdigbzigxarm66ypkdasbli1507is3"; depends=[lhs]; }; E4tools = derive2 { name="E4tools"; version="0.1.1"; sha256="1kmj1fddybjia9ninhcy75kdmq152zjw7s24chpqr5wsblffr3yx"; depends=[accelerometry anytime BBmisc chron data_table DataCombine doParallel doSNOW foreach ggplot2 hms scales signal]; }; EAinference = derive2 { name="EAinference"; version="0.2.3"; sha256="1kzcfya3z6rf1vqjn72yjymdhrn4dzgmwifh3w6k22cy5jxffzn4"; depends=[hdi limSolve MASS msm mvtnorm Rcpp RcppArmadillo]; }; EBASS = derive2 { name="EBASS"; version="0.1"; sha256="14hxzj06wrc4ihflr7dqk28fsjwbcizr0jy54vhv0mk1y1gd4201"; depends=[]; }; @@ -1161,9 +1161,8 @@ in with self; { EDISON = derive2 { name="EDISON"; version="1.1.1"; sha256="12cc13ng5fc4nm0nvqxqplpb2ycz4cln73xqkk85dka2fnpykjc7"; depends=[corpcor MASS]; }; EDMeasure = derive2 { name="EDMeasure"; version="1.2.0"; sha256="1gyv86vip0a3939dbbwz29xkqzncw24r68fzykdjnv3b995510iv"; depends=[dHSIC energy rBayesianOptimization]; }; EDOIF = derive2 { name="EDOIF"; version="0.1.1"; sha256="0lhaajiq01rrvpp2xq2n6ka7pd4xz0spxrf1xv8ljpi2w9kk4p7l"; depends=[boot distr ellipsis ggplot2 igraph simpleboot]; }; - EDR = derive2 { name="EDR"; version="0.6-7"; sha256="17rdqggladlnziql7s7iy2pgqv5n2parwsllsy3b358y0cc1bxdn"; depends=[sm]; }; EEM = derive2 { name="EEM"; version="1.1.1"; sha256="0w20kakgcpyhfi7fcrss4w67pbaj87hi2scy7g05q3sg2ygac7gj"; depends=[colorRamps ggplot2 R_utils reshape2 sp]; }; - EFA_MRFA = derive2 { name="EFA.MRFA"; version="1.0.7"; sha256="0vblfagcr9zqdzygjrbbgg2pdd9v058ryac5mzy2ry02m534iadm"; depends=[ggplot2 optimbase PCovR psych reshape2 scales]; }; + EFA_MRFA = derive2 { name="EFA.MRFA"; version="1.0.9"; sha256="0id0dhpq9350ax573i769m83fncrd6rlp4qmwvf9jz1lbksighf0"; depends=[ggplot2 optimbase PCovR psych reshape2 scales]; }; EFAutilities = derive2 { name="EFAutilities"; version="2.0.0"; sha256="1vbpz9papk6vvch3kb2qm6nspa4llp4mpck6ky1j8kvkhjzm1za0"; depends=[GPArotation mvtnorm plyr]; }; EFDR = derive2 { name="EFDR"; version="1.0"; sha256="1344ysvrniqn1qv2hx9b9afg9fivccfrj393xy9cqz4j395b6jx0"; depends=[copula doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; }; EFS = derive2 { name="EFS"; version="1.0.3"; sha256="1q8cf8dnxpv5s3lr9145y0wjhak4rz18dzah4xfs5qr4c8nlpl54"; depends=[party pROC randomForest ROCR]; }; @@ -1224,6 +1223,7 @@ in with self; { EW = derive2 { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; }; EWGoF = derive2 { name="EWGoF"; version="2.2.2"; sha256="19gd9grjjdv6hilqj41g5qhz7m0ga40q88clwggbp5f0f1yd5sym"; depends=[Rcpp]; }; EWOC2 = derive2 { name="EWOC2"; version="1.0"; sha256="1x3l332pmh69kl0c1rka264mi69avdm938mzd79ck4y3qcgn07vr"; depends=[MASS rjags]; }; + EWS = derive2 { name="EWS"; version="0.1.0"; sha256="04bsl0s690k2wm7jnvgihj5r1fd1r3s2547j1sgl0zm8yvia2l8x"; depends=[numDeriv]; }; EXRQ = derive2 { name="EXRQ"; version="1.0"; sha256="1iqsr52sl2j5q03122a7rsp6n6a2bkysk2r908c89l36gk4sj2i5"; depends=[mnormt quantreg]; }; EZtune = derive2 { name="EZtune"; version="2.0.0"; sha256="1arrd9zkssb8ixx7r4nxwayksz1mk7jkvlcbm264pv9ya6kh3yrh"; depends=[ada e1071 GA gbm optimx rpart]; }; Eagle = derive2 { name="Eagle"; version="2.2"; sha256="04r2ii4wdxwmx82qd2csiiy6kjim6zmjnp0851qhz9iry84f0g5s"; depends=[data_table ggplot2 ggthemes matrixcalc mmap R_utils Rcpp RcppEigen shiny shinyBS shinyFiles shinyjs shinythemes]; }; @@ -1244,7 +1244,7 @@ in with self; { EcoVirtual = derive2 { name="EcoVirtual"; version="1.1"; sha256="1aryl2sb5ak390lgnm427ilm6xv9lmsjhwdnapzc033zvqb099gj"; depends=[]; }; Ecohydmod = derive2 { name="Ecohydmod"; version="1.0.0"; sha256="0imkzjqp3g28l42jz5m4p85wg5rawmn9hy1wys9xndnaliv6d7r2"; depends=[]; }; EconDemand = derive2 { name="EconDemand"; version="1.0"; sha256="1slpwiaxj7w21zdri9myrzwbwzl62m3cnp0g4fr2rkdlzgb6j5yj"; depends=[]; }; - EdSurvey = derive2 { name="EdSurvey"; version="2.4.0"; sha256="1h27q1qml1ba1b39ymg2ma48738h3027hg5qpxpgkz01xvlzqii3"; depends=[car data_table Formula glm2 haven LaF lfactors lme4 MASS Matrix NAEPprimer quantreg RColorBrewer readr readxl rvest stringi stringr tibble wCorr WeMix xml2 xtable]; }; + EdSurvey = derive2 { name="EdSurvey"; version="2.5.0"; sha256="09zh0r93a0qkw4glnyrqzxjc13fai5nfjzd9sq06wnl6i9750bmq"; depends=[car data_table Formula glm2 haven LaF lfactors lme4 MASS Matrix NAEPprimer quantreg readxl tibble wCorr WeMix xtable]; }; EditImputeCont = derive2 { name="EditImputeCont"; version="1.1.6"; sha256="1hpm198awl30i7vbg1jk578s2i3f2kskirb33xvampcwn8mz0nhh"; depends=[editrules igraph Rcpp]; }; EffectLiteR = derive2 { name="EffectLiteR"; version="0.4-4"; sha256="17mhp4acj0myr2b54hgbb3wi5j6a6q999nqr9lwcbx3plyrwlljl"; depends=[car foreign ggplot2 lavaan lavaan_survey nnet shiny survey]; }; EffectStars = derive2 { name="EffectStars"; version="1.9-1"; sha256="131w5bdc615gaa2czi4wyc2f96jcg24ahcmggajrvyhxmi6rag5x"; depends=[VGAM]; }; @@ -1260,7 +1260,7 @@ in with self; { EmbedSOM = derive2 { name="EmbedSOM"; version="2.1.1"; sha256="1w61dni4vsglxqdhwdy5dcmzb6hx1wb9fhfki8wmal1yaza23ljy"; depends=[FNN ggplot2 igraph Matrix Rtsne umap uwot]; }; EmiStatR = derive2 { name="EmiStatR"; version="1.2.2.0"; sha256="0xwmwbybiyb9688l5n98vir3rwbbjgpw5qb25p20lhlj1pqg95w1"; depends=[doParallel foreach lattice xts zoo]; }; EmissV = derive2 { name="EmissV"; version="0.665.2.1"; sha256="1525h28xwwq94maj07rnx13l7i9q7wcrssld5q99741clvzrygk0"; depends=[data_table ncdf4 raster sf sp units]; }; - EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="2.0.1"; sha256="0k37lncjq14py3fvcr925gh66i31aphkniv5dn86gibxzdvbjnqc"; depends=[ggplot2 gridExtra]; }; + EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="2.0.2"; sha256="10as0xl24w9pap26cz21nqgysba70l9s4qxfbia7x0wfsz2s25jf"; depends=[ggplot2 gridExtra]; }; EncDNA = derive2 { name="EncDNA"; version="1.0.2"; sha256="0wy2cmcvyqjhg5mqbvdzmihfv8swx7ym2n9mjdqgx0kgnc7k614y"; depends=[Biostrings]; }; EnergyOnlineCPM = derive2 { name="EnergyOnlineCPM"; version="1.0"; sha256="1a3wvclqdwcvq5inhliwjnd7xzqbjvzs8h8ncy6qlhjq6s5n7nm8"; depends=[energy MASS]; }; EngrExpt = derive2 { name="EngrExpt"; version="0.1-8"; sha256="0zclvckj2i7j4kfs58hcjcl722vl2y6dcnjz238cjfgwv279gqhp"; depends=[lattice]; }; @@ -1279,7 +1279,7 @@ in with self; { EnviroStat = derive2 { name="EnviroStat"; version="0.4-2"; sha256="0ckax6vkx0vwczn21nm1dr8skvpm59xs3dgsa5bs54a3xhn5z9hs"; depends=[MASS]; }; Epi = derive2 { name="Epi"; version="2.40"; sha256="046y10vwks5y84pzccmrn6d4pd6qz70imvp1hw5ywp8fnwzfh4g5"; depends=[cmprsk data_table etm MASS Matrix mgcv numDeriv plyr survival zoo]; }; EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.13.0"; sha256="1m9gawd0fv0pl9q8n9rnid8shdy88kxw4hr5fvvf9ifngf8ffmqa"; depends=[]; }; - EpiCurve = derive2 { name="EpiCurve"; version="2.2-1"; sha256="091q03lak2nfk83s10004qnwdng0gl4z92pc174mc41wns7f5d8v"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales timeDate]; }; + EpiCurve = derive2 { name="EpiCurve"; version="2.3-1"; sha256="0yi49mdij8gx90kbppxdkm0xzaxhr9i7bpgis64vbx4bpy4ynxbb"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales tibble timeDate]; }; EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.1"; sha256="0m6yay3r7dqih19f76wxwgq6dh9p1zmp5d9ilj9nd262q61jcy53"; depends=[deSolve ggplot2 reshape2]; }; EpiEstim = derive2 { name="EpiEstim"; version="2.2-1"; sha256="1a21mskjvyz9qdvl3kkf0p15zn1nx1a49c5djp1lacrn6h7g8k9p"; depends=[coarseDataTools coda fitdistrplus ggplot2 gridExtra incidence reshape2 scales]; }; EpiILM = derive2 { name="EpiILM"; version="1.5"; sha256="0726sb6jisicphchzbcswh8nkgx12cb6sfgwa4ll35nm3vrb5xb1"; depends=[adaptMCMC coda LaplacesDemon]; }; @@ -1287,7 +1287,7 @@ in with self; { EpiModel = derive2 { name="EpiModel"; version="1.7.5"; sha256="0w7r26pcsw785rhd17j0sp840xa4mpsfiq04vk36afv27mgfx6wy"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm]; }; EpiReport = derive2 { name="EpiReport"; version="0.1.0"; sha256="1bfh7nrwmplsk7whvmsf0wxg795xrwvarxw974v58mjb282yp87s"; depends=[dplyr extrafont flextable ggplot2 knitr officer png rmarkdown tidyr zoo]; }; EpiSignalDetection = derive2 { name="EpiSignalDetection"; version="0.1.1"; sha256="04bagnx9fs0r3167hmwgc389fl5hq7l4j6kdjjmi360vcaimx9qi"; depends=[dplyr DT ggplot2 ISOweek knitr pander rmarkdown shiny surveillance]; }; - EpiStats = derive2 { name="EpiStats"; version="1.3-1"; sha256="07iz6hhfcawfcb1n9znpafgmmgjgw7pikr71hh5c7f802k1qffw7"; depends=[dplyr epiR]; }; + EpiStats = derive2 { name="EpiStats"; version="1.4-1"; sha256="1i9ymqf0p8wplbmbq4j0ixprjvg22l4z05imxhfj087p3p2sqq8w"; depends=[dplyr epiR]; }; EpistemicGameTheory = derive2 { name="EpistemicGameTheory"; version="0.1.2"; sha256="0b2gnrvhlsw85qv63ib32pj55l7w63wgvbrj5rb209g6h46fby8m"; depends=[lpSolve]; }; Eplot = derive2 { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5w86iplirnd5hm4s99qci2hgc64"; depends=[]; }; Equalden_HD = derive2 { name="Equalden.HD"; version="1.2"; sha256="1lwqnm2xg7x79xajjb4fx5b5yaqs0rn8myb2h52pfgm0v37lzvmb"; depends=[]; }; @@ -1331,18 +1331,18 @@ in with self; { FADA = derive2 { name="FADA"; version="1.3.5"; sha256="0srv3rghbkgyxbcjc1v68c5qgcir1d618skpc8imfmdaz9pnxchn"; depends=[corpcor crossval elasticnet glmnet MASS matrixStats mnormt sda sparseLDA]; }; FAMILY = derive2 { name="FAMILY"; version="0.1.19"; sha256="1912l2zj2cmh8yx8lkg8fpgvfddn6wbi1vrr4yx04mh73gk1s5mk"; depends=[pheatmap pROC]; }; FAMT = derive2 { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[impute mnormt]; }; - FAMoS = derive2 { name="FAMoS"; version="0.2.0"; sha256="08xyj7bnkckyk0d0kxkz7nqm7ib5by0wqmx54pwk3ak4mmh9arzi"; depends=[future R_utils]; }; + FAMoS = derive2 { name="FAMoS"; version="0.3.0"; sha256="14gr9wv9bpibk0rrzzwijvdncx1fgnpbv55nqzbb4jhq7fdckmsa"; depends=[future R_utils]; }; FAOSTAT = derive2 { name="FAOSTAT"; version="2.1.2"; sha256="11pmbjz4vkg8a68qfkbqlhnggln1vp8m5pllg2y7wwxxa4ld71qk"; depends=[classInt data_table ggplot2 labeling MASS plyr RJSONIO]; }; FARDEEP = derive2 { name="FARDEEP"; version="1.0.1"; sha256="0blvjakcpkh9vpxryk7qyaqnija0r375ckv37kjlr34xg8pg9qnm"; depends=[nnls preprocessCore]; }; FASeg = derive2 { name="FASeg"; version="0.1.9"; sha256="0lazx8dyycyycr8467m9rkxkxhp4r2w737kpkb40y59wncmbvkik"; depends=[]; }; - FAdist = derive2 { name="FAdist"; version="2.2"; sha256="0nw3w4g7y846bm57xyjnb13g7z746kxf8mb2hnljwwsypcg6i2n8"; depends=[]; }; + FAdist = derive2 { name="FAdist"; version="2.3"; sha256="0vy9yavg5apawjfvch5a7abrmsnx36zhlk8jff3dvcx409lykrrn"; depends=[]; }; FAmle = derive2 { name="FAmle"; version="1.3.5"; sha256="1j6x5bbxnrwp9d6xlxc861xslawzfqhi3d11nphyc97afsz0ymnr"; depends=[mvtnorm]; }; FAwR = derive2 { name="FAwR"; version="1.1.1"; sha256="1hzgaxinq81v4f9743lnlj3bkby8pwmaw1gq0fb4yxazav8y7ihy"; depends=[glpkAPI lattice MASS]; }; FBFsearch = derive2 { name="FBFsearch"; version="1.1"; sha256="17fi501prnwwy5dh7kv7cx2zlz2dknjj542ga024s7jvg7i2rhg0"; depends=[Rcpp RcppArmadillo]; }; FBN = derive2 { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; }; FCGR = derive2 { name="FCGR"; version="1.0-0"; sha256="015nnnc9fasx0qjrc3lbxv14rqwyx36xzsw9076grwm5pqahrdsb"; depends=[kerdiest KernSmooth MASS mgcv nlme pspline sfsmisc]; }; FCMapper = derive2 { name="FCMapper"; version="1.1"; sha256="1yjh8rs65nqslvwv7x4rif469zds41s7v3vhq6pca1y17kvj2in1"; depends=[igraph]; }; - FCPS = derive2 { name="FCPS"; version="1.1.0"; sha256="0svfd108nr9h45jiarnj686668hbp53g9gkl6kiiyskq3ws6hdn0"; depends=[DataVisualizations ggplot2 mclust]; }; + FCPS = derive2 { name="FCPS"; version="1.2.0"; sha256="0npgr3vd7f5xa02apzyyxbbvr5h6s57hii8sirp76avc1qz2371m"; depends=[DataVisualizations ggplot2 mclust]; }; FCSlib = derive2 { name="FCSlib"; version="1.1.0"; sha256="0sxpzcj6lard3xf24pq42iaryc3idccb076y69swckm0ixhrg85w"; depends=[tiff]; }; FD = derive2 { name="FD"; version="1.0-12"; sha256="0xdpciq14i8rh7v6mw174hip64r7mrzhx7gwri3vp9y7a1380sbi"; depends=[ade4 ape geometry vegan]; }; FDRSeg = derive2 { name="FDRSeg"; version="1.0-3"; sha256="0dh6m5vlx664kryh56jzi3zxydjwa5217nhbwn6adp0q5qdh6d8a"; depends=[Rcpp stepR]; }; @@ -1356,7 +1356,7 @@ in with self; { FField = derive2 { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; }; FGSG = derive2 { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; }; FGalgorithm = derive2 { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; }; - FHDI = derive2 { name="FHDI"; version="1.3.2"; sha256="0s1g2ixdfajh99rslpp2p60297f6xcsdnbagqd6zzsl8wywjl9z4"; depends=[]; }; + FHDI = derive2 { name="FHDI"; version="1.4.0"; sha256="1plc4klvjid5ara6ay081xamxr14j3ldgqdm6ni8543cv07zwd74"; depends=[]; }; FHtest = derive2 { name="FHtest"; version="1.4"; sha256="1wsn0j9ydpp9nfswiqg21p09kgkvaq8fh0y0h8syqgizah7i8vs2"; depends=[interval KMsurv MASS perm survival]; }; FI = derive2 { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; }; FIACH = derive2 { name="FIACH"; version="0.1.2"; sha256="151lc5m8pb7l07kxljm32zy5kd7a4zr5vgsgwsx7ywhijh0r0585"; depends=[Rcpp RcppArmadillo RNiftyReg tkrplot]; }; @@ -1364,12 +1364,14 @@ in with self; { FITSio = derive2 { name="FITSio"; version="2.1-0"; sha256="021xmbavigg70m96xw1bvsdasi5yj2wmafgb6xw4b09fmyv9hvjp"; depends=[]; }; FKF = derive2 { name="FKF"; version="0.1.5"; sha256="1qzf7y3f4xfirjkm795rcxckjbw6sn7xpilhkyvayqm2vyhf7518"; depends=[RUnit]; }; FKSUM = derive2 { name="FKSUM"; version="0.1.3"; sha256="1zz4hyqlq4517jksgx3jfz9m4gfnp49q272n0m4y9yabsd5fdv3a"; depends=[MASS rARPACK Rcpp RcppArmadillo]; }; + FLAME = derive2 { name="FLAME"; version="2.0.0"; sha256="067yy0b668pj25a0jscpjb98in22048vxs249a7pa4rs2c1cyai9"; depends=[devtools dplyr glmnet gmp magrittr mice rlang tidyr xgboost]; }; FLLat = derive2 { name="FLLat"; version="1.2-1"; sha256="0306bpwp2az4x4m5sv88hlh7vs0y5isfby7lxrn2gjnk76gg6mw1"; depends=[gplots]; }; FLR = derive2 { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; }; FLSSS = derive2 { name="FLSSS"; version="8.5.6"; sha256="1c6j54ihc385m1f0r86yb83zqv2myfskq48bh9dcynlnc9crs428"; depends=[Rcpp RcppParallel]; }; FLightR = derive2 { name="FLightR"; version="0.4.9"; sha256="0rcnkifq6mi1i5xhk6qy2gl3bry269y4isfr8phl3car0yj39lw1"; depends=[bit CircStats circular fields GeoLight ggmap ggplot2 ggsn maptools mgcv nlme raster RcppArmadillo rgdal rgeos sp truncnorm]; }; FMAdist = derive2 { name="FMAdist"; version="0.1.0"; sha256="0aa4sw93ia6cp386hrq6x448x4w0p6k198rjaqs474j25gqgxrv0"; depends=[EnvStats extraDistr fitdistrplus MASS quadprog STAR]; }; FMC = derive2 { name="FMC"; version="1.0.0"; sha256="1pfqxx7slgcmw4al7i8hy59f4han6b0b7b5az7yh1mscdnghl9bj"; depends=[minimalRSD]; }; + FMCCSD = derive2 { name="FMCCSD"; version="1.0"; sha256="0c50km5ba6biq9p3mycxhy00ij2gr6y5zf3q8ycq0g1mbk8ybfb7"; depends=[numDeriv orthopolynom Rcpp RcppArmadillo splines2]; }; FME = derive2 { name="FME"; version="1.3.6.1"; sha256="065y6r0cwvj1q5i3f88icdf4i47bz33hbhln42gyzqhlavvnj35f"; depends=[coda deSolve MASS minpack_lm minqa rootSolve]; }; FMP = derive2 { name="FMP"; version="1.4"; sha256="0w11a78nz4n7zih9h00xkv7prsy9hlxphbpa7hpnbvq9r98g08qm"; depends=[]; }; FMStable = derive2 { name="FMStable"; version="0.1-2"; sha256="00viigpqfbqc4hyl9cwicbwqf2ksjak28qrqaa16jhbqz93j4fck"; depends=[]; }; @@ -1460,7 +1462,7 @@ in with self; { FlexDir = derive2 { name="FlexDir"; version="1.0"; sha256="1gb5alv9jsnw0135g63cy757pxhdw6cgwfm8dpcm8dj9zqg10dkm"; depends=[]; }; FlexGAM = derive2 { name="FlexGAM"; version="0.7.0"; sha256="1pjlsi747j347vwn94391xr3aknnspgw7rc1jnin7g0n1fgkcww4"; depends=[MASS Matrix mgcv scam]; }; FlexParamCurve = derive2 { name="FlexParamCurve"; version="1.5-5"; sha256="1404cn3bhcdr3mjhpr072zcyl0wnksarsg2sry5d1scsmrn4xq83"; depends=[nlme]; }; - FlexScan = derive2 { name="FlexScan"; version="0.1.0"; sha256="02p8rh3krh30hmzykm03qvm0g1qcrqzcgzlzlww61pswd9j1g53m"; depends=[smerc sp spdep]; }; + FlexScan = derive2 { name="FlexScan"; version="0.2.0"; sha256="1jd93h96qhqvk9xx3va78v76fzl6y0rbm85022zpvk3wz4z2g1xs"; depends=[smerc sp spdep]; }; FlickrAPI = derive2 { name="FlickrAPI"; version="0.1.0.0"; sha256="0bbk7ac4s3gbcjhfg3yz06pxjid3hpd0mqzxzlj5sghn95f479h9"; depends=[jsonlite magrittr RCurl stringr]; }; FloodMapper = derive2 { name="FloodMapper"; version="1.0"; sha256="09pr6324namqrwdr2impgqmdmsf34g9pq91091cg9b1031djgzyq"; depends=[magick raster rgdal sp]; }; FlowRegEnvCost = derive2 { name="FlowRegEnvCost"; version="0.1.1"; sha256="0lw4kv4z0s23jy11y53rxxh7zxa7vajxrcnjgxd74xxs64vjlj88"; depends=[zoo]; }; @@ -1484,7 +1486,7 @@ in with self; { FossilSim = derive2 { name="FossilSim"; version="2.1.1"; sha256="1dffk14lszq84k61s1jar658qpjc1hm6rwa1gcwwvppvxj6gkvky"; depends=[ape TreeSim]; }; FourScores = derive2 { name="FourScores"; version="1.5.1"; sha256="1la9d1hfcmi0zg58yl0a7nj36giagh0fwrc7wxyqdq0c7zf1hfzq"; depends=[]; }; FourgameteP = derive2 { name="FourgameteP"; version="0.1.0"; sha256="15yn47737768fkjjv8ykc9lw7x58pq44k90d9d4c9hp20zw5f3by"; depends=[]; }; - FrF2 = derive2 { name="FrF2"; version="2.1-1"; sha256="0xvkhjn1rx7smval6jk78ck0z9qnjrccyrazw6bllss581vqlqjy"; depends=[DoE_base igraph scatterplot3d sfsmisc]; }; + FrF2 = derive2 { name="FrF2"; version="2.2"; sha256="0h3inqnb726mbazj72b6gnbn7mqhd9lrs0x5cragq10szx2hvpa8"; depends=[DoE_base igraph scatterplot3d sfsmisc]; }; FrF2_catlg128 = derive2 { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; }; FractalParameterEstimation = derive2 { name="FractalParameterEstimation"; version="1.1.2"; sha256="16xm2g723dm1n1h6as6yvy92sigzhj31f269g5rrzqjcd4d5m8an"; depends=[]; }; Fragman = derive2 { name="Fragman"; version="1.0.9"; sha256="03vmvmnyza4i46v1awkdjz6ccbsiq49dm0mlmwsm801rq6yfihgp"; depends=[]; }; @@ -1493,7 +1495,7 @@ in with self; { FreeSortR = derive2 { name="FreeSortR"; version="1.3"; sha256="1m6ahhixbbizzn09pz71zvinrdshn3j6gmy05jdxa9d932agqk0w"; depends=[ellipse smacof vegan]; }; FreqProf = derive2 { name="FreqProf"; version="0.0.1"; sha256="1yqn2435l2sghfcv5mma0rv9yqvpa69z8cqqsjlrlbih9gib82d4"; depends=[ggplot2 reshape2 shiny]; }; Fstability = derive2 { name="Fstability"; version="0.1.2"; sha256="0kscdmrs5namvhi112b47c811w0bg9s3xg48mfa566pxwxz1nv45"; depends=[]; }; - FunChisq = derive2 { name="FunChisq"; version="2.4.9.2"; sha256="1ap8319kfp6kixnj5qyjkxjwr8g5q0wdr10vng6ppjym8p8c6srn"; depends=[BH Rcpp Rdpack]; }; + FunChisq = derive2 { name="FunChisq"; version="2.5.0"; sha256="10x9c8a15qsrhnqmq9bxla4s0fanlys9fdiaacgvgspnc8426ppg"; depends=[BH Rcpp Rdpack]; }; FunCluster = derive2 { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; }; FuncMap = derive2 { name="FuncMap"; version="1.0.10"; sha256="0iaay6qz9a2s77xjfpp7wm37y7xwnvmlw6s5k5riccmqzc6dcjs7"; depends=[mvbutils]; }; FunnelPlotR = derive2 { name="FunnelPlotR"; version="0.2.3"; sha256="16bw1fx2pzmxm8gavq791drnpsczxq5yyfbnl2h1xcrzlw4fw4b0"; depends=[dplyr ggplot2 ggrepel rlang scales]; }; @@ -1537,25 +1539,27 @@ in with self; { GDAtools = derive2 { name="GDAtools"; version="1.4"; sha256="1i5g7gzl3fkhwxqizqwrn8098s5lrr0mk17wmpyf92s1sy315cpv"; depends=[FactoMineR nleqslv nnet]; }; GDELTtools = derive2 { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; }; GDINA = derive2 { name="GDINA"; version="2.7.9"; sha256="13pmj069r04h38hg61ibyn1ab15zdy9m0qv60vi25ahgsmg6ccvx"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; }; - GE = derive2 { name="GE"; version="0.0.3"; sha256="1w3sm1rqgkcz2ggq8nch7c8p295y8z430a4lrv1wmhnngg48mvhq"; depends=[CGE data_tree DiagrammeR stringr]; }; + GE = derive2 { name="GE"; version="0.0.7"; sha256="0fz90qda36gmdivp12gfxa6xm0fra583676vkcl8arvccqs9cn34"; depends=[CGE data_tree DiagrammeR stringr]; }; GEEaSPU = derive2 { name="GEEaSPU"; version="1.0.2"; sha256="02pwjqd94kranc1f69bx9rzk27kchavhvhl9fygjhrr40nwq3pbg"; depends=[gee Rcpp RcppArmadillo]; }; GEEmediate = derive2 { name="GEEmediate"; version="1.1.3"; sha256="1xprkpjp1pkq4ci1n32d3yy80hx3r4xf2j7f6hv7dvsn4cvdp417"; depends=[gee]; }; GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.18"; sha256="17m58i3jridgxzcckcm0ydd2ijw3zjvg9w4an8j5jbnr62hmcb2s"; depends=[changepoint GENEAread MASS rpart signal]; }; GENEAread = derive2 { name="GENEAread"; version="2.0.8"; sha256="1phiwdq05h92vlrjbvx4xvazzls5bdlnwfxn5mghx0v9j0n3ahrm"; depends=[bitops mmap]; }; GENEAsphere = derive2 { name="GENEAsphere"; version="1.5.1"; sha256="1kgj7i9v2yn0b8lvvsf0nc6lg3i2syrcygwa51pcrzp57vv7hxn5"; depends=[GENEAread ggplot2 MASS misc3d rgl]; }; + GENLIB = derive2 { name="GENLIB"; version="1.0.8"; sha256="16n6i7g60hy43bkx075132k5h6ngz3llv0r91q01cnnqciyph6ka"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; }; GENMETA = derive2 { name="GENMETA"; version="0.1"; sha256="1mxwqnbg5bvx1qg62xcd62dl81k11l64yckhl3v854asnaczq3pp"; depends=[magic MASS Matrix]; }; GEOmap = derive2 { name="GEOmap"; version="2.4-4"; sha256="0wk2v0fwcwcm59k711fg829h2w58wkd36im4mg974iai6mqif7qh"; depends=[fields MBA RPMG splancs]; }; GESE = derive2 { name="GESE"; version="2.0.1"; sha256="0h3s2sbnv5wilr2mj6bnl2892p16pxrs341gg6jql1a540p669sk"; depends=[kinship2]; }; GESTr = derive2 { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[gtools mclust]; }; - GET = derive2 { name="GET"; version="0.1-6"; sha256="1di2vc6fgbchws6haz7jn840g1pvvy6xlkgjisjp7n312i5mz1fd"; depends=[ggplot2 gridExtra gstat plyr sp spatstat]; }; + GET = derive2 { name="GET"; version="0.1-7"; sha256="0q32a7c09h6qcgyf2xav2i4ajc3i4hd2i7k1il99g5i5p6sx040i"; depends=[ggplot2 gridExtra spatstat]; }; GEVStableGarch = derive2 { name="GEVStableGarch"; version="1.1"; sha256="1iypv0k4cbvsdyglgvf7y52sqvl5qcin627pjqwq42kisqynm8d7"; depends=[fExtremes fGarch Rsolnp skewt stabledist timeDate timeSeries]; }; - GEVcdn = derive2 { name="GEVcdn"; version="1.1.6"; sha256="09lzhh16r1hsxa23jkq716yf3x9ap6fkkrz3ij2x83rvwznj8hb3"; depends=[VGAM]; }; + GEVcdn = derive2 { name="GEVcdn"; version="1.1.6-2"; sha256="0vmm9fhyrk5m0zwy7fpq5j9zinws0gn2saf4j9plqc9gj1gphjn0"; depends=[]; }; GEint = derive2 { name="GEint"; version="0.1.5"; sha256="179gpq4qjhgx1fhyjdb80rf2ip80zhhfyn8xjgwq1a425163q1y7"; depends=[bindata geepack mvtnorm nleqslv pracma rje speedglm]; }; GExMap = derive2 { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[Biobase multtest]; }; GFA = derive2 { name="GFA"; version="1.0.3"; sha256="10sivsqxliwcrp0ay3n2my28zki6f8vpv8i9lbld8qinx1iv2mq3"; depends=[]; }; GFD = derive2 { name="GFD"; version="0.2.6"; sha256="1z98j6nvaa4vrh840q1iy5r0h9ns4xbrk3qfkq51l2kmbrck8r7a"; depends=[magic MASS Matrix plotrix plyr]; }; GFE = derive2 { name="GFE"; version="0.1.0"; sha256="0ywrg23z13kp8ggw4wbm4jvr2rvb6kra7ma0mgfj8xzkrxs6vi6m"; depends=[data_table dplyr TeachingSampling]; }; GFGM_copula = derive2 { name="GFGM.copula"; version="1.0.4"; sha256="0cw8ih9dj86cvks0qcpffzjx8lv6qiwvk3f1wri8zashj8lk9am6"; depends=[cmprsk compound_Cox joint_Cox]; }; + GGClassification = derive2 { name="GGClassification"; version="0.1"; sha256="03wis5ng2mnfhp33xrag8xbmvjagzr1909a6x94wv7s2spji00rp"; depends=[Rcpp RcppEigen]; }; GGEBiplotGUI = derive2 { name="GGEBiplotGUI"; version="1.0-9"; sha256="0nd0ky3m1avy82z48g7hcysq0y0agxjxdn0g624dkm2w99avxw3j"; depends=[rgl tkrplot]; }; GGEBiplots = derive2 { name="GGEBiplots"; version="0.1.1"; sha256="1xnxaylikjd378flw3rqw36z27b2limkmyad97zhf1cbva317d1b"; depends=[gge GGEBiplotGUI ggforce ggplot2 scales]; }; GGIR = derive2 { name="GGIR"; version="1.11-0"; sha256="0r0k48qbmm5fnl6rgpwgd8jc4l8nyjp2f4vv2givdqkmylw22281"; depends=[bitops data_table doParallel foreach GENEAread matlab Rcpp signal tuneR zoo]; }; @@ -1612,6 +1616,7 @@ in with self; { GPoM_FDLyapu = derive2 { name="GPoM.FDLyapu"; version="1.0"; sha256="1hpgiwh7b50gazp1msjsh2840b91wfrxhl2l45lxg6jr1m34q8pj"; depends=[deSolve GPoM]; }; GPrank = derive2 { name="GPrank"; version="0.1.4"; sha256="06j5fk427jkp5lphqlx48vfp4fagnxxnv4iyjcha8nvkswcblwgy"; depends=[gptk matrixStats RColorBrewer tigreBrowserWriter]; }; GPvam = derive2 { name="GPvam"; version="3.0-5"; sha256="0inhhx5ll4ybkwp71ijigxlyxsa0rdyxb38kgfgxb588dsk4scjz"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; + GPvecchia = derive2 { name="GPvecchia"; version="0.1.3"; sha256="1rabini84r5fvl630wkcikjzll89mamc6pqiilvcmsik5c6ymz3w"; depends=[BH fields FNN GpGp Matrix Rcpp RcppArmadillo sparseinv]; }; GRANBase = derive2 { name="GRANBase"; version="2.6.20"; sha256="0z9378qimdpxrslib2avimik3xqd41angfg12j8vmcbg7zh3binh"; depends=[covr desc dplyr GRANCore htmlTable jsonlite markdown RCurl sendmailR stringi switchr]; }; GRANCore = derive2 { name="GRANCore"; version="0.2.7"; sha256="0xnm7jb2s4ag4qvsfs1fq0f2ikvfqm3bvxhj8kmmxwynwl5pw287"; depends=[switchr]; }; GRAPE = derive2 { name="GRAPE"; version="0.1.1"; sha256="1jzvf45ch8x8f2x9kmvv02xz9bix5vplh8143vc4m1yyq42x09c6"; depends=[]; }; @@ -1629,7 +1634,7 @@ in with self; { GSIF = derive2 { name="GSIF"; version="0.5-5.1"; sha256="1nc177f200m3wfppmdh9cf6g2npx87c0mz2g17zdrw5crx688i8d"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA scales sp]; }; GSM = derive2 { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; }; GSMX = derive2 { name="GSMX"; version="1.3"; sha256="1n1d7rixj14ari46snsmi48qfmy00ihmzvayk3hkrp2d2d0xi2gh"; depends=[MASS]; }; - GSODR = derive2 { name="GSODR"; version="2.0.1"; sha256="0wy2qim636g5rfy046r3qab3r58j3w7ngx57k5gdarbwcjzxw07y"; depends=[countrycode curl data_table future_apply httr R_utils]; }; + GSODR = derive2 { name="GSODR"; version="2.1.0"; sha256="11vww5yx9cz5jgnfm93akh6x6cl2j818b2p7iqc57vly6pi1fz2v"; depends=[countrycode curl data_table future_apply httr R_utils]; }; GSSE = derive2 { name="GSSE"; version="0.1"; sha256="034mmxa6kjq5kgikhb5q75viagz5ck9irrjbxm26zq9099qxm13b"; depends=[Iso zoo]; }; GSelection = derive2 { name="GSelection"; version="0.1.0"; sha256="052vh1haxlzbh3c5i24nrwphapik1y8ribmh6q4axd447ggc0ff9"; depends=[gdata penalized SAM]; }; GSparO = derive2 { name="GSparO"; version="1.0"; sha256="0xna2crxqwy8fj0s79rxbdcaz9x912rp1vdwqv1557fsnmfv2yf0"; depends=[ggplot2 ThreeWay]; }; @@ -1643,7 +1648,7 @@ in with self; { GWASExactHW = derive2 { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; }; GWASbyCluster = derive2 { name="GWASbyCluster"; version="0.1.7"; sha256="0ivlkxbh8m23vbnjfmhk0vfczd5b8lzy9w4gm1m6jpvdm40kn70x"; depends=[Biobase limma rootSolve snpStats]; }; GWASinlps = derive2 { name="GWASinlps"; version="1.2"; sha256="036lv8f58kz6qdwaviyk1q1qsgcj9cimipq1cjrfpn8snkn7s1gh"; depends=[horseshoe mombf speedglm]; }; - GWASinspector = derive2 { name="GWASinspector"; version="1.4.6.7"; sha256="18shkl73fjsa324jfriyx8xsspdpixfpkcpgvqszkb511wj4r2sj"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr rmarkdown RSQLite]; }; + GWASinspector = derive2 { name="GWASinspector"; version="1.4.7"; sha256="0a75nh9hzhib2x5dg4598y3gyg7sflhdmj27j9hy2f5p03p4l64p"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr R_utils rmarkdown RSQLite]; }; GWEX = derive2 { name="GWEX"; version="1.0.2"; sha256="0iykciifbskcrx1qv4874nxli1sq6nbmlfinq4ksir3p93y7ds87"; depends=[abind doParallel EnvStats fGarch foreach lmomco MASS mvtnorm nleqslv Renext]; }; GWG = derive2 { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; }; GWLelast = derive2 { name="GWLelast"; version="1.2.2"; sha256="1nm4w5m4ca6npmpvh9nb0cnrbzlyv95nvvhgs3pqcrw4igagm4hj"; depends=[doParallel foreach geosphere glmnet sp spgwr]; }; @@ -1744,7 +1749,6 @@ in with self; { GxM = derive2 { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[minqa nlme Rcpp]; }; HAC = derive2 { name="HAC"; version="1.0-6"; sha256="1cdh3s8nm17mfjj0zdxzhlmakcd0m12xfjx0b4gyx24xkahklr8i"; depends=[copula numDeriv]; }; HACSim = derive2 { name="HACSim"; version="1.0.5"; sha256="0161h3yhi3bh0jq7x105p3rjlrvl46k4iahfz4k84wsvw3akgk1a"; depends=[ape pegas Rcpp RcppArmadillo]; }; - HAP_ROR = derive2 { name="HAP.ROR"; version="1.0"; sha256="1id9amz1cc2l2vnpp0ikbhf8ghbgzqd1b9dfivnyglg7996c3gbg"; depends=[ape hash]; }; HAPim = derive2 { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; }; HARModel = derive2 { name="HARModel"; version="1.0"; sha256="17sajqi2g5z69gvnfhkn850jkavi8syhm58xadd2khrm73nvwh2i"; depends=[Rcpp RcppArmadillo sandwich xts zoo]; }; HARtools = derive2 { name="HARtools"; version="0.0.5"; sha256="10a92jsk1ccgxi5g6byrs4fbj5l2kih7vhib0jg6spdqi6rhqla1"; depends=[assertthat htmltools htmlwidgets jsonlite magrittr]; }; @@ -1755,7 +1759,7 @@ in with self; { HCR = derive2 { name="HCR"; version="0.1.1"; sha256="14s46dyw3ifp3pwwlcwbbl47i6hy2whjj1n65i28am5a33nycgha"; depends=[data_table]; }; HCT = derive2 { name="HCT"; version="0.1.0"; sha256="0p1bj0spqff8m27lvxdfhk8z1r1z04v1dsv7mqbjyzl07w005hk3"; depends=[rstan]; }; HCTR = derive2 { name="HCTR"; version="0.1.1"; sha256="1hg8mpallwxpmamk6q8x87w5hlqqwvbahfw5zmr9pisiagbwcsay"; depends=[glmnet harmonicmeanp MASS ncvreg Rdpack]; }; - HCmodelSets = derive2 { name="HCmodelSets"; version="1.1"; sha256="1krcwx6s4fh8ngx81lmdzd12i8k2yczvc4iv9k718xnaji1b8mkd"; depends=[ggplot2 mvtnorm survival]; }; + HCmodelSets = derive2 { name="HCmodelSets"; version="1.1.1"; sha256="1fk4q6422lzyf4cwirqz1d70av21m6pwmsy2rqjcraclr4mddw7s"; depends=[ggplot2 mvtnorm survival]; }; HDCI = derive2 { name="HDCI"; version="1.0-2"; sha256="0wxbv54kbygymhh4r7052vnbj603c1kya01ykvmqzzkjyyfzidkz"; depends=[doParallel foreach glmnet iterators lattice Matrix mvtnorm slam]; }; HDCurves = derive2 { name="HDCurves"; version="0.1.0"; sha256="1ifcbwcqgdxicqxcqrsl9kp3zadxhijpwff8ln309378vybr3gh1"; depends=[]; }; HDDesign = derive2 { name="HDDesign"; version="1.1"; sha256="1jim4h9bwn8r637va7m81kwwsfwyzs9pzn5a9i7c8xz8b1x191bj"; depends=[]; }; @@ -1789,7 +1793,7 @@ in with self; { HMM = derive2 { name="HMM"; version="1.0"; sha256="0z0hcqfixx1l2a6d3lpy5hmh0n4gjgs0jnck441akpp3vh37glzw"; depends=[]; }; HMMCont = derive2 { name="HMMCont"; version="1.0"; sha256="1drni4f72x83sprn65wnhw0pv1q8lfkgmxdr9h4rwv1accril85x"; depends=[]; }; HMMEsolver = derive2 { name="HMMEsolver"; version="0.1.2"; sha256="0msin7rq3npz221mvrw3zcs6bwz439six99iblx5p3hkp1n1ljf3"; depends=[Rcpp RcppArmadillo Rdpack]; }; - HMMcopula = derive2 { name="HMMcopula"; version="1.0.3"; sha256="192d0mg0smpdvxvlmha8h3pzfjmzf729ndijc0xngp9yq8syf882"; depends=[copula doParallel foreach matrixcalc mvtnorm]; }; + HMMcopula = derive2 { name="HMMcopula"; version="1.0.4"; sha256="1gmvav02r3miaq4jx05qjcgzw5qv6w1j77vck5gpps8p38zcp34m"; depends=[copula doParallel foreach matrixcalc mvtnorm]; }; HMMextra0s = derive2 { name="HMMextra0s"; version="1.0.0"; sha256="15y5q92x69sn80pc2x7xwbnsfrqpf7cjdja4hkq861jshkksbmg1"; depends=[ellipse mvtnorm]; }; HMMmlselect = derive2 { name="HMMmlselect"; version="0.1.5"; sha256="10h62h03hiip8m1h93sbln413l6cmxmc6hsq3rla6acjk6hfxb2v"; depends=[DirichletReg HiddenMarkov mclust mvtnorm Rcpp]; }; HMMpa = derive2 { name="HMMpa"; version="1.0.1"; sha256="0c3jmvcklywqsjmskx7zbw4d3l8i6bzr5h741v8iwgyw67mjn37g"; depends=[]; }; @@ -1799,7 +1803,6 @@ in with self; { HMVD = derive2 { name="HMVD"; version="1.0"; sha256="0agzvsl2n3zg3i519b93jqpiq9zix0bbrjdzk3ymsbb42dzkmj0d"; depends=[MASS]; }; HPbayes = derive2 { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[boot corpcor MASS mvtnorm numDeriv]; }; HRM = derive2 { name="HRM"; version="1.2.1"; sha256="0qsxwi0v61k1waw21nrz86jazd5wgq2drhan3w8pmb35q2z20s35"; depends=[data_table doBy ggplot2 MASS matrixcalc mvtnorm plyr pseudorank Rcpp reshape2 xtable]; }; - HRQoL = derive2 { name="HRQoL"; version="1.0"; sha256="1gr9rhr8gdnh7bw2v3r0xc3yhmzrx2gzgsd8wd5mmsp81ph0h5lz"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; }; HRW = derive2 { name="HRW"; version="1.0-3"; sha256="12y43sl30949jc9ab10ipx8k4rvb9g8gwaazi8j3k1grh26ivpii"; depends=[KernSmooth]; }; HS = derive2 { name="HS"; version="1.1"; sha256="1vhbchc446j49jj7jgmy4l59n8ahk5l8jp1rl5xwsmn9iqir62mp"; depends=[data_table ggplot2 ggpubr partitions reshape2 tidyr zoo]; }; HSAUR = derive2 { name="HSAUR"; version="1.3-9"; sha256="0b2hyn59lr2pma87fcj7mli3qmrbnfhgd8fv02fa317rj52399qz"; depends=[]; }; @@ -1820,6 +1823,7 @@ in with self; { HWEintrinsic = derive2 { name="HWEintrinsic"; version="1.2.2"; sha256="035r5bi7m66g351cmrfmf4cj5qqm4fn5pgy3lzsp3gyp2dv0rkg5"; depends=[]; }; HYRISK = derive2 { name="HYRISK"; version="1.2"; sha256="1ngwwzv1pavmscpca3ryzfxzd9rppsh0sm7k4sp2kzc9c0bix4xp"; depends=[kerdiest pbapply reliaR rgenoud sets triangle]; }; HaDeX = derive2 { name="HaDeX"; version="1.1"; sha256="1c87bj4qiq28a51l90r5rhk9nzn8lgssby686fsin0d3y068krbg"; depends=[data_table dplyr DT ggplot2 gsubfn latex2exp readr readxl reshape2 shiny stringr tidyr]; }; + HadamardR = derive2 { name="HadamardR"; version="1.0.0"; sha256="0nr8m6fchpmlvhyisb61y0fymjjrk2k1sd67r14n87sgn3mafh4a"; depends=[numbers openxlsx]; }; HadoopStreaming = derive2 { name="HadoopStreaming"; version="0.2"; sha256="1l9msaizjvnsj1jrpghj4g057qifdgg6vbqhfxhn1fiqdqi2056q"; depends=[getopt]; }; HandTill2001 = derive2 { name="HandTill2001"; version="1.0.0"; sha256="0qxaxwizx24gm3iycdmwdn8mqvnwnjhacsp9nwl9w4djayb5a9sg"; depends=[]; }; Hapi = derive2 { name="Hapi"; version="0.0.3"; sha256="0jqjhfq38k161kqff5cx0vxpsmjm2y5ca7049mvqiwqwvi4fp08m"; depends=[ggplot2 HMM]; }; @@ -1854,7 +1858,7 @@ in with self; { Homeric = derive2 { name="Homeric"; version="0.1-3"; sha256="1vcs8fj39zpz45p7gph0mnx65hgr35na0b79i8llyw7i1h7zqzxr"; depends=[]; }; Hotelling = derive2 { name="Hotelling"; version="1.0-5"; sha256="1ism2lzi2kmi62gp319qsi64pj2kj5sfh50f1qnv8vgdkb76bdx5"; depends=[corpcor]; }; HyPhy = derive2 { name="HyPhy"; version="1.0"; sha256="0994ymv7sswbp8qw3pay34s926cflw2hq2gnchw7rknybvlsrinq"; depends=[ape R_utils]; }; - HyRiM = derive2 { name="HyRiM"; version="1.0.3"; sha256="0zx292554kr2s4107db5y7sr869kia9q6dyzhdjy11ksw23sj9m4"; depends=[compare orthopolynom]; }; + HyRiM = derive2 { name="HyRiM"; version="2.0.0"; sha256="1wif31xvrwz0dr6z0hfn1v2fxi8rxws52al6h9rlbzciy6xyl7a3"; depends=[compare grImport2 orthopolynom purrr Rglpk]; }; HybridFS = derive2 { name="HybridFS"; version="0.1.3"; sha256="0sb3i8ymgydi9hvxzdzydqap1gd7w5qcrs9clc0y5n26zd2mwqm5"; depends=[caTools FSelector InformationValue ROCR woeBinning]; }; HybridMC = derive2 { name="HybridMC"; version="0.2"; sha256="1wgzfyk0scwq9s2sdmc91fj7r4d7zlgwgnj6mdiia8w88ja8kzqy"; depends=[coda]; }; HydeNet = derive2 { name="HydeNet"; version="0.10.9"; sha256="1glzbr91cwp99qk1cyf8824fg8jvghgf84gc64jjn2q70vczcf5f"; depends=[checkmate DiagrammeR dplyr magrittr nnet pixiedust plyr rjags stringr]; }; @@ -1876,13 +1880,13 @@ in with self; { IBrokers = derive2 { name="IBrokers"; version="0.9-12"; sha256="0mhh4kgwrncrcysvnvah6xc7fhx5ywjzn258cs9xj9kzns0jblk6"; depends=[xts zoo]; }; IC2 = derive2 { name="IC2"; version="1.0-1"; sha256="03jjb62msxjxdg9l3zd1ns0d2w37hkxy5pnjgaywxw3vfk4zwfj9"; depends=[]; }; ICAFF = derive2 { name="ICAFF"; version="1.0.1"; sha256="0zazx4nv81s75appg10aayks04mx6m5n9yf5hqrbxh3yj68vzxfy"; depends=[]; }; - ICAMS = derive2 { name="ICAMS"; version="2.0.10"; sha256="1f22bwbxnqqccmkmsx4ll8qaviz9w7f64jx1whikvnhsxw634xp5"; depends=[Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicRanges IRanges RColorBrewer stringi]; }; + ICAMS = derive2 { name="ICAMS"; version="2.1.2"; sha256="0jgylkc3asg41b0vac5vcyril0n93yqijjbzwwprfh3ps7pq87s0"; depends=[Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicRanges IRanges RColorBrewer stringi zip]; }; ICAOD = derive2 { name="ICAOD"; version="0.9.9"; sha256="04s51rxhr4axxr1rnhnq87lcn9mjj8g18xr35awnmc4sjg2aavaf"; depends=[cubature mnormt mvQuad nloptr Rcpp RcppEigen sn]; }; ICBayes = derive2 { name="ICBayes"; version="1.2"; sha256="1hdh7g4nk6yy0xz9564vpvh1blrw30lvyw2wc5mmgn78kwjqla34"; depends=[coda HI survival]; }; ICC = derive2 { name="ICC"; version="2.3.0"; sha256="0y8zh9715cp9bglxpygqwgigrarq37sj845lk1xl0ydwinl0a6kk"; depends=[]; }; ICC_Sample_Size = derive2 { name="ICC.Sample.Size"; version="1.0"; sha256="1w6v1jp8bfvf6c49ikswkc5527gdx5cyqnw95x00pgmm6riwlsp9"; depends=[]; }; ICCbin = derive2 { name="ICCbin"; version="1.1.1"; sha256="1pzlaj7w98pgrlg3zvpmdv0dpgi5gih0j73qv86ak75fkxvrnzzw"; depends=[]; }; - ICD10gm = derive2 { name="ICD10gm"; version="1.0.4"; sha256="19346z1mfdbir47wy6qxniag81s3xwrxpfbiv1rar6a89z3pczlf"; depends=[dplyr magrittr purrr rlang stringi tibble tidyr tidyselect]; }; + ICD10gm = derive2 { name="ICD10gm"; version="1.1"; sha256="0m0j88c8mkc0v22dw25l76gch883n21ifw9dpc189mq887856jp8"; depends=[dplyr magrittr purrr rlang stringi tibble tidyr tidyselect]; }; ICDS = derive2 { name="ICDS"; version="0.1.1"; sha256="1jb98xi37jcf6nl5lx2ip9614l4w7lz7v53jpcbdj0ymqbfx1s70"; depends=[graphite igraph metap org_Hs_eg_db]; }; ICE = derive2 { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; }; ICEbox = derive2 { name="ICEbox"; version="1.1.2"; sha256="170gg2fg9307yc2b25lsj8d1zla0frjxl47qh0njlqlrpi8jmm7i"; depends=[sfsmisc]; }; @@ -1936,13 +1940,11 @@ in with self; { INSPIRE = derive2 { name="INSPIRE"; version="1.5"; sha256="0938l50yxnb5q628mp874ayx9ybvcjddis20y1hzm5cmlsg0hqhg"; depends=[missMDA]; }; IOHanalyzer = derive2 { name="IOHanalyzer"; version="0.1.3"; sha256="0l5baz68714vqlzfp6v1r93lwmv0nsq2wqidgf5zwj5r391y7c5g"; depends=[bsplus colorRamps colorspace colourpicker data_table dplyr DT ggplot2 igraph kableExtra magrittr markdown PlayerRatings plotly RColorBrewer Rcpp reshape2 scales shiny shinydashboard shinyjs withr]; }; IPCWK = derive2 { name="IPCWK"; version="1.0"; sha256="0hah1xl6zli0346jh57rjc5x8vynhaysj0l481rmvznsghv6im23"; depends=[MASS survival]; }; - IPDFileCheck = derive2 { name="IPDFileCheck"; version="0.6.2"; sha256="16fapss0y31y9ynizhv9z8zqywf0aam2v7g53dcwylvdjc6qpzi2"; depends=[dplyr eeptools GlobalOptions lubridate testthat]; }; IPEC = derive2 { name="IPEC"; version="0.1.2"; sha256="1fglr5hs61n13251145wqzvxy362fx32yzral96xd8li76ljxiic"; depends=[MASS numDeriv]; }; IPMRF = derive2 { name="IPMRF"; version="1.2"; sha256="1zvwwhiy0p134zvm5ldc92pdd1ap72bhbrlf02rz9m2hlsxmwy67"; depends=[gbm party randomForest]; }; IPPP = derive2 { name="IPPP"; version="1.1"; sha256="19ccs25fd56ns7ssi51w2jzjd4d57vyimwmfvf27mmigb537bd5y"; depends=[]; }; IPV = derive2 { name="IPV"; version="0.1.1"; sha256="0bd59sfqqz2g6lwzlg3vqpw0y8q989n4q76qr1dvnq847c6fg8wz"; depends=[ggforce ggplot2]; }; IPWboxplot = derive2 { name="IPWboxplot"; version="0.1.0"; sha256="0lyqcjnbissick5hzwrx21pykq4pww9j0i03j0gy43awl1cq5qq8"; depends=[isotone]; }; - IPWsurvival = derive2 { name="IPWsurvival"; version="0.5"; sha256="0lmw0ifj8cds8lzyjkkv0i0zim23p0a3pawlhmhdm3nfvwawb853"; depends=[survival]; }; IQCC = derive2 { name="IQCC"; version="0.7"; sha256="1zalpmyywkrnci0jd8irakjhiqmr52zhj1sbxf9pz5c7wks2rdbc"; depends=[MASS miscTools qcc]; }; IRATER = derive2 { name="IRATER"; version="0.0.1"; sha256="0jxdvjmnmangbqy3ibb5qrj9jz3wrzs0wa1r2gjk4v8vsbk0ipcf"; depends=[coda lattice plyr R2admb]; }; IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.3.0"; sha256="09nzzalz107l6dscl4xxd8znwd9fppjlfyvn1vfd9jhx7mkjlnlq"; depends=[dplyr IRISSeismic pracma RCurl seismicRoll signal stringr XML]; }; @@ -1982,7 +1984,7 @@ in with self; { ImputeRobust = derive2 { name="ImputeRobust"; version="1.3-1"; sha256="1zvwlpffpm4gqysz57clf8jkqr72yjbzx90pdy95la51m0b6cdbd"; depends=[extremevalues gamlss gamlss_dist lattice mice purrr]; }; InDisc = derive2 { name="InDisc"; version="1.0.2"; sha256="1mvd6r1ly924n17275n4i9p8sghvm929kbir0bq6850kk2m0dgq7"; depends=[optimbase psych]; }; InPosition = derive2 { name="InPosition"; version="0.12.7.1"; sha256="0d9c7dwaa1v0j8p5ff9223fc2gkbmbvyqylma2d8l4x5m92jmkv0"; depends=[ExPosition prettyGraphs]; }; - InSilicoVA = derive2 { name="InSilicoVA"; version="1.2.7"; sha256="0xfvrsq84wm31j0ih5khqhkhk4ygijfkh9w2bjrw3d5wgpdm0yv3"; depends=[coda ggplot2 InterVA5 rJava]; }; + InSilicoVA = derive2 { name="InSilicoVA"; version="1.2.8"; sha256="0lxv8m394mv9likc8ph17xxd5san326n9c77q7vmgs03a6chqrjx"; depends=[coda ggplot2 InterVA5 rJava]; }; IncDTW = derive2 { name="IncDTW"; version="1.1.3.1"; sha256="1hwwsh70mmdwqaqw4xxnbvc3g2nhmx64bd0hzxh63wr15jch0w8b"; depends=[data_table ggplot2 Rcpp RcppArmadillo RcppParallel scales]; }; IncomPair = derive2 { name="IncomPair"; version="0.1.0"; sha256="156mc4csbxz976md7ikjd6sqamzsfc8ik9xf1qbhrfl8y7957kbb"; depends=[]; }; IncucyteDRC = derive2 { name="IncucyteDRC"; version="0.5.4"; sha256="1k7jqcyx5n4my5rbyfa693ganbk91xganyagq8x8szli9h1491ii"; depends=[cowplot dplyr drc DT ggplot2 magrittr shiny tidyr XML]; }; @@ -2037,13 +2039,15 @@ in with self; { IsoplotR = derive2 { name="IsoplotR"; version="3.3"; sha256="1bldpa7j37k29k51lpbpyr4g4939zw1n9dv498v92w82kzj2p6zf"; depends=[MASS]; }; IsoriX = derive2 { name="IsoriX"; version="0.8.1"; sha256="0rr9frj0mhismls60vgax357jgfyq2wci7rvhvp70fh5k998mzid"; depends=[lattice latticeExtra numDeriv raster rasterVis sp spaMM viridisLite]; }; IsotopeR = derive2 { name="IsotopeR"; version="0.5.4"; sha256="0xgha5alh5y5qfz00rl73q4xlamnmrwij7kckljmy6zgrlrdnl6x"; depends=[colorspace ellipse fgui plotrix runjags]; }; + ItemResponseTrees = derive2 { name="ItemResponseTrees"; version="0.2.4"; sha256="1qcq9sskfpfiixi38m8didml53r1a2cilvjg5pfwgcvnw10vrncz"; depends=[backports checkmate dplyr generics glue magrittr MASS Matrix mirt purrr rlang sets stringr tibble tidyr tidyselect]; }; + J4R = derive2 { name="J4R"; version="1.0.7"; sha256="02ngxyyl8hpjn1r0w8kahqp3hy9xm37m0g4hzb7mdxkkzcxpv7hx"; depends=[]; }; JADE = derive2 { name="JADE"; version="2.0-3"; sha256="1fj2wawx5ac1fvlp28naqha0i17f1sb47j2qqzgccvx17ycqmmjn"; depends=[clue]; }; JASPAR = derive2 { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28zdrg78q6715cg4r9xgcb39q25s0dcy"; depends=[gtools]; }; JBTools = derive2 { name="JBTools"; version="0.7.2.9"; sha256="0bynqn3daqgmi3l9asy34mfwyfjkn35k465dfqqi3xwx6cbzlg5k"; depends=[colorspace foreach gplots plotrix]; }; JFE = derive2 { name="JFE"; version="2.1.3"; sha256="16fbwi9znvf560vlrpdipg69vw1kyg2081iz1l2adc2wyxp81dda"; depends=[BurStFin fAssets fBasics fPortfolio FRAPO iClick MASS quantmod rugarch tcltk2 timeDate timeSeries xts zoo]; }; JGEE = derive2 { name="JGEE"; version="1.1"; sha256="078348n623hlyc3n9yh67vv5acsnxapmbwybvrb1i7kawmqw5msi"; depends=[gee MASS]; }; JGL = derive2 { name="JGL"; version="2.3.1"; sha256="02p9z32f8j60wnh1szkjr2zfa9zwyw0gqinpsvll4dymf8cjawpw"; depends=[igraph]; }; - JGR = derive2 { name="JGR"; version="1.8-6"; sha256="0n3z4dm4q93did5b7hw802akhr6gyidshvlj2db4sghmf07czk2c"; depends=[JavaGD rJava]; }; + JGR = derive2 { name="JGR"; version="1.8-7"; sha256="0bwnps4n078ssmmnxc3pbhs3wc2x45i9f567yb5h7nqscmhb20fi"; depends=[JavaGD rJava]; }; JM = derive2 { name="JM"; version="1.4-8"; sha256="1nq07hw30fqnag1h08b7crl2yfs85gyrn70aaw11bdbjv06r2x55"; depends=[MASS nlme survival]; }; JMI = derive2 { name="JMI"; version="0.1.0"; sha256="05phkwfb9v4g9jixlvbj6br7sbi64zvrgjwfr0v87ijddkxc9si9"; depends=[Rcpp RcppArmadillo]; }; JMbayes = derive2 { name="JMbayes"; version="0.8-85"; sha256="0s11jpzflc2zg60g4ffcw23c2f4zz3mzddrc2cl5y43xl2v304lb"; depends=[doParallel foreach Hmisc jagsUI MASS nlme Rcpp RcppArmadillo rstan shiny survival xtable]; }; @@ -2053,7 +2057,7 @@ in with self; { JPEN = derive2 { name="JPEN"; version="1.0"; sha256="12rvp5bmlkwyr1gg336k655hp09gym0d2wwry70c1rz30x1sf2zs"; depends=[mvtnorm]; }; JQL = derive2 { name="JQL"; version="3.6.9"; sha256="0d926hngv4r6zl5f6yai3jwhl9hql2hv6ja3yjgplglkns66g4lh"; depends=[caret pdist randomForest]; }; JRF = derive2 { name="JRF"; version="0.1-4"; sha256="1xpvscn9iawwa0vfh3kfwzdni436bf42nvm18b8abh033ljvqpij"; depends=[]; }; - JSM = derive2 { name="JSM"; version="0.1.3"; sha256="1p5vlk2fcrb42pi7srkymjacfg05vlaspvhaw94lq1rhvxdw87yl"; depends=[nlme Rcpp RcppEigen statmod survival]; }; + JSM = derive2 { name="JSM"; version="1.0.0"; sha256="1nvzkmfwjk5p6j32scsm7gj1zymrbqsfzwwhfyy0mfqvk4rzrd3g"; depends=[nlme Rcpp RcppEigen statmod survival]; }; JSmediation = derive2 { name="JSmediation"; version="0.1.1"; sha256="06p413jfv02k88jdsbplnz696knxglgcqa4pjrgkhhic6awdh0jf"; depends=[broom data_table dplyr glue knitr magrittr MASS purrr rlang tibble]; }; JWileymisc = derive2 { name="JWileymisc"; version="1.1.0"; sha256="08c09jcax0ppl9q47px2anybcj8rfha8xdx226y002valqji5bz3"; depends=[cowplot data_table emmeans extraoperators ggplot2 ggthemes lavaan lme4 MASS mgcv mice multcompView psych quantreg rms robustbase VGAM]; }; JacobiEigen = derive2 { name="JacobiEigen"; version="0.3-3"; sha256="1zcs9qhf2216c590hj6qc837rnciyfsirg4zg655vxn59fgzpvyb"; depends=[Rcpp]; }; @@ -2070,6 +2074,7 @@ in with self; { JointNets = derive2 { name="JointNets"; version="2.0.1"; sha256="18n9dsy0w0nh7dznp6gw6g5fhhjhf5y589nb49hri0721kq1h3rb"; depends=[brainR igraph JGL lpSolve MASS misc3d oro_nifti pcaPP rgl shiny]; }; Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; }; JuliaCall = derive2 { name="JuliaCall"; version="0.17.1"; sha256="0v0mn3q9mp8xq6bpm870v9a228b20n22cph3s0ngphni07pi0kwr"; depends=[knitr Rcpp]; }; + JuliaConnectoR = derive2 { name="JuliaConnectoR"; version="0.6.0"; sha256="174ghyj2fmacgm3a2gnpsv2yzg0fzskjqk25cvr8a9qqq2527bv4"; depends=[]; }; JumpTest = derive2 { name="JumpTest"; version="1.1"; sha256="0y375m5477nq0ybnjmfnd8hi45d8jmdnprqvw5f70llpd7bcghh0"; depends=[MASS Rcpp RcppEigen]; }; KANT = derive2 { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[affy Biobase]; }; KCSKNNShiny = derive2 { name="KCSKNNShiny"; version="0.1.0"; sha256="13gzqf3g7vj8cc0xm5902q7lad2way8d0ri1fs01dnv97wmwbxvn"; depends=[caret dplyr FNN rhandsontable shiny]; }; @@ -2109,7 +2114,7 @@ in with self; { Knoema = derive2 { name="Knoema"; version="0.1.16"; sha256="0v6w8rrw8nd4l1by5w9xd4hbxp55cma89kljha47ykvmnflsrjsc"; depends=[base64enc digest httr jsonlite lubridate xts zoo]; }; KnowBR = derive2 { name="KnowBR"; version="2.0"; sha256="0i934gff8ldg0lm5cfcf3ip7abnparaaviq8avs7cbnacs6nw8i1"; depends=[fossil mgcv plotrix sp vegan]; }; KnowGRRF = derive2 { name="KnowGRRF"; version="1.0"; sha256="0nk0baibd184rsg23jx1wg4c2fcaqf8ww7822xrs3w5ym6vwd0rs"; depends=[MASS PRROC randomForest RRF]; }; - KoulMde = derive2 { name="KoulMde"; version="3.1.0"; sha256="158lg1jr3lgn85wgdxww6nldy9blxnnjry6hwkp6kcjpg9jljjl8"; depends=[expm Rcpp RcppArmadillo]; }; + KoulMde = derive2 { name="KoulMde"; version="3.1.1"; sha256="0k9077jpr6pv862l7rmrjmi06rl0nlfvn4zdxybsd876r1g861d1"; depends=[expm Rcpp RcppArmadillo]; }; Kpart = derive2 { name="Kpart"; version="1.2.2"; sha256="02df0pr8a0gm8558gbw9svxf5sybmg27grymy71ar9hjnhw5xlf2"; depends=[leaps]; }; KraljicMatrix = derive2 { name="KraljicMatrix"; version="0.2.1"; sha256="0yzilmiiyzd2x3v0cnjphf0wdwiblh37kgrvmfrdy49qly48pvi2"; depends=[dplyr ggplot2 magrittr tibble]; }; KrigInv = derive2 { name="KrigInv"; version="1.4.1"; sha256="0x12xff7lgr1v2243shfz9a8r02qs56p7i0b8j2s6bmrzj1abrwb"; depends=[anMC DiceKriging mvtnorm pbivnorm randtoolbox rgenoud]; }; @@ -2148,7 +2153,7 @@ in with self; { LFDREmpiricalBayes = derive2 { name="LFDREmpiricalBayes"; version="1.0"; sha256="1imw3djmbpdyplv9dmdzzirp9imk88j0kcxcyfh8yr9ywgd77x6b"; depends=[matrixStats R6]; }; LGEWIS = derive2 { name="LGEWIS"; version="1.1"; sha256="1i52vp0ghjzmyh4r8h6jpyij7x4skw99xvw017b56m8fg64zy70r"; depends=[CompQuadForm geeM mvtnorm SKAT]; }; LGRF = derive2 { name="LGRF"; version="1.0"; sha256="1kdx6y55aa9n6v43zfz6jk8amvvxbx79sqm1jx4ihgkpgcdglan7"; depends=[CompQuadForm geepack SKAT]; }; - LHD = derive2 { name="LHD"; version="0.1.2"; sha256="13g90v9mz1lx8fcwkyy1mg722zsairsay2mr77x0m4drg99ikq6r"; depends=[]; }; + LHD = derive2 { name="LHD"; version="0.1.3"; sha256="1cd3m67r6b6y4wszax0qgj4b00gy8lymfy8fvvyh21grsiyaysc8"; depends=[]; }; LICORS = derive2 { name="LICORS"; version="0.2.0"; sha256="0p9y21k1mj1v397jpb5g6jiw7rpzbyfwr4kv2rp3lyxyasy2ykf0"; depends=[fields FNN locfit Matrix mvtnorm RColorBrewer zoo]; }; LIHNPSD = derive2 { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh028vwjw6l6h10cirbnwr65s458zvh4xqv"; depends=[BB Bolstad2 moments optimx Rmpfr sn]; }; LIM = derive2 { name="LIM"; version="1.4.6"; sha256="03x1gnm06bw1wrzc01110bjzd2mvjdzbc2mbrazh22jrmb32w5d8"; depends=[diagram limSolve]; }; @@ -2157,13 +2162,13 @@ in with self; { LLM = derive2 { name="LLM"; version="1.0.0"; sha256="0x4488mg8q4nhyjhqlzkwmh51frkkjn0gir22rk8rfzg4r6d18d6"; depends=[partykit RWeka stringr]; }; LLSR = derive2 { name="LLSR"; version="0.0.2.19"; sha256="19flvf15sn3fd21fymcg7ag1psl265m0i7siw1fqb6j6fvsn0y8v"; depends=[crayon digest dplyr ggplot2 minpack_lm nleqslv rootSolve svDialogs svglite XLConnect]; }; LMERConvenienceFunctions = derive2 { name="LMERConvenienceFunctions"; version="2.10"; sha256="08jz0i7sv7gn3bqckphbmnx0kc6yjnfvi06iyf7pcdzjaybxhj06"; depends=[fields LCFdata lme4 Matrix mgcv rgl]; }; - LMest = derive2 { name="LMest"; version="2.6.0"; sha256="1vzwcnp14bfbf7173fnxy1fwl8j9n2hrvmzw9ks6778ykg21q1f6"; depends=[Formula MASS mix mmm MultiLCIRT mvtnorm]; }; + LMest = derive2 { name="LMest"; version="2.6.1"; sha256="16amjb7dj5czlsjmr5s2hnjrfsiqwnc430q3hcncp3lllqib552g"; depends=[Formula MASS mix mmm MultiLCIRT mvtnorm]; }; LMfilteR = derive2 { name="LMfilteR"; version="0.1.2"; sha256="10agjrljnqw689nn9af9ihhb9sq2gmsx7l3zfmrizkavjjk67mcd"; depends=[MASS]; }; LN0SCIs = derive2 { name="LN0SCIs"; version="0.1.5"; sha256="09zr6lrvv7lw9qp3vz4n2dv0v3q7wq06wwvwpb2pm0r335bnrf89"; depends=[]; }; LNIRT = derive2 { name="LNIRT"; version="0.4.0"; sha256="0g2yqpsxz2fsvgvgn60yv2k8mv63anf6g2zzd9njarc524n874r8"; depends=[MASS]; }; LOGAN = derive2 { name="LOGAN"; version="1.0.0"; sha256="00y8kcykw01gv2g20vmpwkc3qqyafwbiw5pa731xlfnh1b8sn0hi"; depends=[dplyr foreign ggplot2 magrittr modules pander psych rlang stringr]; }; LOGICOIL = derive2 { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; }; - LOST = derive2 { name="LOST"; version="1.3"; sha256="01ymnczsnfml04hb6hbi041khkz2aki78qr3hriw7n3bzs5i7xim"; depends=[e1071 gdata MASS miscTools pcaMethods rgl shapes]; }; + LOST = derive2 { name="LOST"; version="2.0.2"; sha256="15ggmvjy2k4j692y9h3anfzmb0hgnx66cbr76grwvcfysdx87ick"; depends=[e1071 gdata geomorph MASS miscTools pcaMethods rgl shapes]; }; LPBkg = derive2 { name="LPBkg"; version="1.2"; sha256="1pgv6cb7m2j7qnrzybnv6x67a3ry8kpvisqj86rvxzclc9q56fdn"; depends=[Hmisc orthopolynom polynom]; }; LPCM = derive2 { name="LPCM"; version="0.46-3"; sha256="1bm5y95lzwcv8arlh55sy17m6hz1x48bcjkrwf3x34ax90qimf66"; depends=[]; }; LPGraph = derive2 { name="LPGraph"; version="2.1"; sha256="1d2kslravi3v9kf6sdabwfpa9s9xxqj3s3d7f7qfcrpfydqixq1q"; depends=[car PMA]; }; @@ -2224,7 +2229,7 @@ in with self; { LearningRlab = derive2 { name="LearningRlab"; version="1.3"; sha256="14q8pm51yrfpny2wg5l0x02zibh7qn11zkg51igadq3r6256rfd1"; depends=[crayon magick]; }; LexisNexisTools = derive2 { name="LexisNexisTools"; version="0.3.0"; sha256="19fcyvq2gs6iyks5x2s0xvbxqzvh9h7hpympvyrsx4026zv8x5cz"; depends=[data_table pbapply quanteda stringdist stringi tibble]; }; LexisPlotR = derive2 { name="LexisPlotR"; version="0.4.0"; sha256="0vlm8wcaj3755cbxrfb7ybla9znd2cbklw2xwyyn6r9i4c9xsfih"; depends=[dplyr ggplot2 tidyr]; }; - LibOPF = derive2 { name="LibOPF"; version="2.5.0"; sha256="1jnqb9fbyfk3pakjj8mbkdp2ky8v8gsql02mxlfflji9vliy9dq5"; depends=[]; }; + LibOPF = derive2 { name="LibOPF"; version="2.6.0"; sha256="0xs4098qd4j1c1vl8x8620xkrfg0iisdzs203djaqb7vqlywmlrn"; depends=[]; }; LiblineaR = derive2 { name="LiblineaR"; version="2.10-8"; sha256="17ykazac7iv02bxl8xg948vhbdr32icdm1v4bk31zmslp4xsk08g"; depends=[]; }; LiblineaR_ACF = derive2 { name="LiblineaR.ACF"; version="1.94-2"; sha256="1ldkb63yhm1ki8i585wp5byx6y0kvclwy3ncacgcdqqk0p41cyi6"; depends=[]; }; Libra = derive2 { name="Libra"; version="1.6"; sha256="0fqmc6fhcmpg9ragk4r4k000wrix9dsd52baz58bp1c80wpvvcf3"; depends=[nnls]; }; @@ -2248,7 +2253,7 @@ in with self; { LncMod = derive2 { name="LncMod"; version="1.1"; sha256="08001y7s93i3k3478jqfh9zsgpq6ym1xmdmldi7s76zbfr1nknvy"; depends=[pheatmap survival]; }; LncPath = derive2 { name="LncPath"; version="1.1"; sha256="1cpsy681yq96867nr9g75xb0dilb016shqlhxpdn5xyiakrgjl4v"; depends=[igraph]; }; LocFDRPois = derive2 { name="LocFDRPois"; version="1.0.0"; sha256="0zzdp9wgwr6wn3grimghpj4vq34x37c8bqg8acfzlzih8frqal3r"; depends=[dplyr ggplot2]; }; - LocalControl = derive2 { name="LocalControl"; version="1.1.2"; sha256="0r1qjzwmnh4qgxi5lfpg7v0ksjvcqbn8c23y2cyvb58srmxv7plb"; depends=[cluster gss lattice Rcpp]; }; + LocalControl = derive2 { name="LocalControl"; version="1.1.2.1"; sha256="123s7r11ivnp7fz6zcvzrgfyc17cqvn8k1786hcmgkplq9qnmnf4"; depends=[cluster gss lattice Rcpp]; }; LocalControlStrategy = derive2 { name="LocalControlStrategy"; version="1.3.3"; sha256="05vggk5d0w3f9w5217c9hzy5jhwv24p2g8pcj0l6zxkhic01nbrl"; depends=[cluster lattice]; }; Lock5Data = derive2 { name="Lock5Data"; version="2.8"; sha256="17awskq78h23z2dy96d7hziljhnkx5phpd48q7cppxidyvzfywim"; depends=[]; }; Lock5withR = derive2 { name="Lock5withR"; version="1.2.2"; sha256="10x3i11pb4cig4pgfmw9984na5zjbg7d41y6crakiimf53ihx0c2"; depends=[]; }; @@ -2258,12 +2263,12 @@ in with self; { LogitNet = derive2 { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; }; LogrankA = derive2 { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; }; LogrankPower = derive2 { name="LogrankPower"; version="1.0.0"; sha256="04vynymfv01q423dd9i1li92rl3lp1af3rzn3z4mamkn51mi6my0"; depends=[survival survminer]; }; - LongCART = derive2 { name="LongCART"; version="1.1"; sha256="0arrv72jmp1v5vr0lf7ng56cbagjxad01hx80220a0nglbyjvgxf"; depends=[Formula nlme rpart]; }; + LongCART = derive2 { name="LongCART"; version="2.0"; sha256="1xpbyz6hqwhbcgjv6fxkry30fhq11nw2r9s3smwik8cw8yiciwl5"; depends=[Formula magic nlme rpart survival survminer]; }; LongMemoryTS = derive2 { name="LongMemoryTS"; version="0.1.0"; sha256="0n378sad8i283vs7q63spdhwpwjly2d5zj15d4v2085j7sc7z8vi"; depends=[fracdiff longmemo mvtnorm partitions Rcpp RcppArmadillo]; }; LoopAnalyst = derive2 { name="LoopAnalyst"; version="1.2-6"; sha256="1gy9v6qiwkwbwp4snif2imf6zn50ffjrig54ln57c5v5pk3phnvv"; depends=[nlme]; }; LoopRig = derive2 { name="LoopRig"; version="0.1.1"; sha256="11rarb9fg8abc4dpd8sd8safqw3v6g8k6rcrg2nw97xppwcz8c6b"; depends=[GenomicRanges IRanges S4Vectors]; }; LotkasLaw = derive2 { name="LotkasLaw"; version="0.0.1.0"; sha256="11kq52yavicimp7ll7ljrs69a5fxf68ydb9md7v6b02iw5mwbmz7"; depends=[]; }; - LowRankQP = derive2 { name="LowRankQP"; version="1.0.3"; sha256="1a46rk0fhpnrlfzmydy7zjswrm6hf056qxgf5p10naq6025whf8x"; depends=[]; }; + LowRankQP = derive2 { name="LowRankQP"; version="1.0.4"; sha256="0cg8f42s15vphnifw6gnrhxaj6j5hmgbq8xki5mkwjsizd0ch5na"; depends=[]; }; LowWAFOMNX = derive2 { name="LowWAFOMNX"; version="1.1.1"; sha256="0f75qsv6pisgvk39yagzfxscnyfsgh63rmhp4gpybpl0pqmjp48x"; depends=[Rcpp RSQLite]; }; LowWAFOMSobol = derive2 { name="LowWAFOMSobol"; version="1.1.1"; sha256="1ym3i2m1am356di9lcp5nfmxq0np3c4bwsv6bbmf7hg02j7dhwi4"; depends=[Rcpp RSQLite]; }; Luminescence = derive2 { name="Luminescence"; version="0.9.7"; sha256="15slaiwhk5a15kmxr5slkbsm963v0dwmdl4adnhvc3j0b0c0d0r8"; depends=[bbmle data_table DEoptim httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; }; @@ -2360,7 +2365,7 @@ in with self; { MGDrivE = derive2 { name="MGDrivE"; version="1.5.0"; sha256="1dgmmc34m2pj1l2gkwg85sj4rbhhwyrp8cj4m9b9hlz134n3qgwy"; depends=[R6 Rcpp Rdpack]; }; MGL = derive2 { name="MGL"; version="1.1"; sha256="03q453swnangxyc4nvjhzw2zpcy5vp1wpilap5rwymnf0c0xi4j7"; depends=[]; }; MGLM = derive2 { name="MGLM"; version="0.2.0"; sha256="0yyqm53lvp59zy8lkffw9x3zhqrnh29j5v3yyzk6qrgj2slnc7nk"; depends=[]; }; - MGMS2 = derive2 { name="MGMS2"; version="1.0.1"; sha256="0pai8cf4czsscsw35plrqldmqryzn6zji41n4a3x73cr00msfxrb"; depends=[MALDIquant MALDIquantForeign]; }; + MGMS2 = derive2 { name="MGMS2"; version="1.0.2"; sha256="04f1ng4s163x7gvy1iaf0j8pzs0pm2r2saji0srbp2jyhrj68d7z"; depends=[MALDIquant MALDIquantForeign]; }; MGRASTer = derive2 { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; }; MGSDA = derive2 { name="MGSDA"; version="1.4"; sha256="0grwl740yvz2av5nkvmyyrr8ji5f39sjs1c5gxp6lp9p36i2wc32"; depends=[MASS]; }; MHCtools = derive2 { name="MHCtools"; version="1.2.1"; sha256="1mf70x1vd8h8i0iapl54fp8q4gpqd61faxvhpxlhv49g8s5n9pbd"; depends=[rlist]; }; @@ -2370,7 +2375,8 @@ in with self; { MHTmult = derive2 { name="MHTmult"; version="0.1.0"; sha256="1y3vh2kab6nfkiz4nzdhrpy9h6drk1ibfd2h62hpr3y09z9a2yld"; depends=[]; }; MHTrajectoryR = derive2 { name="MHTrajectoryR"; version="1.0.1"; sha256="13idcjx7pjpwvr4c52938yqhhaj1gprb8hjhaim3jx4062wf9pla"; depends=[mgcv]; }; MHadaptive = derive2 { name="MHadaptive"; version="1.1-8"; sha256="1w3bm82v8ahxrf0vqn0pznv7dqn212drinkz8y5kr1flx423l9ws"; depends=[MASS]; }; - MIAmaxent = derive2 { name="MIAmaxent"; version="1.1.0"; sha256="1hdggbsy2bcb2vjrjvn2fjnc1lvig9sqrndjfy37l8z9ndqsi6dm"; depends=[dplyr e1071 raster]; }; + MIAmaxent = derive2 { name="MIAmaxent"; version="1.1.1"; sha256="0azp8w626fhlwrk2qj7lyz9mpxj1hl2l8l1f7pviigdqp35shwf1"; depends=[dplyr e1071 raster]; }; + MIDASwrappeR = derive2 { name="MIDASwrappeR"; version="0.5.1"; sha256="07108dg16i20fg6cvsnbflfz65smwk08vjmf1b193zyvhdikwhfm"; depends=[Rcpp]; }; MIDN = derive2 { name="MIDN"; version="1.0"; sha256="08i9zfmaywi5imp36ahjpirlkl55k01x543nz95i089w3sfrsz0g"; depends=[BiasedUrn]; }; MIICD = derive2 { name="MIICD"; version="2.4"; sha256="1xlvhyh3gg77cym10i8hrxm8r1jm4plvny2c4izic6w89snplyq6"; depends=[MASS mstate survival]; }; MIIVsem = derive2 { name="MIIVsem"; version="0.5.4"; sha256="1fb4xnbp6c3c2dx3jhyqw463ghj4ak8jld148dyrmi9031mqv4fy"; depends=[boot car lavaan Matrix numDeriv]; }; @@ -2413,7 +2419,7 @@ in with self; { MMLR = derive2 { name="MMLR"; version="0.2.0"; sha256="1jc33ani6w54j38kxzk0kfj1hjfk80cil2hdja2hcsk6kqwd431d"; depends=[pracma]; }; MMMS = derive2 { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[glmnet survival]; }; MMVBVS = derive2 { name="MMVBVS"; version="0.8.0"; sha256="08nkhrf62yywpm0nw22pqzlcm72sf4zq44640a7pf57bbzm38ccy"; depends=[ggplot2 Rcpp RcppArmadillo reshape reshape2 rlang]; }; - MMWRweek = derive2 { name="MMWRweek"; version="0.1.1"; sha256="16dwmpj13rzxmd2x7xaakw2zq2aly7ajjbfnc39qvdzk6n2x37wn"; depends=[]; }; + MMWRweek = derive2 { name="MMWRweek"; version="0.1.3"; sha256="1l1ks44v52iggw9nhs56lfj6804yab5b17k8fzrc6h1kvj3vda0s"; depends=[]; }; MMeM = derive2 { name="MMeM"; version="0.1.0"; sha256="1b0wdcyqnliw85il5vnwy9l4x1z42kirbg872hl47plwfrp9gahc"; depends=[jointDiag lme4 MASS Matrix matrixcalc psych stringr]; }; MNLR = derive2 { name="MNLR"; version="0.1.0"; sha256="0q80232ndp7pkklzqdbga1vf51dmsxaivm4ia4wah32rc2c87fqp"; depends=[caret e1071 nnet rmarkdown shiny]; }; MNLpred = derive2 { name="MNLpred"; version="0.0.2"; sha256="0b3pgy9hqxwzvw61arvz9zlhx1j4fy9qmzwwzxf67b4ybmkzzsgl"; depends=[MASS]; }; @@ -2463,18 +2469,18 @@ in with self; { MSCquartets = derive2 { name="MSCquartets"; version="1.0.5"; sha256="0gfbawv7ib31pxmcj8ki67a72jqacm8nlizgk95yg7afjlqiyz8v"; depends=[ape phangorn RandomFieldsUtils Rdpack zipfR]; }; MSEtool = derive2 { name="MSEtool"; version="1.5.0"; sha256="10kczcv468c9s1blh37bj2cyy8zhszlwg7azvw64w2xmqnc782g4"; depends=[abind coda corpcor DLMtool dplyr gplots MASS mvtnorm RcppEigen reshape2 rmarkdown snowfall TMB]; }; MSG = derive2 { name="MSG"; version="0.4"; sha256="0fdxgqfc87iwqnnrgh7m8bfxh8lv42ffi0xxy4i1rv94aiw8gfr5"; depends=[RColorBrewer]; }; - MSGARCH = derive2 { name="MSGARCH"; version="2.31"; sha256="15df35l5nr6cl3q7xprl6ifswh7mg1fvix1x9374qgyafwr40sq4"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; }; + MSGARCH = derive2 { name="MSGARCH"; version="2.42"; sha256="1n5fvj6yx8sfi1vizw89410hc0d37w8mpqfsksdv01pgnfdcs11a"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; }; MSGLasso = derive2 { name="MSGLasso"; version="2.1"; sha256="1k17vnvzr647pwfbdxrpqcsp34iygq86wf0ns4rq8cj6q5mik1bv"; depends=[]; }; MSIseq = derive2 { name="MSIseq"; version="1.0.0"; sha256="1v2why1k6pjsc04044nr74571p7541nciq7xkzmya3jq6dw878j3"; depends=[IRanges R_utils rJava RWeka]; }; MSMwRA = derive2 { name="MSMwRA"; version="1.3"; sha256="0b0fqfv6iick1brqik4rqz2936nfa51i6xlfavs65r9692wks73q"; depends=[]; }; MSPRT = derive2 { name="MSPRT"; version="2.1"; sha256="0c0hhpjpkx8yl5bxqn6nw747jli9fdzkwmi31lzr664r5xinxyf7"; depends=[doParallel foreach ggplot2 iterators nleqslv]; }; MSQC = derive2 { name="MSQC"; version="1.0.2"; sha256="11wcy04cpjlnc71s2svs4lm1cp718dz1p4a1603x6zwpbf22bygn"; depends=[rgl]; }; - MST = derive2 { name="MST"; version="2.1"; sha256="16mnsn2an02k4jrqb6yj0n1i563zny5v10ngfq1y28fqaw6h8yyq"; depends=[Formula MASS partykit survival]; }; + MST = derive2 { name="MST"; version="2.2"; sha256="0p833nyq9p0r0hy02f4sy6gv1wm9flj3dxkv73ihy8503r89bbzz"; depends=[Formula MASS partykit survival]; }; MSbox = derive2 { name="MSbox"; version="1.2.1"; sha256="0lmvpzsw13w18mzi5z85yzify3xsh5sx356ndggfzyl5d5wk7s8g"; depends=[stringr xml2]; }; MScombine = derive2 { name="MScombine"; version="1.4"; sha256="0s3gbf3s5mf00d5mkbqhd9wwnyps7qb4r3zbal8j8nsaspql9nd3"; depends=[plyr]; }; MSwM = derive2 { name="MSwM"; version="1.4"; sha256="1zhfar02s7hm4gjs1flkh9a4526d98hik8bqrksy75758baiqg7l"; depends=[nlme]; }; MTA = derive2 { name="MTA"; version="0.2.0"; sha256="1wic2rw63h2daha23fpyw80x7ywjwqq6rj5jg73iankvdg32mlvm"; depends=[cartography igraph sf sp]; }; - MTAR = derive2 { name="MTAR"; version="0.1.0"; sha256="1bq930m7rd1kgn5442p8dcycxi55vgkrmlwssva5w0p5javi4x4a"; depends=[CompQuadForm MASS Matrix seqMeta SKAT]; }; + MTAR = derive2 { name="MTAR"; version="0.1.1"; sha256="17r2da1hdvs8qvgar87zdl51jy8w30vczcsi6jrq0rdyi1lld641"; depends=[CompQuadForm MASS Matrix]; }; MTDrh = derive2 { name="MTDrh"; version="0.1.0"; sha256="0ass3b90nr4i0y7v30hk8xhq3hj9bxaxcsr4f8wfi0lnvzfv6aaa"; depends=[]; }; MTE = derive2 { name="MTE"; version="1.0.0"; sha256="009mrl9dgxafl4hrgfzvsfvgx3dljb0rbbs74j2cxc5ray87kp55"; depends=[parcor quantreg]; }; MTGS = derive2 { name="MTGS"; version="0.1.0"; sha256="0ijcw730xap5c38k8z4d976azwcnygxaiv2ksrad8j8nnvnh5zbd"; depends=[glmnet kernlab MRCE]; }; @@ -2489,7 +2495,7 @@ in with self; { MVLM = derive2 { name="MVLM"; version="0.1.4"; sha256="1zcj405dc4jbiqw6p0fcbam8yc9d6yjpmrx5wjw5zjvig3iqb91k"; depends=[CompQuadForm]; }; MVN = derive2 { name="MVN"; version="5.8"; sha256="1rk8zrf3bavywv4bca1aqsfrirxkvxh5lfwrnj0g8zncd69bd1fc"; depends=[boot car energy kableExtra magrittr MASS moments mvoutlier nortest plyr psych robustbase]; }; MVNBayesian = derive2 { name="MVNBayesian"; version="0.0.8-11"; sha256="1iaxyp480v91887cn4w3l74907wvbzs3ay4cjgzd8xk2dp47w8bg"; depends=[mvtnorm plyr]; }; - MVNtestchar = derive2 { name="MVNtestchar"; version="1.0.0"; sha256="1dsvpjxdf589ngwpga3kznpi6q4i9aaj09hwhvcj1inqg51wiwm6"; depends=[Hmisc]; }; + MVNtestchar = derive2 { name="MVNtestchar"; version="1.0.2"; sha256="08zvyx829bd2rxbz2i4fwr4hd34y93zgqsklp42zk2mrvfwbivbg"; depends=[ggplot2 Hmisc]; }; MVQuickGraphs = derive2 { name="MVQuickGraphs"; version="0.1.2"; sha256="1937w8y866bsn9kn6a98c91akhm9ddc5dr9wqm51lkbjyz1zm0j1"; depends=[plotrix]; }; MVR = derive2 { name="MVR"; version="1.33.0"; sha256="1ygz47a2p5r5axql5zsxvsn25pcqyxz6mpw50zfmzrcqdrfa3bg8"; depends=[statmod]; }; MVT = derive2 { name="MVT"; version="0.3"; sha256="0vinlv3d5daf8q7pd9xgs51nxz2njgdba5750vygmv883srlzi9d"; depends=[]; }; @@ -2508,7 +2514,7 @@ in with self; { MajKMeans = derive2 { name="MajKMeans"; version="0.1.0"; sha256="1zphrxyx3jd6rnh1y1qnc6bip34kfqk1a5ms4ps39gfngznh482m"; depends=[MASS]; }; MakefileR = derive2 { name="MakefileR"; version="1.0"; sha256="1pfjic2lsar8ghbb6byr4rqrs30qrgfih092z4rxdpsiwkk3y7l1"; depends=[magrittr]; }; Mangrove = derive2 { name="Mangrove"; version="1.21"; sha256="1qf3fjzf0sb6fqbfdbxwbw6wah3gg2qran4mgg13hcmk4n3j0hxp"; depends=[]; }; - ManifoldOptim = derive2 { name="ManifoldOptim"; version="0.1.5"; sha256="15549sgsrsq1b5l5bd3flcgzjyyw2ih211a7bdqv592jl672qq29"; depends=[Rcpp RcppArmadillo]; }; + ManifoldOptim = derive2 { name="ManifoldOptim"; version="1.0.0"; sha256="1lds4cs4v3gpibz74cz319x2zkc6nipiqw1ywcrmv125aixxzglp"; depends=[Rcpp RcppArmadillo]; }; ManlyMix = derive2 { name="ManlyMix"; version="0.1.14"; sha256="0zpcc74965n435d4fah41r9nz0kjyn46hkjl1s0kvlllqj6n69wg"; depends=[]; }; ManyTests = derive2 { name="ManyTests"; version="1.2"; sha256="1mi7wvnkcd95126f1h8vl8skn397yd2zqvcswprqar54p161wgyi"; depends=[]; }; Map2NCBI = derive2 { name="Map2NCBI"; version="1.4"; sha256="1ssqnm9g5p0nnhdyp9dqbbsz3hw8jzdwy0rv3csp8fxm0f1bi1kb"; depends=[rentrez]; }; @@ -2524,7 +2530,7 @@ in with self; { Massign = derive2 { name="Massign"; version="1.1.0"; sha256="09i32lsrx40rxrnb9alfipfrkipy4mza5nr4gcpn2a5h86ak9290"; depends=[]; }; MatManlyMix = derive2 { name="MatManlyMix"; version="1.1.1"; sha256="1d2vd5b9lirdybjclxh0nn4mghq64qjj4l8vnj95cni5pfa18a2c"; depends=[]; }; MatSkew = derive2 { name="MatSkew"; version="0.1.5"; sha256="019v2b1r0bvw84xs50smjb3jdz7gd2adz5d84xd8zq43lnml96d1"; depends=[]; }; - MatTransMix = derive2 { name="MatTransMix"; version="0.1.7"; sha256="1p67k2ysh7lahynlfyp30bxpzpc49jhdy2y5mfs09yhjwg0wl1by"; depends=[]; }; + MatTransMix = derive2 { name="MatTransMix"; version="0.1.8"; sha256="0090qfkal40kizr2j6jc9sksg5appp5pv3g8f9yp7jqcgb2hpggd"; depends=[]; }; MatchIt = derive2 { name="MatchIt"; version="3.0.2"; sha256="1pp91pw2sy9hik4sgn4gcsp40hb01n9pfccrwdcffwji5fd1aavq"; depends=[MASS Matching]; }; MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.3"; sha256="1si0zn6vlgyj08841hfjx8an96a8ipnawl4zbalabmpy7r5bfwx8"; depends=[Hmisc Matching]; }; MatchThem = derive2 { name="MatchThem"; version="0.9.3"; sha256="05m141qn0a9ahraga1lpcjffbddmm70bx9m3javrr9727nnar9wf"; depends=[broom dplyr MatchIt mice survey WeightIt]; }; @@ -2539,7 +2545,7 @@ in with self; { MaxPro = derive2 { name="MaxPro"; version="4.1-2"; sha256="19a2wp93kx1wkbzd5bvljbm1rr96gr14w4fb0ppbgr2y2a4g8i1v"; depends=[nloptr]; }; MaxSkew = derive2 { name="MaxSkew"; version="1.1"; sha256="0x5x0jpvhp189jnmgh6d1h3ya0dicj5qfcrgr2fhp1v8jjhl125m"; depends=[]; }; MaxentVariableSelection = derive2 { name="MaxentVariableSelection"; version="1.0-3"; sha256="1cmxfdkm5k85b4ivlfy5521hkfj0gq2pb1qlxxklh0fprw87kp9c"; depends=[ggplot2 raster]; }; - MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.4.2"; sha256="1p79wc3f1mcv9nlf8z277h1vzxl33w48knhn0yrw902vr5a0lzhf"; depends=[devtools dplyr futile_logger lubridate magrittr purrr rlang stringr tibble]; }; + MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.4.3"; sha256="08zfd32xhggswzxj35zsvskyaiqx483pkw57f0i2afx3idz3p0am"; depends=[devtools dplyr futile_logger lubridate magrittr purrr rlang stringr tibble]; }; MazamaLocationUtils = derive2 { name="MazamaLocationUtils"; version="0.1.6"; sha256="187lrpc9z3k4jnd1nvqsb0qibz9xz9i1i61vssqm72h1hx1j9j6f"; depends=[digest dplyr geodist httr lubridate magrittr MazamaCoreUtils MazamaSpatialUtils readr revgeo rlang stringr]; }; MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.6.4"; sha256="0wb221h8lwdcx5h5hkvpz9rarizry22qzydibcc2gs6b0d5514ms"; depends=[countrycode dplyr geojsonio lubridate magrittr rgdal rgeos rlang rmapshaper rvest shiny sp stringr xml2]; }; McSpatial = derive2 { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; }; @@ -2568,6 +2574,7 @@ in with self; { MetaPCA = derive2 { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; }; MetaPath = derive2 { name="MetaPath"; version="1.0"; sha256="1vvpfv6yc4rd4apqfs2yzm97xxsv43ghwqnjq6w1xrc4pdx2p634"; depends=[Biobase genefilter GSEABase impute]; }; MetaSKAT = derive2 { name="MetaSKAT"; version="0.80"; sha256="1hkkirbxl17v7sdbj4646fijlwvdw3p10h97r9h46cw6cn77v5gq"; depends=[SKAT]; }; + MetaStan = derive2 { name="MetaStan"; version="0.2.0"; sha256="035qmzkijaql5d9h1a83p535gihy4bbv9n839q9kpp0l05mdwgwm"; depends=[BH Rcpp RcppEigen rstan rstantools StanHeaders]; }; MetaSubtract = derive2 { name="MetaSubtract"; version="1.60"; sha256="19xg95g2qgyi90pz3733l596gzdj6dmb0k9i4qmhaq4yck69rrhj"; depends=[]; }; MetaUtility = derive2 { name="MetaUtility"; version="2.1.0"; sha256="1lbqqh56pwxlcksv0kf463hc20jb4rkjqkcqal000rzyzd4bi2zj"; depends=[dplyr metafor purrr stringr]; }; MetaboList = derive2 { name="MetaboList"; version="2.0"; sha256="10skvf14ls4qll0l9p6cig4lmj7138khcksyjvd1pqym9axk3wxn"; depends=[dplyr enviPick ggplot2 scales]; }; @@ -2584,10 +2591,11 @@ in with self; { Methplot = derive2 { name="Methplot"; version="1.0"; sha256="0aaqss9zfn55qi45jffxkksnkw510npjnkygafx49vl77bkagqh5"; depends=[ggplot2 reshape]; }; MethylCapSig = derive2 { name="MethylCapSig"; version="1.0.1"; sha256="16ch9aldr6a9jn42h387n7qvnzs0yx28f2yj6xq0kp476q7rf4ql"; depends=[geepack]; }; Metrics = derive2 { name="Metrics"; version="0.1.4"; sha256="0fh8qbjlwzagh272lgwr4bxcqcjb1qpz53mgs8rzlvncax6nk5bk"; depends=[]; }; - MetricsWeighted = derive2 { name="MetricsWeighted"; version="0.5.0"; sha256="0i9wla42i5p9yqjsrhjylyfszxl7p3k4yfwkvqsw9ncak611ig9x"; depends=[]; }; + MetricsWeighted = derive2 { name="MetricsWeighted"; version="0.5.1"; sha256="0gv66ly2cchx6lf75sw4izpy2frdnzficb8xirdgj57h8cg5yppd"; depends=[]; }; MfUSampler = derive2 { name="MfUSampler"; version="1.0.4"; sha256="0i5siq1jacxbfvakb97qnj3h7pk471rrx8ckwm0d8nl3j586s36y"; depends=[ars coda HI]; }; MiDA = derive2 { name="MiDA"; version="0.1.2"; sha256="144gxsxqljzskxsw5k0y69ix0pxlfvyyznxkjpf2ng4l47pg11z5"; depends=[caret gbm genefilter limma preprocessCore pROC SQN]; }; MiRAnorm = derive2 { name="MiRAnorm"; version="1.0.0"; sha256="154wv0j82xyc4y5cd2czh0q8kzhgrk6qsn0ahc1zn3fnrzc9fgz0"; depends=[ArgumentCheck cluster dendextend ggplot2 MASS npmv plyr reshape2]; }; + MiRKAT = derive2 { name="MiRKAT"; version="1.1.0"; sha256="15ah3zgf67sv0rxw99qvxsfbivni5pkcrmqhf0c3656bjwb397hd"; depends=[CompQuadForm ecodist GUniFrac lme4 MASS Matrix mixtools PearsonDS permute quantreg survival]; }; MiRSEA = derive2 { name="MiRSEA"; version="1.1"; sha256="0jpl6ws5yx1qjzdnip9a37nmvx81az4cbsjm57x613qjpwmg6by3"; depends=[]; }; MiSPU = derive2 { name="MiSPU"; version="1.0"; sha256="1l6q0fm5z5i6gigr940h8kc5rka08psmhcprp8grmsxk3qy2kply"; depends=[ape aSPU cluster Rcpp RcppArmadillo vegan]; }; MiST = derive2 { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; }; @@ -2629,11 +2637,11 @@ in with self; { ModelMetrics = derive2 { name="ModelMetrics"; version="1.2.2.2"; sha256="0mrlsw4c5y1vdsqynxr2dcvmhh5h37pnd71jw5a5djpbda9g21jy"; depends=[data_table Rcpp]; }; Modelcharts = derive2 { name="Modelcharts"; version="0.1.0"; sha256="1jy78kyyh4r13px2d5bm7fra5bkcpimzfji0hmydspkfi3qla37x"; depends=[dplyr plotly]; }; Modeler = derive2 { name="Modeler"; version="3.4.5"; sha256="15gbg5568qj81wp6yy31amb2b7wl1wvlmgpmdp29lvz1p33jx2y1"; depends=[class ClassComparison ClassDiscovery e1071 neuralnet nnet oompaBase randomForest rpart TailRank]; }; - MomTrunc = derive2 { name="MomTrunc"; version="5.79"; sha256="01pbajb2vziw3hl4600mcwdljkh3lmacqz14mknj0fkd2qnqdrnm"; depends=[hypergeo mvtnorm Rcpp RcppArmadillo tlrmvnmvt]; }; + MomTrunc = derive2 { name="MomTrunc"; version="5.87"; sha256="1mnas2vws54h8zzf7f0drnk00rphfxr8g2277gcknbfpr8xkwacz"; depends=[hypergeo mvtnorm Rcpp RcppArmadillo tlrmvnmvt]; }; + Momocs = derive2 { name="Momocs"; version="1.3.0"; sha256="149q4qyplgvcvscg7846m0cjagvby3rj40g9bpx6kvd67arfrl6y"; depends=[cluster dendextend dplyr geometry geomorph ggplot2 jpeg magrittr MASS progress RColorBrewer rgeos sp vegan]; }; Mondrian = derive2 { name="Mondrian"; version="1.0-0"; sha256="07r64q518diphai951pw4vfaw4sd6bqwhi6q5cp4pcl3aqjynkmj"; depends=[RColorBrewer]; }; MonetDB_R = derive2 { name="MonetDB.R"; version="1.0.1"; sha256="1r7vki0rrzwcrfg4f2lfx30g614vf2xi62qb1rs21a9j5741lxlx"; depends=[codetools DBI digest]; }; MonoInc = derive2 { name="MonoInc"; version="1.1"; sha256="14rykw3bfj0vznz0rw4vsg1k4vanfv9cy867vspw966ncl4bw70h"; depends=[compare doParallel foreach iterators sitar]; }; - MonoPhy = derive2 { name="MonoPhy"; version="1.2"; sha256="0997kg8hfwgsc9s155z0wrf7rrhn3vf6681j9psjl3hsspg08z2r"; depends=[ape phangorn phytools RColorBrewer taxize]; }; MonoPoly = derive2 { name="MonoPoly"; version="0.3-10"; sha256="0ls3sjfkinp9c5002ww0xm4l2galf20w2f45nm5irkk9sbqas0jq"; depends=[quadprog]; }; Monte_Carlo_se = derive2 { name="Monte.Carlo.se"; version="0.1.0"; sha256="1d5gp4wvpvrlp82g8k8v668mzhmdlk2pvky34v7hxysap9xgmsqr"; depends=[]; }; MonteCarlo = derive2 { name="MonteCarlo"; version="1.0.6"; sha256="1jwq3by8zfy6sbzahcj5l0vicqn7yyqpb7xhfsaymfspm7xyq6pj"; depends=[abind codetools reshape rlecuyer snow snowfall]; }; @@ -2651,7 +2659,7 @@ in with self; { MtreeRing = derive2 { name="MtreeRing"; version="1.4.2"; sha256="097w65ijhdkag26z39kzqqp7bs3bcx4iqapj3qc8inh0iynhnxp6"; depends=[bmp dplR dplyr imager jpeg magick magrittr measuRing png shiny shinydashboard shinyWidgets spatstat tiff]; }; MuChPoint = derive2 { name="MuChPoint"; version="0.6.1"; sha256="15bqsc7bsjg55qxjwxh58bxbwz61a6wv4xxph994g4020b98l01x"; depends=[capushe Matrix Rcpp shiny]; }; MuFiCokriging = derive2 { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; }; - MuMIn = derive2 { name="MuMIn"; version="1.43.15"; sha256="1xp0r7yqvll90jv7i5jx142vj5pmfpfmmn6i9a7kgqx26yzpq87h"; depends=[Matrix nlme]; }; + MuMIn = derive2 { name="MuMIn"; version="1.43.17"; sha256="1ac78wg94j37ikwb8r1lxk6jlj3m804q94630i5vcm663p99cqdc"; depends=[Matrix nlme]; }; MuViCP = derive2 { name="MuViCP"; version="1.3.2"; sha256="1wkiwdz4bblxf1zr57khljqkga9ks9aj1lnidvmhib94q6b8fnf4"; depends=[gtools MASS sm]; }; MullerPlot = derive2 { name="MullerPlot"; version="0.1.2"; sha256="0am5brdmbh2mw74fbw9nha6h4qlhj8psg3142mql1ad99bd0zg4w"; depends=[RColorBrewer]; }; MultAlloc = derive2 { name="MultAlloc"; version="1.2"; sha256="0c3sqfaa08s8mk4yz77kh6q6v9ic5xp52g9prfw1k2kv4nw1k2qd"; depends=[Rglpk]; }; @@ -2713,10 +2721,9 @@ in with self; { NGBVS = derive2 { name="NGBVS"; version="0.2.0"; sha256="1k7m7wy54irqci6ccclpylbmz0613ha7r531cji99jb7nkpzl6l0"; depends=[Rfast]; }; NGSSEML = derive2 { name="NGSSEML"; version="1.0"; sha256="1kwdziv2rdswbjq2rir2a6yw6ldnck1z7hahyywvw0kbm5fkb4zq"; depends=[car dlm fields interp mvtnorm]; }; NHANES = derive2 { name="NHANES"; version="2.1.0"; sha256="0aphv3rakfcfrv2km1xyxpj1bxiazy6gwrvs7lyhxmq468fk4c9a"; depends=[]; }; - NHEMOtree = derive2 { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[emoa partykit rpart sets]; }; NHLData = derive2 { name="NHLData"; version="1.0.0"; sha256="0dfqalccbkmqrn3h1z6s78l818c8sqn7d6yc8mg872ygmszryci7"; depends=[]; }; NHMM = derive2 { name="NHMM"; version="3.10"; sha256="058p0lyizqhdhapvjxk2c7n0bpid340hv1dn0cypy5w12y7zml4s"; depends=[BayesLogit MASS MCMCpack msm Rcpp]; }; - NHMSAR = derive2 { name="NHMSAR"; version="1.16"; sha256="0qwc7hnzr69xfwxgg151j7d8ffas66w48d4p76njrkq7l7rb9681"; depends=[glasso lars ncvreg ucminf]; }; + NHMSAR = derive2 { name="NHMSAR"; version="1.17"; sha256="149zzk8apl4zv60xagl8zk3zv1fnrbfijmlwn8c4vypvlfdsr981"; depends=[glasso lars ncvreg ucminf]; }; NHPoisson = derive2 { name="NHPoisson"; version="3.3"; sha256="1i6n59ckcxk1hwyz97jmnv4yb96ianjma6ka8lpz79ivs41jniad"; depends=[car]; }; NHSRdatasets = derive2 { name="NHSRdatasets"; version="0.1.2"; sha256="0xiqbqq7xjyi1vxza853ylyiq4nqr6y10x8i13c2kj756biz4h1n"; depends=[]; }; NIPTeR = derive2 { name="NIPTeR"; version="1.0.2"; sha256="0ll6amqyw33a93xiccihidrnbaqlx1q7kqcd4wks7cvqawd8pgv1"; depends=[Rsamtools S4Vectors sets]; }; @@ -2737,7 +2744,7 @@ in with self; { NMOF = derive2 { name="NMOF"; version="2.1-0"; sha256="10dxy35ps8qmyfqhrz0g1yyc30d84wwmf084m94nv0pk87blw7s3"; depends=[]; }; NMVANOVA = derive2 { name="NMVANOVA"; version="1.1.0"; sha256="1jlqyg5vn7j8srvifjghd5a7820kadl8kbwib4qxalrfprq81h8p"; depends=[]; }; NNMIS = derive2 { name="NNMIS"; version="1.0.1"; sha256="1w2i4xlx249p589yqdgbx1ra406ycxw729vbk1lqadbn71m6blaz"; depends=[survival]; }; - NNS = derive2 { name="NNS"; version="0.5.0"; sha256="0faqxl7bsf819qljr5v7zgrvpadkxbkawmfjwd9cy23qms8dwphg"; depends=[data_table doParallel dtw rgl stringr]; }; + NNS = derive2 { name="NNS"; version="0.5.1"; sha256="1mlswbxqinqk5vayfnirrj5q738g76g5h0ws4wnayzcrgqf697a7"; depends=[data_table doParallel dtw rgl stringr]; }; NNTbiomarker = derive2 { name="NNTbiomarker"; version="0.29.11"; sha256="0sqlf7vzhpmq2g98c2qlrcqn3ba4ycfxbczgcjiqqhqsvgkpacc1"; depends=[magrittr mvbutils shiny stringr xtable]; }; NORMA = derive2 { name="NORMA"; version="0.1"; sha256="193q6dwn8v7k8xq0amjpvb3v6mn7c6agqa487gvjj78dy1qz720a"; depends=[rootSolve]; }; NORMT3 = derive2 { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; }; @@ -2755,7 +2762,7 @@ in with self; { NPS = derive2 { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; }; NPflow = derive2 { name="NPflow"; version="0.13.3"; sha256="1bgdkm82pmzjv46pkxpvh5ffffmc6q68x5jjl7k330w9vwgx2kf0"; depends=[ellipse fastcluster ggplot2 pheatmap Rcpp RcppArmadillo reshape2 truncnorm]; }; NPsimex = derive2 { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; }; - NSM3 = derive2 { name="NSM3"; version="1.13"; sha256="0icjx9whn6ff25rh2p3pd8y3yc0f4ssw00g25dryzhfclqkcf006"; depends=[agricolae ash binom BSDA coin combinat fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; }; + NSM3 = derive2 { name="NSM3"; version="1.14"; sha256="0w6ls6k3m395wka6zl64i0nvxjm9c6b3yyd80f6k9k14lmgivm8p"; depends=[agricolae ash binom BSDA coin combinat fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; }; NSO1212 = derive2 { name="NSO1212"; version="1.0.0"; sha256="1yk07n9ksbazj27sax5jhs5f84zy80awrvkhziclsqm3h1g3h7w5"; depends=[httr jsonlite]; }; NST = derive2 { name="NST"; version="2.0.4"; sha256="0kwdfqr30av50k1s8sdf7714kzq9z1qrg85c3r7ljzrajj16vnl3"; depends=[ape permute vegan]; }; NSUM = derive2 { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; }; @@ -2819,6 +2826,7 @@ in with self; { Numero = derive2 { name="Numero"; version="1.4.2"; sha256="1g9jbgygpr22lbikslkdmf7zphrcw826ijkc567av7c96nr9wkib"; depends=[Rcpp]; }; NutrienTrackeR = derive2 { name="NutrienTrackeR"; version="0.99.2"; sha256="1vzha3ywjbd877fqy3r2xkgi8m44s3ss65bij0vcc4mx8lajhgb5"; depends=[ggplot2]; }; OAIHarvester = derive2 { name="OAIHarvester"; version="0.3-0"; sha256="1c57jxb9n397wdkrirbfh70sxllrg9zsy0np698z7kcx83rz5lqr"; depends=[curl xml2]; }; + OBASpatial = derive2 { name="OBASpatial"; version="1.1"; sha256="1a6n440z50v75ms3lmjsa9z7cz0fkmj3k98wsqhq1s7sazd85am4"; depends=[cubature invgamma LaplacesDemon modeest truncdist]; }; OBMbpkg = derive2 { name="OBMbpkg"; version="1.0.0"; sha256="01wch8wwij3fd0jambk0hpkhlnp4ryrq8qnnr2w1iad9zssjyii5"; depends=[]; }; OBsMD = derive2 { name="OBsMD"; version="5.3"; sha256="10acj6d0nvf1zyirp001c2fhsg2gq33zywnp8w70gm1dk7pgzfzr"; depends=[]; }; OCA = derive2 { name="OCA"; version="0.1"; sha256="0kaf46gic8gp8f98y68kqvgm1baicwgvarfiwry1j0bd2rjad64d"; depends=[]; }; @@ -2849,6 +2857,7 @@ in with self; { OSMscale = derive2 { name="OSMscale"; version="0.5.1"; sha256="0rjhyhh1iafgd9h1pbd2clyg2sh0gg7y1aqmiislqyn6h6jrvgqn"; depends=[berryFunctions OpenStreetMap sp]; }; OSNMTF = derive2 { name="OSNMTF"; version="0.1.0"; sha256="0g83wqh97iz3g4ganj2dy3biyn8cmb0v8zz6rydald1hfszj8aa2"; depends=[dplyr MASS]; }; OSTSC = derive2 { name="OSTSC"; version="0.0.1"; sha256="0p92w25xvajsn44rd5hg1m7l9l4m0rpmw175nnqr438432hqh7cc"; depends=[doParallel doSNOW fields foreach MASS]; }; + OTE = derive2 { name="OTE"; version="1.0.1"; sha256="0jvvrrfhpc5kibbxrd5r4dj97jp5m072fxnkpcyz11gi65db3z4g"; depends=[randomForest]; }; OTRselect = derive2 { name="OTRselect"; version="1.0"; sha256="1bh14228yz552ngywjf1qyh1isqj4cgiy7n7d4zg8dpqwxr04ykp"; depends=[lars survival]; }; OTUtable = derive2 { name="OTUtable"; version="1.1.2"; sha256="1sm037ihm12xyp7ns5f0c1psflvm1aj3xnsj5nzh2rsjn35hvd6h"; depends=[]; }; OTclust = derive2 { name="OTclust"; version="1.0.2"; sha256="1nrgjn13nbki59i51m28h3z0bppmvcp7qgv09h2r2vvdk858iy9z"; depends=[class ggplot2 magrittr RColorBrewer Rcpp]; }; @@ -2865,7 +2874,7 @@ in with self; { Omisc = derive2 { name="Omisc"; version="0.1.2"; sha256="0ww83srfc7vr1gw2aaa5bahs6lvm11j4057hn06pclz1wb6fnbyw"; depends=[copula MASS psych]; }; OmnibusFisher = derive2 { name="OmnibusFisher"; version="1.0"; sha256="0x3q04g45nixgsrl4biqqi6bk4kx79spq5whm3n4ppr0nkv8dw4h"; depends=[CompQuadForm stringr survey]; }; OnAge = derive2 { name="OnAge"; version="1.0.1"; sha256="1zby5sf92c185b5m19jv4ndgbv6mz107nc47zn1d6bijrypzpc20"; depends=[]; }; - OncoBayes2 = derive2 { name="OncoBayes2"; version="0.6-3"; sha256="1m05m6g98az7qy14j3w0r5vym997a6c564y4ispl711s609yg2rr"; depends=[abind assertthat bayesplot BH checkmate dplyr Formula ggplot2 RBesT Rcpp RcppEigen rstan rstantools StanHeaders tibble tidyr]; }; + OncoBayes2 = derive2 { name="OncoBayes2"; version="0.6-4"; sha256="15l15yz547drhj7j02wq1qiqh74b3fivsmpzabhfc6ipblzil3vs"; depends=[abind assertthat bayesplot BH checkmate dplyr Formula ggplot2 RBesT Rcpp RcppEigen rstan rstantools StanHeaders tibble tidyr]; }; Oncotree = derive2 { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; }; OneArmPhaseTwoStudy = derive2 { name="OneArmPhaseTwoStudy"; version="1.0.3"; sha256="0q8g33s1jq0ipvwq83xhrly8idsh68licgyivxc628zbm1id5p38"; depends=[Rcpp]; }; OneR = derive2 { name="OneR"; version="2.2"; sha256="1k7rzhcwq5b2yi4zfsc1r0yb6w65gxj9835d2a1dclallja3zav2"; depends=[]; }; @@ -2873,7 +2882,7 @@ in with self; { OpasnetUtils = derive2 { name="OpasnetUtils"; version="1.3"; sha256="0mmn4dpk1wl8slg55xzhpk7jdwhkrka53rwmrsr73sikkh3mcyfn"; depends=[digest ggplot2 httpRequest igraph plyr RCurl reshape2 rgdal rjson sp triangle xtable]; }; OpenCL = derive2 { name="OpenCL"; version="0.2-1"; sha256="1bhnqwrb8phldk5hr06iyvw8fx03x01ddqr4y5zs4a1wpyah7j2w"; depends=[]; }; OpenImageR = derive2 { name="OpenImageR"; version="1.1.6"; sha256="1yl7xvb86vxyf8d5g58hhmrva0gyg8iabb9npsdlnl8j0bg5gfiw"; depends=[jpeg png R6 Rcpp RcppArmadillo shiny tiff]; }; - OpenLand = derive2 { name="OpenLand"; version="1.0.0"; sha256="0y4hhld08dj82j1dqmm5ywq8dkfcnlgg3g6ndhcj4h6ihrwq4xc7"; depends=[circlize dplyr ggplot2 gridExtra networkD3 raster tidyr]; }; + OpenLand = derive2 { name="OpenLand"; version="1.0.1"; sha256="1wa7hkfwvzzj9lm07hdajwf6g8ys3g2ff8vqva3gqwqa9j1fam9n"; depends=[circlize dplyr ggplot2 gridExtra networkD3 raster tidyr]; }; OpenML = derive2 { name="OpenML"; version="1.10"; sha256="132swv22ymm0wxq8y65y2niq8chmga1mnl1lgn6m3cgljvwad47r"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise stringi XML]; }; OpenMPController = derive2 { name="OpenMPController"; version="0.2-5"; sha256="00hs8v47pr2d726z8izkfrgmayw147hdm16rr9rw1zs3ad216zjj"; depends=[]; }; OpenMx = derive2 { name="OpenMx"; version="2.17.3"; sha256="1s2pcg281ag3qz2wz8yi826f2d3kj3qg916js7zz0nsrljcyv5bc"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; }; @@ -2885,7 +2894,7 @@ in with self; { OptHedging = derive2 { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; }; OptInterim = derive2 { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[clinfun mvtnorm]; }; OptM = derive2 { name="OptM"; version="0.1.3"; sha256="1dykfhnkrqz2axzzggpzaiknd52rx8zj4nk3nv2rvh74f9hv8px7"; depends=[boot SiZer]; }; - OptSig = derive2 { name="OptSig"; version="2.0"; sha256="1d5baq6zq5vkklg8sabzs9kril95swvqd6fzkfywixsqnyywcvvm"; depends=[pwr]; }; + OptSig = derive2 { name="OptSig"; version="2.1"; sha256="1k43qsjdc00plgsindjkfn6v098v0zfy7sjkh4n4ybib2qx3v8fn"; depends=[pwr]; }; OptimClassifier = derive2 { name="OptimClassifier"; version="0.1.5"; sha256="1j2svfy5lzvz5vazpf55fvzqy5kk0l47x8qfy6j2jz1dc3gjh2rs"; depends=[clisymbols crayon dplyr e1071 ggplot2 lme4 lmtest MASS nnet nortest rpart]; }; OptimaRegion = derive2 { name="OptimaRegion"; version="1.1"; sha256="1bikc12a5v3q7f26r14pdfmnxpyqzxa94a10mx5g954km3a329ly"; depends=[boot DepthProc fields geometry magrittr mclust nloptr Rdpack Rdsdp rsm spam stringr]; }; OptimalCutpoints = derive2 { name="OptimalCutpoints"; version="1.1-4"; sha256="0n2vmzkc733yzs155zdj2n8ng74x9hy4m91fl7fac8d4gnrnc8yg"; depends=[]; }; @@ -2904,7 +2913,7 @@ in with self; { OutlierDC = derive2 { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[Formula quantreg survival]; }; OutlierDM = derive2 { name="OutlierDM"; version="1.1.1"; sha256="0n8iq464ryc3v4wms7cdka39870w5pg29z9v8gmdsp4d9cfsx9v4"; depends=[MatrixModels outliers pcaPP quantreg]; }; OutlierDetection = derive2 { name="OutlierDetection"; version="0.1.1"; sha256="0z4797j2gr37c1jnhivczff3y2dd2kilyncc087ihpwaa26wv0nl"; depends=[DDoutlier depth depthTools ggplot2 ldbod plotly spatstat]; }; - OutliersO3 = derive2 { name="OutliersO3"; version="0.6.2"; sha256="197r5mxvg968hisgqsd0p1sxjsakmn27gpsh3qx3cnvs1pikj3dr"; depends=[cellWise dplyr FastPCS forcats GGally ggplot2 HDoutliers memisc rlist robustbase robustX tidyr]; }; + OutliersO3 = derive2 { name="OutliersO3"; version="0.6.3"; sha256="165v572w9bnvay9f0xyxzbhgj1i86ndia4rzqy98i48dfdbdb990"; depends=[cellWise dplyr FastPCS forcats GGally ggplot2 HDoutliers memisc rlist robustbase robustX tidyr]; }; OutrankingTools = derive2 { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; }; OwenQ = derive2 { name="OwenQ"; version="1.0.3"; sha256="0kra8pvz21kqwzwsrqh6vwfyq9qqrar3glcycd2gip19273whdim"; depends=[BH Rcpp RcppEigen RcppNumerical]; }; OxyBS = derive2 { name="OxyBS"; version="1.5"; sha256="11l3gm0jvw993jb13f6kpv77m6z0d1jswscma2v28qzkw053r3dc"; depends=[]; }; @@ -2915,9 +2924,8 @@ in with self; { PAFway = derive2 { name="PAFway"; version="0.1.3"; sha256="1ggmqbls8i5zqihzi66kaw09bbip2spiiizfzkx7amcvpm8zsr7r"; depends=[GGally ggplot2 igraph network scales sna]; }; PAGI = derive2 { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; }; PAGWAS = derive2 { name="PAGWAS"; version="2.0"; sha256="0bz47ivd32kx1amgqllqbxyyvj773q7wasgk924hmibabiixa8nx"; depends=[foreach lars mnormt]; }; - PAMA = derive2 { name="PAMA"; version="0.1.0"; sha256="19mz37h1kcfff7fkshg6qzgwm9vqgbzwjkcs5ydd1v6xq37lzapm"; depends=[mc2d PerMallows]; }; + PAMA = derive2 { name="PAMA"; version="0.1.1"; sha256="0iwfak74422gmfciin940rkqg7m2dkzv0d52jrkk0i6z58rhs426"; depends=[mc2d PerMallows]; }; PANDA = derive2 { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster GO_db]; }; - PANICr = derive2 { name="PANICr"; version="1.0.0"; sha256="167s1p7y8mmhcdnng0s5i09kjfh088jhmxs74rkyda52l9hyx363"; depends=[coda MCMCpack xts]; }; PARSE = derive2 { name="PARSE"; version="0.1.0"; sha256="0y408va1rfn3j8cb1i0k8kypyg9mb6yfj513l54f23z31d3bi45m"; depends=[doParallel foreach gplots mvtnorm]; }; PAS = derive2 { name="PAS"; version="1.2.5"; sha256="175p3bnpnhknfsc29hri0l2ipz1x6qcxs2bq7awns8lccam466r2"; depends=[glmnet]; }; PASWR = derive2 { name="PASWR"; version="1.1"; sha256="1rxymnqvflypc6m62f5vw65l8x1m2yah7r11hhpmzdq2l2sg8fci"; depends=[e1071 lattice MASS]; }; @@ -2939,6 +2947,7 @@ in with self; { PCA4TS = derive2 { name="PCA4TS"; version="0.1"; sha256="1qi9nlaf5181afrdvddh10a9vxyhry102n3dhai86im8yz4if9y6"; depends=[tseries]; }; PCA4you = derive2 { name="PCA4you"; version="1.2.4"; sha256="117wb0h4jqjymm1p90m6vgj713iavrmj035c2gz5nynligvfnm83"; depends=[mixOmics]; }; PCADSC = derive2 { name="PCADSC"; version="0.8.0"; sha256="0pwkmmnsw3c6ch2k5wdc8ig71994pdp79v3a5aa9n9aq55a8c2ir"; depends=[ggplot2 Matrix pander reshape2]; }; + PCAmatchR = derive2 { name="PCAmatchR"; version="0.1.6"; sha256="0q4cs9212k1rmmgqy6lq99r6zb96iryszwh0d1xvg03gy7v1xn61"; depends=[]; }; PCAmixdata = derive2 { name="PCAmixdata"; version="3.1"; sha256="0flrsnbchwk06dmkg3vqykp9n4pqs265szn1r10navp8ki3rrmvh"; depends=[]; }; PCDSpline = derive2 { name="PCDSpline"; version="1.0"; sha256="15kmvcwvwlsr1107n7mfajvf9b1kcslnhsdx0drjjhsvq193qrqa"; depends=[matrixcalc nleqslv]; }; PCDimension = derive2 { name="PCDimension"; version="1.1.11"; sha256="0kpw0rpb9k82psfpd19vvvsakvm0pcz1n3kkkcihagp1kzlv4xkw"; depends=[changepoint ClassDiscovery cpm kernlab oompaBase]; }; @@ -2967,16 +2976,17 @@ in with self; { PGM2 = derive2 { name="PGM2"; version="1.0-1"; sha256="03282pcq7gw47awc2mxjsbz6w3zpqjhqd7fzg8la4p00cd0vvmr4"; depends=[]; }; PGRdup = derive2 { name="PGRdup"; version="0.2.3.5"; sha256="11lq2l0j6l3ixi3fmz2gd0idypl18gkhqfwbgg41gzzwj92lsrq4"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; }; PHENIX = derive2 { name="PHENIX"; version="1.3.1"; sha256="1gd9ycrwawi81al4f5v559km1112giwqnwvvk8ynj4kdb5bqpyq4"; depends=[ppcor SuppDists]; }; - PHEindicatormethods = derive2 { name="PHEindicatormethods"; version="1.3.0"; sha256="1skjmrbqh5jm9h7nsgw91bq1ca8jyp59r97m4pd4aahcslab4zaq"; depends=[broom dplyr purrr rlang tidyr]; }; + PHEindicatormethods = derive2 { name="PHEindicatormethods"; version="1.3.1"; sha256="1q07jah44iajyrxqavxlgm752b46bjy5qcc6a36qjd6nbgx60ajh"; depends=[broom dplyr purrr rlang tibble tidyr]; }; PHInfiniteEstimates = derive2 { name="PHInfiniteEstimates"; version="1.3"; sha256="097a1wqh6c8y0ny6ikpkfqym4fw2vz7rrhqpf6xfb71vf3big90k"; depends=[coxphf lpSolve mlogit Rdpack survival]; }; - PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.10"; sha256="17q760k5519alr2skvpnghz3c9jgw07lh5fpw4xf6hjk3qlqq82c"; depends=[]; }; + PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.11"; sha256="1fq2ny093b4881nwgj6wr8qd5g4dcxb51sdx40ndyxxpq6jj16n9"; depends=[]; }; PHeval = derive2 { name="PHeval"; version="0.5.4"; sha256="06fy5dm4mnp29f01163rw1d1hyl7rlcp4pfw18s87ckpr931qyma"; depends=[survival]; }; PIGShift = derive2 { name="PIGShift"; version="1.0.1"; sha256="115dnsh4b1rxx1d2kc8x3vl5366h5f0i6gg8l1w3v0f8309qigis"; depends=[ape mvtnorm]; }; - PINSPlus = derive2 { name="PINSPlus"; version="2.0.1"; sha256="0fx07nkmh467iql8s4sy9llnnmd2rcl33vjny04r4am28rwkq4k2"; depends=[cluster doParallel entropy FNN foreach matrixStats Rcpp RcppArmadillo RcppParallel]; }; + PINSPlus = derive2 { name="PINSPlus"; version="2.0.2"; sha256="0i7fl5ns8i9vdgdb10nqljxqfl2xsnmshvyibp141ashp78hxwna"; depends=[cluster doParallel entropy FNN foreach irlba matrixStats mclust Rcpp RcppArmadillo RcppParallel]; }; PIPS = derive2 { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; }; PK = derive2 { name="PK"; version="1.3-5"; sha256="1wzz2qv6h6nc2hcsg4098951i608xbbhc9f9ngamfigh5sbmzbh6"; depends=[]; }; - PKI = derive2 { name="PKI"; version="0.1-5.1"; sha256="1xs3jxbczhkxnp7cyw2yh1jcwha92y9pdsbka1ligbla70bnvxyj"; depends=[base64enc]; }; - PKNCA = derive2 { name="PKNCA"; version="0.9.2"; sha256="091gxv2ajrlxh73rwim6miz4pzpix5917f40hh6wz25c7fkdbafs"; depends=[digest dplyr nlme rlang tidyr]; }; + PKI = derive2 { name="PKI"; version="0.1-7"; sha256="1y02s9g883b2i0ma5n4bz2ik06b9y7y75yhcdilmln2f9p9jyrr1"; depends=[base64enc]; }; + PKNCA = derive2 { name="PKNCA"; version="0.9.3"; sha256="0dbhzdbmcxvia21gn7mqmx7rinykyya2605nnrb7vbw1w6r1sjdv"; depends=[digest dplyr nlme rlang tidyr]; }; + PKPDmisc = derive2 { name="PKPDmisc"; version="2.1.2"; sha256="1cw0bfjwd1h1wbnb66271r1q0j205bdgpd4mdhn0nnigdjlxv549"; depends=[BH data_table dplyr ggplot2 lazyeval magrittr purrr Rcpp readr rlang stringr tibble]; }; PKPDmodels = derive2 { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; }; PKconverter = derive2 { name="PKconverter"; version="1.5"; sha256="1zk2sjrjhq7n2k2p29r2qc6qdghr3riyjvvawz0g74lidg7hm1ly"; depends=[shiny shinydashboard shinythemes]; }; PKgraph = derive2 { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 lattice proto rggobi RGtk2]; }; @@ -3011,20 +3021,18 @@ in with self; { PPforest = derive2 { name="PPforest"; version="0.1.1"; sha256="0iplbw5b2vhqbp6gc123ykzmilwa80akljkv3jzfmi90ckm4k08m"; depends=[doParallel dplyr magrittr plyr Rcpp RcppArmadillo tidyr]; }; PPtree = derive2 { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; }; PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.4"; sha256="008hlgi56p9wydpsb2f1dxi4slml7p417c34lw00hivbl53d6x97"; depends=[ggplot2 gridExtra partykit Rcpp RcppArmadillo]; }; - PQLseq = derive2 { name="PQLseq"; version="1.1"; sha256="1h8baf0apxvimarr2qwlh6pdzv88ib1dzw927swsyimjg44wjbfc"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo]; }; PREPShiny = derive2 { name="PREPShiny"; version="0.1.0"; sha256="0zsg07y6nhp2lma3pdz8xd981y3mh8k21il5jv0inma1d1xr4g3f"; depends=[dplyr psycho rmarkdown shiny]; }; PRIMAL = derive2 { name="PRIMAL"; version="1.0.2"; sha256="04fn0c10v9ai7vrrd4qr84rid3x42wq749rn5p1i6nkvmjv3dnhs"; depends=[Matrix Rcpp RcppEigen]; }; PRIMME = derive2 { name="PRIMME"; version="3.0-0"; sha256="1wvwdsaqg5rqx93svvhjvi64x6vxbr0a8za0a7cixy0vdg14vli4"; depends=[Matrix Rcpp]; }; PRIMsrc = derive2 { name="PRIMsrc"; version="0.8.2"; sha256="04g1saf511xs26m1iv9xfsmfs15fdfaxh5qlbay2mcb198270pd8"; depends=[glmnet Hmisc quantreg superpc survival]; }; - PRISM_forecast = derive2 { name="PRISM.forecast"; version="0.1.6"; sha256="0w0fjbaafq90ac35h70z8g95q1i812v0ivkif4lx8l3q7rhjrvb5"; depends=[glmnet xts zoo]; }; + PRISM_forecast = derive2 { name="PRISM.forecast"; version="0.2.0"; sha256="1r2fjnd5wjlb0y5x9pnh80dmkdfdr9yhqckynkc92ngc7dr1f44z"; depends=[glmnet xts zoo]; }; PRISMA = derive2 { name="PRISMA"; version="0.2-7"; sha256="0sk2d07m8rhipa0kdbaf8ngryda6f1ihp5akpnyw2llajf0x8as5"; depends=[ggplot2 gplots Matrix]; }; PRISMAstatement = derive2 { name="PRISMAstatement"; version="1.1.1"; sha256="1vvab8h71g8c910s2h4d12qafqdncfzmsh5f1b4m79plpqi3s49z"; depends=[DiagrammeR]; }; PROBShiny = derive2 { name="PROBShiny"; version="0.1.0"; sha256="17p6pb8nwq36ha697f2lf8nwzj5cylmh8rdzyag49ks5hi9painb"; depends=[epitools LaplacesDemon rmarkdown rpivotTable shiny shinyMatrix]; }; - PROJ = derive2 { name="PROJ"; version="0.1.5"; sha256="0wff6cqyq3ixsglflz5fyfg10akmwhh6np6jc158llxbb3krxjx3"; depends=[]; }; + PROJ = derive2 { name="PROJ"; version="0.1.6"; sha256="0h0iky99wqb4cz7imrwz2p3w71s8n21vfdjwi30w240vim6d3lgg"; depends=[]; }; PROMETHEE = derive2 { name="PROMETHEE"; version="1.1"; sha256="0r53mb9ndwm4yli3h50cfamsjzpq6b67g72mszm7lpbqpj58wqw6"; depends=[lpSolve]; }; PROSPER = derive2 { name="PROSPER"; version="0.3.2"; sha256="1w58sv519fjrmbv5q7pvfd4b3d22v33nlx9m232dkxj6i7qs1dcx"; depends=[data_table]; }; PROTOLIDAR = derive2 { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; }; - PROreg = derive2 { name="PROreg"; version="1.0"; sha256="0c2vgzbdi29rlrnrb971dqrl7rlb9y3rw8nj5rjgwsjqxv607ssj"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; }; PROscorer = derive2 { name="PROscorer"; version="0.0.1"; sha256="0mgj0mi0vzdk0agimsx4k9i4bss0j5lqiayzhldr1hrqrx2a4f3d"; depends=[PROscorerTools]; }; PROscorerTools = derive2 { name="PROscorerTools"; version="0.0.1"; sha256="1vliffkfqdn5l96bncfgayv19i20kmawlxi8q853wamj6npdpv5r"; depends=[]; }; PRROC = derive2 { name="PRROC"; version="1.3.1"; sha256="1m28h8pcd78049lz2qixhkcr9h5b3jik3maqzfbvq9y58z71i4a7"; depends=[]; }; @@ -3073,7 +3081,7 @@ in with self; { Paneldata = derive2 { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; }; ParBayesianOptimization = derive2 { name="ParBayesianOptimization"; version="1.1.0"; sha256="1famkdri08qsamn5ji4knq42pj8z4lkhacbr8mbj439hkmpsfxkv"; depends=[crayon data_table dbscan DiceKriging foreach ggplot2 ggpubr lhs plotly]; }; ParDNAcopy = derive2 { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[DNAcopy]; }; - ParallelLogger = derive2 { name="ParallelLogger"; version="1.1.2"; sha256="1yp0kb0fv0qr8lg2qbssz3gdvlpjmim18dak08ibfznwyivkfrna"; depends=[jsonlite snow XML]; }; + ParallelLogger = derive2 { name="ParallelLogger"; version="1.2.0"; sha256="1xc5lgyly7mmi8hw9kzm4yj09z1ngzqkgki7zjgfcrwvfz1lnknr"; depends=[jsonlite snow XML]; }; ParallelPC = derive2 { name="ParallelPC"; version="1.2"; sha256="07y7xb16865khxkvwsk1yglzyy7ja4aj2wpkipaz48i77c3x8bi2"; depends=[]; }; ParallelTree = derive2 { name="ParallelTree"; version="0.1.3"; sha256="1h53qwhc63fglm452b3by7f3g6f3hyqwkmwmbdqdb9rv3j4gvnvg"; depends=[ggplot2]; }; ParamHelpers = derive2 { name="ParamHelpers"; version="1.14"; sha256="1sx2ddm8hwvvmk0z65wa689w80py3fny82zjd4d29qwxlv854xmi"; depends=[backports BBmisc checkmate fastmatch]; }; @@ -3094,7 +3102,7 @@ in with self; { PearsonDS = derive2 { name="PearsonDS"; version="1.1"; sha256="0rqh9ji0bah3n1c6fcg7krgqs65qla9p3xrnc4jr7va6ph104im9"; depends=[]; }; PearsonICA = derive2 { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf72ffki47wymsdmd50smkdhvpzvanv4y2rmqfhvg"; depends=[]; }; PedCNV = derive2 { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[ggplot2 Rcpp RcppArmadillo]; }; - PeerPerformance = derive2 { name="PeerPerformance"; version="2.2.1"; sha256="1igh8svdbxkcfgi2s70cpwdcy7jb4yhxias80vck203skyiq97vx"; depends=[lmtest sandwich]; }; + PeerPerformance = derive2 { name="PeerPerformance"; version="2.2.2"; sha256="03vkdfwa4smlsycgsd1hmg4qzib5nyknrsz100rqdfdw4g2xn6bn"; depends=[lmtest sandwich]; }; PenCoxFrail = derive2 { name="PenCoxFrail"; version="1.0.1"; sha256="0snjf8jxzyf30xj3wx9p6g073dqw592l1j1c6yxfg8y4kgzhzwq7"; depends=[Matrix Rcpp RcppArmadillo survival]; }; PenIC = derive2 { name="PenIC"; version="1.0.0"; sha256="0vcqawmbm8z6lkcxfq1b2png9viz5q669npbv0s7dn6smwhanlzz"; depends=[MASS Matrix numDeriv]; }; PepSAVIms = derive2 { name="PepSAVIms"; version="0.9.1"; sha256="0m4jrq6wcjy0k80gvrnm9f7kvi1ifx9182xfq0psyaxpj0ggvzij"; depends=[elasticnet]; }; @@ -3142,7 +3150,7 @@ in with self; { PointFore = derive2 { name="PointFore"; version="0.2.0"; sha256="0ml6xcdl4ygr01q0cjwd11ql7wal91jnf3hs1rfhfr4mh8jpgivx"; depends=[boot car ggplot2 gmm lubridate MASS sandwich]; }; PoisBinNonNor = derive2 { name="PoisBinNonNor"; version="1.3.1"; sha256="1pgaf3yamigcw32sczj4f1dpndwyrxirrfl4jv0vp5j1jd2zhb18"; depends=[BB corpcor Matrix mvtnorm]; }; PoisBinOrd = derive2 { name="PoisBinOrd"; version="1.4.1"; sha256="0bzgb88mg95h6liwnmflpssmz9n5xnwmipnqca611l1kp3rld0nk"; depends=[corpcor GenOrd Matrix mvtnorm]; }; - PoisBinOrdNonNor = derive2 { name="PoisBinOrdNonNor"; version="1.5.1"; sha256="07q0zddkb9vgp9iqw8s9w4cz6iwhdsggx8wf9ma9b5iqzigsv07n"; depends=[BB corpcor GenOrd MASS Matrix]; }; + PoisBinOrdNonNor = derive2 { name="PoisBinOrdNonNor"; version="1.5.2"; sha256="0a6ks20f9vnf8w8n0007yrqaa9vpgqq43vxa88dhvdpn6bbw5w0s"; depends=[BB corpcor GenOrd MASS Matrix]; }; PoisBinOrdNor = derive2 { name="PoisBinOrdNor"; version="1.6.1"; sha256="12mchs62xq5jrq7y66l53yvwgm8iisa16120jmja0xdcr9sgcr84"; depends=[corpcor GenOrd Matrix mvtnorm psych]; }; PoisNonNor = derive2 { name="PoisNonNor"; version="1.6.1"; sha256="0pk1hqydpd6f8419kn986kf55gc3hyycfjyj1nvqsml7ic56ic98"; depends=[BB corpcor MASS Matrix]; }; PoisNor = derive2 { name="PoisNor"; version="1.3.1"; sha256="1s1z6bpxaa1ibdgv6bd5phccswd9bh26abwcywlnb55xl5vrgknv"; depends=[corpcor Matrix mvtnorm]; }; @@ -3189,7 +3197,7 @@ in with self; { ProDenICA = derive2 { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; }; ProFit = derive2 { name="ProFit"; version="1.3.3"; sha256="0jrw0v7dg5mf4zxg7pqybh9qzsiqb3nnz8g5qlc4iz73mhr9gm2b"; depends=[celestial checkmate cubature FITSio LaplacesDemon magicaxis RColorBrewer]; }; ProFound = derive2 { name="ProFound"; version="1.3.4"; sha256="1kn9kj0vq18jxiavdzx4l4kgyfwjnflfbyqfdihrdfrkz4xz4w3c"; depends=[celestial data_table doParallel FITSio foreach magicaxis RColorBrewer Rcpp]; }; - ProPublicaR = derive2 { name="ProPublicaR"; version="0.9.2"; sha256="17fghv7w4wm4q9nd6l4pl5ibk5i4zgdhlp5pvbzvymhvby0q06sw"; depends=[config dplyr httr lubridate stringr]; }; + ProPublicaR = derive2 { name="ProPublicaR"; version="1.1.1"; sha256="08bhqm64r79ywj394l1ywwcsjc79wzi85wlbp5xnr49bxzaysfp1"; depends=[config dplyr httr lubridate stringr]; }; ProTrackR = derive2 { name="ProTrackR"; version="0.3.7"; sha256="15m8g9v254avi68qr7v5q4fzhclkv1q849sj69fs0c9qcli1x384"; depends=[audio lattice signal tuneR XML]; }; ProbBayes = derive2 { name="ProbBayes"; version="1.1"; sha256="0bkbqyrmpy9swaxsl91w6iiw81znjf1lk4b0vqgn6wdnrir6gkmn"; depends=[ggplot2 gridExtra LearnBayes shiny]; }; ProbForecastGOP = derive2 { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[fields RandomFields]; }; @@ -3203,7 +3211,7 @@ in with self; { ProfoundData = derive2 { name="ProfoundData"; version="0.2.1"; sha256="1zqg821pv3i5nf76s7yppnmy13y14pj0l7rjhk50wlxrxdb53ibz"; depends=[DBI RNetCDF RSQLite settings sqldf zoo]; }; ProgGUIinR = derive2 { name="ProgGUIinR"; version="0.0-4"; sha256="0srhk42ssx4i096sbs4jacqjsc1ffqjxjgvpplzshlqaby1h3795"; depends=[ggplot2 MASS svMisc]; }; ProjectManagement = derive2 { name="ProjectManagement"; version="1.2.4"; sha256="1lv1yf6xslskjqz7mgi8brvpix9g7k0yy6q03gckz1rmcakzqj5p"; depends=[GameTheory kappalab lpSolveAPI plotly triangle]; }; - ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.9.0"; sha256="07nj339k822xnjqcraivl85wcvnq3cp8gz051kq5zmfx19p1wvdv"; depends=[]; }; + ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.9.1"; sha256="045xyycn2xjxb40vm6nvkp5csxzxasz9pqdnrgapv0ycf02s0c17"; depends=[]; }; ProjectionBasedClustering = derive2 { name="ProjectionBasedClustering"; version="1.1.1"; sha256="17y1yf8cbcl3yha7mbk22lxmk2v5n98mfqsa886a3012ang4m5sp"; depends=[deldir GeneralizedUmatrix geometry ggplot2 plotly Rcpp shiny shinyjs shinythemes vegan]; }; ProliferativeIndex = derive2 { name="ProliferativeIndex"; version="1.0.1"; sha256="03ipsbs8pfwr8wsx7j2y9c67ic4qcady7xpa47l8dr14ff63cfk7"; depends=[]; }; PropCIs = derive2 { name="PropCIs"; version="0.3-0"; sha256="1ywzi88igzaj2wnbrqa08cy7pw886z2m0x3j7rk45rin9mgpfdfd"; depends=[]; }; @@ -3285,6 +3293,7 @@ in with self; { R0 = derive2 { name="R0"; version="1.2-6"; sha256="1yvcgchxlj7hkgqkw6g8pxnracxkld1grgykkcr6wbhminbylqv8"; depends=[MASS]; }; R1magic = derive2 { name="R1magic"; version="0.3.2"; sha256="1xfldr5y7pfdi6qljjvckknsv2wi9rnzwmqxkpgnyc96md2fvwjr"; depends=[]; }; R2019nCoV = derive2 { name="R2019nCoV"; version="0.1.0"; sha256="1959mwacn0zzq0g5ili2v6aqs51rb6qvlsv16xx7qwml8xahf215"; depends=[dplyr ggplot2 jsonlite maps pinyin]; }; + R2Addhaz = derive2 { name="R2Addhaz"; version="0.1.0"; sha256="1xaqbzq2chsgkg1gc163fq8qcgzq9wwn2bm4mwvc31ay0gg4f3xi"; depends=[ahaz caTools pracma Rdpack survival zoo]; }; R2BEAT = derive2 { name="R2BEAT"; version="1.0.1"; sha256="0x0gb3gpvjmwa6f2p0p45m86l9iy7nwmcjhyi68lg694cvd9ny37"; depends=[]; }; R2BayesX = derive2 { name="R2BayesX"; version="1.1-1"; sha256="1ff8cscl839ykp7l34sscc8zqp516mh64igk7dfv9n02l40w8ypf"; depends=[BayesXsrc colorspace mgcv]; }; R2DGC = derive2 { name="R2DGC"; version="1.0.3"; sha256="0f84fmpf3m2s2p6bllvjs8rgnhwjy54adblv02dq8gakwvb4j2aw"; depends=[]; }; @@ -3325,6 +3334,7 @@ in with self; { RAthena = derive2 { name="RAthena"; version="1.8.0"; sha256="0i428qcw3myaiy9zyc2wzwaj2d4sv8lg7w8nqppkb00nslv00il8"; depends=[data_table DBI reticulate]; }; RBF = derive2 { name="RBF"; version="1.0.0"; sha256="0q2k2ar9cd62cykg99r86cflx2nknlg32fhhsjay4xs191fapw8j"; depends=[]; }; RBMRB = derive2 { name="RBMRB"; version="2.1.2"; sha256="1m6n2kfg83mlfy22k75hy5zjf547v0rdwk9w6l04yfyrr6himbr8"; depends=[data_table ggplot2 httr plotly rjson]; }; + RBNZ = derive2 { name="RBNZ"; version="1.0.1"; sha256="1bcjxzysdi1jhf46najppx86b791bxdgdq0xx8pjg57f6cwvws52"; depends=[httr lubridate readxl rvest xml2]; }; RBPcurve = derive2 { name="RBPcurve"; version="1.2"; sha256="0zkfvnhm780vid4qqdrx9mnc6jxxrmrnq47pqvk35rm3m4l96782"; depends=[BBmisc checkmate mlr shape TeachingDemos]; }; RBaseX = derive2 { name="RBaseX"; version="0.2.4"; sha256="0y3mza485jj7aj3x4hnspkkgsg8y3zmgvhd3zb9p01iafa3ck91p"; depends=[dplyr magrittr openssl R6 RCurl stringr tibble]; }; RBesT = derive2 { name="RBesT"; version="1.6-0"; sha256="0wanwx42ayy4likabdjkamzrlwgkwvas1mpcjdrsxirrl7bs38ds"; depends=[assertthat bayesplot BH checkmate dplyr Formula ggplot2 mvtnorm Rcpp RcppEigen rstan StanHeaders]; }; @@ -3349,8 +3359,8 @@ in with self; { RColorBrewer = derive2 { name="RColorBrewer"; version="1.1-2"; sha256="1pfcl8z1pnsssfaaz9dvdckyfnnc6rcq56dhislbf571hhg7isgk"; depends=[]; }; RConics = derive2 { name="RConics"; version="1.0"; sha256="1lwr7hi1102gm8fi9k5ra24s0rjmnkccihhqn3byckqx6y8kq7ds"; depends=[]; }; RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; }; - RCurl = derive2 { name="RCurl"; version="1.98-1.1"; sha256="1zqiawhx5v06vmcg87rmx2qdd9fa4svds3i9a1lphchvprr93jkf"; depends=[bitops]; }; - RCzechia = derive2 { name="RCzechia"; version="1.4.5"; sha256="1ar3vkslwzqmljq01swdqk72i2q4pcr7x58pi79gaxwx2p1h4bsl"; depends=[curl dplyr httr jsonlite lwgeom magrittr rlang sf]; }; + RCurl = derive2 { name="RCurl"; version="1.98-1.2"; sha256="1a57jm41550ah3v7cqdv5gdabhp375qgcndr901lns65qg6s0x2x"; depends=[bitops]; }; + RCzechia = derive2 { name="RCzechia"; version="1.4.6"; sha256="1p2np23pyvx6161ad3kcskjvipx5g3dgr58v0pdj7lh1lqnyqzc9"; depends=[curl dplyr httr jsonlite magrittr rlang sf]; }; RDFTensor = derive2 { name="RDFTensor"; version="1.1"; sha256="1xbar13snwyls6rva91bs0632zplfc2qcqlwf7h07r8798m3234s"; depends=[Matrix pracma]; }; RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; }; RDML = derive2 { name="RDML"; version="1.0"; sha256="13ly1p42njbcygwvkyii8sjqbsywjy5w5g1kd7m8kswi5dsk3qqv"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; }; @@ -3365,7 +3375,7 @@ in with self; { REBayes = derive2 { name="REBayes"; version="2.2"; sha256="1jh5vw9pbcf5gpmx3b5b36fh8rz5y8npx53aai0kxh49kjf8d63c"; depends=[Matrix reliaR]; }; RECA = derive2 { name="RECA"; version="1.7"; sha256="1xikj20flqajpkw4wyynmqd1pafbylzwfrmc8bz9pqgggjjhrqql"; depends=[]; }; REDCapExporter = derive2 { name="REDCapExporter"; version="0.2.0"; sha256="0h9sz5hd5b0paqybid8xjx7lbirlknazx11phylqixmnl9a8qra3"; depends=[data_table keyring lubridate RCurl]; }; - REDCapR = derive2 { name="REDCapR"; version="0.10.2"; sha256="0rdni325k0641yfv4g9l1szg1bl48767n6r1xkh8q3fnvqaqwnrg"; depends=[dplyr httr magrittr readr rlang tibble tidyr]; }; + REDCapR = derive2 { name="REDCapR"; version="0.11.0"; sha256="0frhmnm25w9b84qk7vvvr8wkv1w3dmm0vqxav2cs7jimq38zwcvz"; depends=[checkmate dplyr httr magrittr readr rlang tibble tidyr]; }; REEMtree = derive2 { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; }; REGENT = derive2 { name="REGENT"; version="1.0.6"; sha256="1f2sjqkhw3rbmwbcmx7l7imj696kblisi8y3fz77xygbcbxa6rmq"; depends=[]; }; REPLesentR = derive2 { name="REPLesentR"; version="0.4.1"; sha256="0rwd7hxk12f4f1kpj6sl424yhbxi3h9dz6km5awijazmgv95carz"; depends=[dat knitr modules]; }; @@ -3396,7 +3406,6 @@ in with self; { RGENERATEPREC = derive2 { name="RGENERATEPREC"; version="1.2.5"; sha256="1jqyp91x569la1vc6wl6v7jq6iq1cx2qkds9yiqm85bgzydp4lxw"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; }; RGF = derive2 { name="RGF"; version="1.0.6"; sha256="11pnbiyp39r95c8ajj2jyxz4h1zf6fi8ki78rmn4vp7xm2bl3zff"; depends=[Matrix R6 reticulate]; }; RGIFT = derive2 { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; }; - RGISTools = derive2 { name="RGISTools"; version="1.0.0"; sha256="10ra22xsqz6y4dcc6vbi8fmbd2k84bhf9icys06z02sizzfm8dl7"; depends=[curl fields httr mapview raster Rdpack rjson rvest sf sp tmap urltools XML xml2]; }; RGeckoboard = derive2 { name="RGeckoboard"; version="0.1-5"; sha256="0h7x3kdmlba9siwcnf313ajmz2jsmyhl7pndzs7qaqina3hkl46r"; depends=[httr jsonlite]; }; RGenData = derive2 { name="RGenData"; version="1.0"; sha256="124h2qvp0f6cil7zf4ln3n0jlqcfzdwbihzfaklk2lxxn7gq4mbi"; depends=[]; }; RGenetics = derive2 { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; }; @@ -3458,7 +3467,7 @@ in with self; { RMTL = derive2 { name="RMTL"; version="0.9"; sha256="08da67wvzmibziqhnlzh43sydaihk4rsq2k5hs6ih3jkkidrhlgv"; depends=[corpcor doParallel foreach MASS psych]; }; RMThreshold = derive2 { name="RMThreshold"; version="1.1"; sha256="0wkc42vcggib002ad6ch43h6avpdgl12szrrrfd2p0wl72cwn5n1"; depends=[Matrix png]; }; RMTstat = derive2 { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; }; - RMaCzek = derive2 { name="RMaCzek"; version="1.3.2"; sha256="17w3ay8x8laqqfzzl34b7fsyk029rxss20bafh14yksw2qkvi8qy"; depends=[GA seriation]; }; + RMaCzek = derive2 { name="RMaCzek"; version="1.3.3"; sha256="1kn3h2gp08i8vq8304853bg5yydkdz7xlhqh2djn9r1iy69hhwg4"; depends=[GA seriation]; }; RMallow = derive2 { name="RMallow"; version="1.1"; sha256="1s6a3347739rfc8rrh2773b278gcbp8hf5j5psm61fz7bavy9gcj"; depends=[combinat]; }; RMariaDB = derive2 { name="RMariaDB"; version="1.0.8"; sha256="1xcr5lg9da4a49dcqy3hhrpz5jn51dqa6dc50vmkq1nw372yv2iw"; depends=[BH bit64 DBI hms plogr Rcpp]; }; RMark = derive2 { name="RMark"; version="2.2.7"; sha256="0qxa383cagzqrnfc3izybb4lrg8z1r3nw1j5b7h4wkjwy0k3kczb"; depends=[coda matrixcalc msm]; }; @@ -3487,12 +3496,10 @@ in with self; { RNifti = derive2 { name="RNifti"; version="1.1.0"; sha256="1z8ninp3aq18w0slcfn8r2fp48cdz8l0k0namsrnvgyp8lzcpqpn"; depends=[Rcpp]; }; RNiftyReg = derive2 { name="RNiftyReg"; version="2.6.8"; sha256="19lij5zplw7jw65ykkjl85iqpfq3i6sia4wnq7fmkv1xlzwda2f4"; depends=[ore Rcpp RcppEigen RNifti]; }; ROAuth = derive2 { name="ROAuth"; version="0.9.6"; sha256="0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m"; depends=[digest RCurl]; }; - ROC632 = derive2 { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxhwchpc5rj43hvsj6bp7wv8cahfg5g"; depends=[penalized survival survivalROC]; }; ROCR = derive2 { name="ROCR"; version="1.0-7"; sha256="1jay8cm7lgq56i967vm5c2hgaxqkphfpip0gn941li3yhh7p3vz7"; depends=[gplots]; }; ROCS = derive2 { name="ROCS"; version="1.3"; sha256="11vdf8701ap6ya7c7kx9jhvg7qfc6vkij3jridna6f4xj384grki"; depends=[poibin rgl]; }; ROCit = derive2 { name="ROCit"; version="1.1.1"; sha256="1bip1zz5chm06pfikkscahph2clsaf9rhhpsla6vmvpfy0d8p070"; depends=[]; }; - ROCnReg = derive2 { name="ROCnReg"; version="1.0"; sha256="0fz1s2a71bb1l60mqvrzmac5wiaa43h4s9xbpaw90y5w2kdpz1ji"; depends=[lattice MASS Matrix moments nor1mix np pbivnorm spatstat]; }; - ROCt = derive2 { name="ROCt"; version="0.9.5"; sha256="0f7day0rv62ggm1nc7qkh45r6svr84mdk7xxpdf09pi4lbdx0rm6"; depends=[date relsurv survival timereg]; }; + ROCnReg = derive2 { name="ROCnReg"; version="1.0-1"; sha256="05rxb0hqk6w8xz8s52j0skc8p2b4fv8wdvvj8r77yimph1dlc13x"; depends=[lattice MASS Matrix moments nor1mix np pbivnorm spatstat]; }; ROCwoGS = derive2 { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; }; RODBC = derive2 { name="RODBC"; version="1.3-16"; sha256="0fcnszrkk7llz26wccs97glddw793i0f9bd7rwxrld24vn1lng92"; depends=[]; }; RODBCDBI = derive2 { name="RODBCDBI"; version="0.1.1"; sha256="0jkcc1lm8drsx1pkfj5h6rlbr98cgpvbf9ndzdwr048f3s8gd26i"; depends=[DBI RODBC]; }; @@ -3535,7 +3542,7 @@ in with self; { RPCLR = derive2 { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; }; RPEClust = derive2 { name="RPEClust"; version="0.1.0"; sha256="1ysw45335lrxmj3j17xyvgz76p00v80f2m7wxfndh91wklqxzm8r"; depends=[clue clusteval mclust]; }; RPEGLMEN = derive2 { name="RPEGLMEN"; version="1.0.1"; sha256="1bcci0ih71bxdrwdz336c5wx47d094nczazy8mv3v41vivrk4jkh"; depends=[PerformanceAnalytics Rcpp RcppEigen RPEIF]; }; - RPEIF = derive2 { name="RPEIF"; version="1.0.7"; sha256="1n0b3fdl88wlncfm0k9cy7nj9mgkv3dv724ld2haypmmnbhkhr4j"; depends=[PerformanceAnalytics xts zoo]; }; + RPEIF = derive2 { name="RPEIF"; version="1.0.8"; sha256="0v8kgwzgn1sqs0rgb0mrvzxy1wnk07bm7s4nyz60xcamsj33laj0"; depends=[PerformanceAnalytics xts zoo]; }; RPESE = derive2 { name="RPESE"; version="1.0.3"; sha256="0a9nq60jg2bhj5cbbgkpz0zisqwrv7cgifbiampx2y6sfrkmhbjg"; depends=[boot PerformanceAnalytics RPEGLMEN RPEIF sandwich xts zoo]; }; RPEXE_RPEXT = derive2 { name="RPEXE.RPEXT"; version="0.0.1"; sha256="0m5ml8ywxrf66mjz6m3xp1lajd7wdq9g7xsaln8n7ykq7h5615fc"; depends=[]; }; RPEnsemble = derive2 { name="RPEnsemble"; version="0.4"; sha256="0y9g22swcz0m5jbzi87ahxw27fb3jlf3iwvxb73kkzixqlvksw9y"; depends=[class MASS]; }; @@ -3555,7 +3562,6 @@ in with self; { RPyGeo = derive2 { name="RPyGeo"; version="1.0.0"; sha256="1alqgx6blqqwxm76w05g82kc2icx8nvjw7qkdz73gf9ckgza5bb3"; depends=[magrittr purrr raster reticulate rmarkdown sf stringr]; }; RQDA = derive2 { name="RQDA"; version="0.3-1"; sha256="1kqax4m4n5h52gi0jaq5cvdh1dgl0bvn420dbws9h5vrabbw1c1w"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; }; RQEntangle = derive2 { name="RQEntangle"; version="0.1.3"; sha256="178haddk8nnscy2vym3k2a3ca9lf6nl7rpjja8lxqdjninvhvwb2"; depends=[iterators itertools]; }; - RQGIS = derive2 { name="RQGIS"; version="1.0.4"; sha256="0x4jilj5nbikgkcg09913v3dgnfw0aqwwx66xajsfk5lqi6w5vjz"; depends=[raster RCurl readr reticulate rgdal sf sp stringr XML]; }; RQuantLib = derive2 { name="RQuantLib"; version="0.4.12"; sha256="1bmjgsdwivrvdysba4hq60xpp7xg1c0p1p05mdm0338zvzix5kb8"; depends=[Rcpp zoo]; }; RRF = derive2 { name="RRF"; version="1.9.1"; sha256="135adnf7cfs8gddmmmgmzarjzg0qfrd7l67367yhy2b1k0s5ng1w"; depends=[]; }; RRI = derive2 { name="RRI"; version="1.1"; sha256="0msdc5j5vx4snl8r3q5nn0mw2i80jds5pjykhmigcrx6jzg6h6i7"; depends=[Rcpp RcppArmadillo]; }; @@ -3573,7 +3579,7 @@ in with self; { RSAlgaeR = derive2 { name="RSAlgaeR"; version="1.0.0"; sha256="1hp0v2vkj9ixiv541d53kyl0ph3jsdc5w98r81gv5ck5ixrp6bxp"; depends=[cvTools ggplot2 hydroGOF lubridate mblm plyr]; }; RSCABS = derive2 { name="RSCABS"; version="0.9.4"; sha256="0zknwd07z933c405n14l7mwl4l697g5sfvw19244yv4fs7f6k5cg"; depends=[gWidgets gWidgetsRGtk2 R2HTML RGtk2]; }; RSCAT = derive2 { name="RSCAT"; version="1.1.0"; sha256="1sh80zlkwma88kssrlwvb6kpqs2dmhfzkck59fgp0xxgxa3vpram"; depends=[ggplot2 gridExtra Metrics rJava shiny shinycssloaders shinyjs]; }; - RSDA = derive2 { name="RSDA"; version="3.0.1"; sha256="1hxzccwjmbj5qnv2z96s9nj8r3fhbixycf4zfkaa5y1dacxz9mk4"; depends=[dplyr FactoMineR forcats ggplot2 ggpolypath glmnet magrittr nloptr princurve purrr randomcoloR reshape RJSONIO rlang scales sqldf stringr tibble tidyselect vctrs XML]; }; + RSDA = derive2 { name="RSDA"; version="3.0.3"; sha256="0335g7m97wx4c8aam19z5qn9s9kgjy67s0wdgcjfjm440pxk2l3r"; depends=[dplyr FactoMineR forcats ggplot2 ggpolypath glmnet labelled magrittr nloptr princurve purrr randomcoloR reshape RJSONIO rlang scales sqldf stringr tibble tidyselect vctrs XML]; }; RSE = derive2 { name="RSE"; version="1.3"; sha256="1dvmj1zwkbp1dj9r8kcvbd8rpknfwfdqaqc5gfl82bh823w72099"; depends=[]; }; RSEIS = derive2 { name="RSEIS"; version="3.9-0"; sha256="16jmakdq6rkyw3cm1ilnaw3ycsg12544ml9gla7y8mgpbglxsn6i"; depends=[RPMG Rwave]; }; RSGHB = derive2 { name="RSGHB"; version="1.2.2"; sha256="16s9iahbcdqykavm5cq8n76hlpfqlljl17xwh0vrz5ac7z4z3rdz"; depends=[MCMCpack]; }; @@ -3616,7 +3622,6 @@ in with self; { RTL = derive2 { name="RTL"; version="0.1.1"; sha256="1p5i9khwa470hc9bhxlxqh8w5vp73jcsr45mrhwpcyz3i2dlzdzr"; depends=[dplyr EIAdata fabletools feasts fGarch fitdistrplus forecast ggplot2 httr lubridate magrittr PerformanceAnalytics plotly purrr Quandl quantmod readr stringr tibble tibbletime tidyquant tidyr timetk tsibble xts zoo]; }; RTOMO = derive2 { name="RTOMO"; version="1.1-6"; sha256="03jb96ahzgp662vj2v65giv8ss61vad5w26kvq8hg9q06z879jza"; depends=[GEOmap RPMG RSEIS splancs]; }; RTaxometrics = derive2 { name="RTaxometrics"; version="2.3"; sha256="02446y86g21i37ycavg0xc1ggxk0k93d38n71fis9fav06lywxx3"; depends=[]; }; - RTest = derive2 { name="RTest"; version="1.2.6"; sha256="0f7wxscswkg2r6isp0vjfs44dbgqijmh97p053w2mcqi6z1s5cip"; depends=[base64 glue jsonlite magick magrittr rlang stringr testthat XML]; }; RTextureMetrics = derive2 { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; }; RTransProb = derive2 { name="RTransProb"; version="0.3.3"; sha256="1fl8ag7aizj7k7j5ypx632qa98jp3wp8z3mp5z490n1277ajzrkb"; depends=[caret chron e1071 expm MASS Matrix matrixStats neuralnet nnet pracma Rcpp RcppArmadillo zoo]; }; RTransferEntropy = derive2 { name="RTransferEntropy"; version="0.2.12"; sha256="066wyama0gk81l6kc0n31cmf007i1975i7hzvf46qbldvhsc52mc"; depends=[future future_apply Rcpp]; }; @@ -3631,13 +3636,13 @@ in with self; { RVowpalWabbit = derive2 { name="RVowpalWabbit"; version="0.0.13"; sha256="106lr6iz28gscczs18759zaki7dnxy1873swiakimfqmwpw9dp9n"; depends=[Rcpp]; }; RVtests = derive2 { name="RVtests"; version="1.2"; sha256="0k7w6ml981zvr5bix197qw4kaf7rz5jqnwqlxf7aryxbm39gk16c"; depends=[glmnet pls spls]; }; RWBP = derive2 { name="RWBP"; version="1.0"; sha256="104vr2cdk185hh4zn3vmqvb14p1q8ifk11wdgvk7fli1m1zxxwdd"; depends=[igraph lsa RANN SnowballC]; }; - RWDataPlyr = derive2 { name="RWDataPlyr"; version="0.6.3"; sha256="14p347v8vgbw471j3nxxn69cxpljriy9hp9haq6gnhx6d0739rcd"; depends=[data_table dplyr feather Rcpp tibble tidyr xts zoo]; }; + RWDataPlyr = derive2 { name="RWDataPlyr"; version="0.6.4"; sha256="1jjra885339n6kpqz28rn9byy4md4s0k47m6ll4a6srd4hsf3ni3"; depends=[data_table dplyr feather Rcpp tibble tidyr xts zoo]; }; RWebLogo = derive2 { name="RWebLogo"; version="1.0.3"; sha256="1n65mlnr163ywjnyyngnigbj0wpgkr38c3nx8hw5r8mwjnf3d617"; depends=[findpython]; }; RWeka = derive2 { name="RWeka"; version="0.4-42"; sha256="0111n0hr3a2gjd2pv5vlh8mian6k86cp0xrw0yyh6ijxhwl31rc4"; depends=[rJava RWekajars]; }; RWekajars = derive2 { name="RWekajars"; version="3.9.3-2"; sha256="06nsylv65z9hxym1b6qnwllh306bq5phsgr0qn4nyr5im8cv1rhn"; depends=[rJava]; }; RWiener = derive2 { name="RWiener"; version="1.3-2"; sha256="1sk4racp77jbhjaqkghalg139aznchyn1yknyrv975ck040zs8cw"; depends=[]; }; RWildbook = derive2 { name="RWildbook"; version="0.9.3"; sha256="1pznzmv8n33hhj61h07fha1gzafcx705n8323cnz3mx6ziijfh28"; depends=[data_table jsonlite marked]; }; - RWsearch = derive2 { name="RWsearch"; version="4.7.0"; sha256="1h6m5h9kbb3sl49ppaazac4y0nz57xw87sh9f4m50immg33il16z"; depends=[brew latexpdf networkD3 sig sos XML]; }; + RWsearch = derive2 { name="RWsearch"; version="4.8.0"; sha256="0zbf03dhcmbyrs2yhl3phk65471qnd7iszvk9rn81fqhd522vq66"; depends=[brew latexpdf networkD3 sig sos XML]; }; RXKCD = derive2 { name="RXKCD"; version="1.9.2"; sha256="1yk12ic6kdbwc44ppag2yfnga7xjmifkglhvcw93vc3qg469mm15"; depends=[jpeg plyr png RJSONIO]; }; RXMCDA = derive2 { name="RXMCDA"; version="1.5.5"; sha256="1ci73q8xf3xxqw8b7sk83v5vz2cqgcb4lkx7qi3hd1ff4xkz1fpa"; depends=[kappalab XML]; }; RXshrink = derive2 { name="RXshrink"; version="1.3.2"; sha256="00igwc4v2dc9328akrqswac7f4hn4ij03x9ck932xd0l67zfp8ah"; depends=[lars]; }; @@ -3648,7 +3653,7 @@ in with self; { RZooRoH = derive2 { name="RZooRoH"; version="0.2.3"; sha256="0ihfc8hxqmlkx1xhkz3psw8szwjp01imasvynxbzrjmjf4q6amvq"; depends=[data_table doParallel foreach iterators RColorBrewer]; }; RaPKod = derive2 { name="RaPKod"; version="0.9"; sha256="1qxzi2lf431zd44bcd98ybhzydy1cz12g864l6r668jk91aqy1qg"; depends=[kernlab MASS proxy Rcpp RcppArmadillo]; }; RaProR = derive2 { name="RaProR"; version="1.1-5"; sha256="11hwg609pjcd13qnbchbs86c3q8f4nmh1xfxg3dsiijljl6lzx3n"; depends=[]; }; - RaceID = derive2 { name="RaceID"; version="0.1.8"; sha256="0pkn9fdf0xi55nrylmqris9by1ywy3mcxkj0bcf4gp6knyqz6wz0"; depends=[cluster coop FateID FNN fpc ggplot2 ica igraph irlba locfit MASS Matrix pheatmap propr quadprog randomForest RColorBrewer Rcpp Rtsne umap vegan]; }; + RaceID = derive2 { name="RaceID"; version="0.1.9"; sha256="0jy0bavlzq522zp5jf4s1dkm2yi40kjwx9cks7lylqcr9sml6xj8"; depends=[cluster coop FateID FNN fpc ggplot2 ica igraph irlba locfit MASS Matrix NlcOptim pheatmap propr quadprog randomForest RColorBrewer Rcpp Rtsne umap vegan]; }; RadData = derive2 { name="RadData"; version="1.0.0"; sha256="14npn5vjcpvymdjkby83msjr3f1gsmzh0083gz6cgrp270fglkaw"; depends=[]; }; RadOnc = derive2 { name="RadOnc"; version="1.1.5"; sha256="0yz2pzcpz32xs04xfs90i714nn28cky7701w1h99cqsxsp892jkq"; depends=[geometry oro_dicom ptinpoly rgl]; }; RadTran = derive2 { name="RadTran"; version="1.0"; sha256="1sb8d4y3b37akbxhdavxrkp34zn3ip061b7gzy0ga57pyn76cvpn"; depends=[ReacTran rootSolve]; }; @@ -3734,13 +3739,14 @@ in with self; { RcmdrPlugin_temis = derive2 { name="RcmdrPlugin.temis"; version="0.7.10"; sha256="02rs5xdj6g57frndc87fly0ans16584j4d0rfpy1h72655cz66ab"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; }; Rcolombos = derive2 { name="Rcolombos"; version="2.0.2"; sha256="0l92icjqqm5fxafqwd09lnmv5x6kvjdg8cphlm37q86nslwr5rkk"; depends=[httr]; }; Rcplex = derive2 { name="Rcplex"; version="0.3-3"; sha256="0abmrqphrpdlc831hwbwx15z4vdgn385kxhnqlbb9v0sjmfyszsl"; depends=[slam]; }; - Rcpp = derive2 { name="Rcpp"; version="1.0.4"; sha256="1m80pdhzi2p82db5xkbwc2m3fzv6df59955yj03nlq40fj7zx4nr"; depends=[]; }; + Rcpp = derive2 { name="Rcpp"; version="1.0.4.6"; sha256="00mk23zmrqn1c4mk9d6csjcbnl12wd7yicjk2ikmw5dyvdfngbs5"; depends=[]; }; Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; }; RcppAPT = derive2 { name="RcppAPT"; version="0.0.6"; sha256="0gkvs276hwa4yzd1bwf12p83cq2i1k021nq4y6ll1gcrj41mkdns"; depends=[Rcpp]; }; RcppAlgos = derive2 { name="RcppAlgos"; version="2.4.1"; sha256="0s97v2agy8pzaqfjm7cabpfxpkidxl1zwi4vkjdhsfzxjp5xwwms"; depends=[gmp Rcpp RcppThread]; }; RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.16"; sha256="0bfa35lp6vc4b0h3ymvdx50br233q8vvyjml34ngi81rj0imz3fr"; depends=[Rcpp]; }; - RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.850.1.0"; sha256="0q9clhmbwwph47hrhx5827m7njrcl2klihyqbkf0ihwlbqrjijwz"; depends=[Rcpp]; }; + RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.860.2.0"; sha256="1rg9ak0zbv8d9cyj10jq52nrcbk1pvfz28kbkhpx79mpjhrl7pb5"; depends=[Rcpp]; }; RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; }; + RcppBigIntAlgos = derive2 { name="RcppBigIntAlgos"; version="0.2.2"; sha256="1sby2bpp5w7mac4mm9grwyfvd54s0nida3grbs471prkba3h50zv"; depends=[gmp Rcpp RcppThread]; }; RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.7"; sha256="0q4vj0dh04m2v2p8x0wd78hbfxzj4zi1nmp52ndwnirhs6zfny4l"; depends=[Rcpp]; }; RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.10"; sha256="175bn75akwgz3vcp0n59kiqqz7q9cwkvih241nj8v810cp4gpmkp"; depends=[Rcpp]; }; RcppCWB = derive2 { name="RcppCWB"; version="0.2.8"; sha256="15iiv5kwh7c3pprpyyvjnbj80x9245f3zmfiy41w661n3cnka68p"; depends=[Rcpp]; }; @@ -3753,7 +3759,7 @@ in with self; { RcppDynProg = derive2 { name="RcppDynProg"; version="0.1.3"; sha256="099hbm355d30rwxqjd7j4dfw678551dc5v4y7yy6q4xxyf527lbs"; depends=[Rcpp RcppArmadillo wrapr]; }; RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.7.0"; sha256="1b78qcjim0n9klgkr82n794d6bj9r9f33g0kcsszsns2hir65sk2"; depends=[Matrix Rcpp]; }; RcppEigenAD = derive2 { name="RcppEigenAD"; version="1.0.0"; sha256="18zm9hsfqwiicxsdm87ix3qc261ljxxn2s736p6aayx82b6vwkz6"; depends=[BH functional memoise Rcpp RcppEigen Rdpack readr]; }; - RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.2.11.3.1"; sha256="03868qkz8miayjbgwlccrwqiy4yv7f3gmp89i4c96xs7q3ijwynn"; depends=[Rcpp RcppArmadillo]; }; + RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.2.12.1.1"; sha256="1nrfkvmz7p6sv1chis205ac13grqzrr950bh5fv1hl5qhyjj2iyk"; depends=[Rcpp RcppArmadillo]; }; RcppExamples = derive2 { name="RcppExamples"; version="0.1.9"; sha256="0568zipgjxgmx086mlfpp5n7v8kf50gwrylvhl1bgvzb2vvr9dhj"; depends=[Rcpp]; }; RcppFaddeeva = derive2 { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[knitr Rcpp]; }; RcppGSL = derive2 { name="RcppGSL"; version="0.3.7"; sha256="0cnw2k7cfqrm79r6j283aybflxig80x4n4rjkfp2317wf10mrsa5"; depends=[Rcpp]; }; @@ -3762,7 +3768,7 @@ in with self; { RcppHMM = derive2 { name="RcppHMM"; version="1.2.2"; sha256="0scdzmns1yw2gbarblzd6cbvndlysz54ff17qijiz17ql5cyzly6"; depends=[Rcpp RcppArmadillo]; }; RcppHNSW = derive2 { name="RcppHNSW"; version="0.2.0"; sha256="0gqdkw7vkcm544rz45g0hplg836ygzbfwk9gh9wr0817icvdb3qv"; depends=[Rcpp]; }; RcppHungarian = derive2 { name="RcppHungarian"; version="0.1"; sha256="1yx7kjjampjk47l8cqpv727g0nv23dnld9n8iwf7h1myfrl3yb6h"; depends=[Rcpp]; }; - RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-6"; sha256="0vjx6azp3sny6nv5k1cs6vk61hmbllqw8mgvi7zn15p7ilmhsyyi"; depends=[BH Rcpp RcppArmadillo]; }; + RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-7"; sha256="07vh1wyp2rxhfrb4vi5njchrby99bynd88na8qjxcnbypkgsrhbl"; depends=[BH Rcpp RcppArmadillo]; }; RcppMeCab = derive2 { name="RcppMeCab"; version="0.0.1.2"; sha256="0varavfbrqzma176rw0dr9v5chh7pxh5y9g0rs3v7hqnlghp22y2"; depends=[BH Rcpp RcppParallel]; }; RcppMsgPack = derive2 { name="RcppMsgPack"; version="0.2.3"; sha256="0ffdw5ckkax8j87q0ykjhyp45l7gvxjppdi73kc4r5qxvijll2g3"; depends=[BH Rcpp]; }; RcppNLoptExample = derive2 { name="RcppNLoptExample"; version="0.0.1"; sha256="1fml6hpa12q0lgg5fg6fi9lz6mckwh345pbh95mld2qagzvmg01n"; depends=[nloptr Rcpp]; }; @@ -3787,9 +3793,9 @@ in with self; { Rcsdp = derive2 { name="Rcsdp"; version="0.1.57.1"; sha256="1dya0c0fcwr6ydcamz8m06nnq0b80vg7b22dg5jv3qi1n1fgp4lv"; depends=[]; }; Rcssplot = derive2 { name="Rcssplot"; version="1.0.0"; sha256="0hnzwjwk9zh4zbzy8sa0z6amikvpd9k1p1abd38khr8q8k1k8jiv"; depends=[]; }; Rd2md = derive2 { name="Rd2md"; version="0.0.2"; sha256="07j1nnsk5nyl8kvgvh9f684g6bhc01jiq1fcmq2pnpx57jdzfbpi"; depends=[knitr]; }; - Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.9"; sha256="029f85visar52002hdpfw5r2zq37kzbr8rgji76nnqi08jk0if4n"; depends=[formatR roxygen2]; }; + Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.10"; sha256="1bd5n7gdnpwncyxa4csh6ky60yb2i1bn5scsmbaba58b56crgyb5"; depends=[formatR roxygen2 xfun]; }; Rdice = derive2 { name="Rdice"; version="1.0.0"; sha256="1xibvm690808p2g3jch7rh1825yrpgln2hjfclgxjwn822qvs4xr"; depends=[data_table]; }; - Rdimtools = derive2 { name="Rdimtools"; version="0.4.2"; sha256="1pklnvg3qrlhskhk2vra38nnqcfdi3fncddm39w9mpxzbzmb62k7"; depends=[ADMM CVXR Matrix Rcpp RcppArmadillo RcppDE Rcsdp Rdpack RSpectra Rtsne]; }; + Rdimtools = derive2 { name="Rdimtools"; version="1.0.1"; sha256="1r6pqnm0j21dp8mqbamqdnwabljw331gh8v68jayx67bn25ap3w9"; depends=[CVXR maotai Rcpp RcppArmadillo RcppDE RcppDist Rcsdp Rdpack RSpectra]; }; Rdistance = derive2 { name="Rdistance"; version="2.1.3"; sha256="03wh6y9h5jgfc6xdncpgyz0v7lqavikp3pf5wwfmm2rqfj7yjr8c"; depends=[]; }; Rdpack = derive2 { name="Rdpack"; version="0.11-1"; sha256="080y15p2hl4jsq91ak2f1y2kx1iqq5c5wzyx3zyhjwp01cahy0jq"; depends=[bibtex gbRd]; }; Rdrools = derive2 { name="Rdrools"; version="1.1.1"; sha256="0awdj1q9ysrhwli16izi0lb6pppqxs1lb6wlv40111q483p41fj7"; depends=[dplyr magrittr purrr Rdroolsjars rJava rlang tibble]; }; @@ -3806,6 +3812,7 @@ in with self; { RealVAMS = derive2 { name="RealVAMS"; version="0.4-3"; sha256="14jqrqza7bs11y1004wzi3bxkvkdfn43d82l0cyh6py8p37rfz28"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; Rearrangement = derive2 { name="Rearrangement"; version="2.1"; sha256="0q253nj62rl65vjsq6503r80qa2j35wac8lv7ydp9w260p28z923"; depends=[quantreg]; }; Recon = derive2 { name="Recon"; version="0.3.0.0"; sha256="11gag2bl00pcy7ysfycaa58qarh6aigznldkc4kkn2178bl4ii62"; depends=[rootSolve]; }; + RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-12"; sha256="0ycx2y8dbcslsvyvr2spnr5jy8m5la11ji0scdlqjymaamij8f3h"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; }; RecordTest = derive2 { name="RecordTest"; version="0.1.2"; sha256="19gxghp8b56gbyv2crjq2bzgaw5m3agd467ihbwkkjqli8cisgip"; depends=[ggplot2]; }; Records = derive2 { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; }; RedditExtractoR = derive2 { name="RedditExtractoR"; version="2.1.5"; sha256="1b6pp1vdn7jnyl8k828dgkxrx8sy2wyhkrn4rnfavqw4qvhm0mhm"; depends=[dplyr igraph magrittr RJSONIO rlang visNetwork]; }; @@ -3829,11 +3836,12 @@ in with self; { RepaymentPlan = derive2 { name="RepaymentPlan"; version="0.1.0"; sha256="1fd4n24bd5s2kqmls7mmsidblaf8nzm97kz52mfsb6i6fci0pgah"; depends=[]; }; RepeatedHighDim = derive2 { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; }; Replicate = derive2 { name="Replicate"; version="1.2.0"; sha256="0kqy248c8n7qr5hwzvqm7flnjlwd60c577r1d4vzgfxn7azd5v3v"; depends=[ggplot2 metafor]; }; + Replication = derive2 { name="Replication"; version="0.1.2"; sha256="1za7zcdaf839xf8hxy4rcrr1p80n6a3ywb2bsl3wikwa0pxdvvbh"; depends=[blavaan lavaan MASS mice quadprog rjags runjags]; }; Repliscope = derive2 { name="Repliscope"; version="1.1.0"; sha256="0hij4ng77bkd979ndbhx1nqq2rfb69q23ghyd7illgvgrc79y9mr"; depends=[colourpicker ggplot2 shiny]; }; RepoGenerator = derive2 { name="RepoGenerator"; version="0.0.1"; sha256="0d6s2sqyycaqrg32xdkp3pr5i7qmvwrfrjcd7f94a9y3lz4bz5b5"; depends=[git2r httr rmarkdown rstudioapi]; }; ResistorArray = derive2 { name="ResistorArray"; version="1.0-32"; sha256="0zqnl0bbqrj5hn5ywhlqyrlz5ryql88qahlgs9989v4rljcxxlam"; depends=[]; }; ResourceSelection = derive2 { name="ResourceSelection"; version="0.3-5"; sha256="1vg5fkjfwkganxf0ji70pkp071841hjgr5sjxlaky8mx7n0cy80x"; depends=[MASS Matrix pbapply]; }; - RestRserve = derive2 { name="RestRserve"; version="0.2.1"; sha256="10g3gk8nsw5a4yly89mvm453y65rk0vjqsa0fcm69wdjhri91n1h"; depends=[checkmate jsonlite mime R6 Rcpp Rserve uuid]; }; + RestRserve = derive2 { name="RestRserve"; version="0.2.2"; sha256="1b8wbar98qhhl46s4i7qks5nm2wy5bvfi9029gpd4gmqsq4bmbm7"; depends=[checkmate jsonlite mime R6 Rcpp Rserve uuid]; }; RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; }; Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; }; Rfacebook = derive2 { name="Rfacebook"; version="0.6.15"; sha256="0hp2mbm0hnyasizszvh5x9hv7z2q633zck1a1gvk36nbxb1shx7c"; depends=[httpuv httr rjson]; }; @@ -3863,7 +3871,7 @@ in with self; { Rip46 = derive2 { name="Rip46"; version="1.0.2"; sha256="0wfp6fm5mgmjqjkn0c5hvjd95yn4zcv0s8xc5294qf5jqxp8b1w7"; depends=[Rcpp]; }; Rirt = derive2 { name="Rirt"; version="0.0.2"; sha256="0npd2g3a4dh5hlj6l06k1pf0j4731ybqqd4mpi4id16nf81cg104"; depends=[ggplot2 Rcpp reshape2]; }; Risk = derive2 { name="Risk"; version="1.0"; sha256="1i42xcc699syj108mvgklwb30wkf9c9jrg5rmd2ypnqk9mnyg2fg"; depends=[]; }; - RiskPortfolios = derive2 { name="RiskPortfolios"; version="2.1.2"; sha256="10kgr05npq9gyhglvpzk49hsr44rgscnygkv3b0gz7f6jxqkfj9z"; depends=[MASS nloptr quadprog]; }; + RiskPortfolios = derive2 { name="RiskPortfolios"; version="2.1.4"; sha256="1f5789sa2qjjsfsjxi1cidmpdla010zwvwspl46vzr97196hhig7"; depends=[MASS nloptr quadprog]; }; Ritc = derive2 { name="Ritc"; version="1.0.2"; sha256="03smhxjhjfkc9pxhlgg54b6v2jznpmnws8373qpvn9a9ky5bcq2l"; depends=[minpack_lm]; }; RiverBuilder = derive2 { name="RiverBuilder"; version="0.1.1"; sha256="06cd1m4liv2bsh2sxplq2zl45g9zq8gsgvh14d0zr0pqm8z4dsyw"; depends=[]; }; RiverLoad = derive2 { name="RiverLoad"; version="1.0.2"; sha256="0v689r9k52x8d4pvk6jlsgr6lp22fn3kn7s69hryyy3pmfmlbrh9"; depends=[imputeTS]; }; @@ -3871,7 +3879,7 @@ in with self; { RkMetrics = derive2 { name="RkMetrics"; version="1.3"; sha256="1k6vnr1r4h69iznib638z45gd0f8wc4g4h0ji9f0017883g77li1"; depends=[]; }; Rknots = derive2 { name="Rknots"; version="1.3.2"; sha256="1krhma8hy3l5lbm6d8rxjlj9jw1zrd16h4wy4p1clfa5vlhh3bwi"; depends=[bio3d rgl rSymPy]; }; Rlab = derive2 { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; }; - Rlabkey = derive2 { name="Rlabkey"; version="2.3.4"; sha256="08f220a0blfvzn5qzvsydxdgbx44jlch5avaavlqixzizzwfrfhs"; depends=[httr jsonlite Rcpp]; }; + Rlabkey = derive2 { name="Rlabkey"; version="2.4.0"; sha256="0iah1b4f4gkyik30v0wrydnqx5g03l1jmkifyyfp03sg5cfvgzfv"; depends=[httr jsonlite Rcpp]; }; Rlda = derive2 { name="Rlda"; version="0.2.6"; sha256="0i8n01h9072q339p1kiqhcpwphw0d2x6bsszbhgfqc2b160dk2bl"; depends=[coda doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; }; Rlgt = derive2 { name="Rlgt"; version="0.1-3"; sha256="0g610v5rch5s31gc7dy9zx4mcgsdhn82y1pmr2rs14qma0v7x515"; depends=[BH forecast Rcpp RcppEigen rstan rstantools sn StanHeaders]; }; Rlibeemd = derive2 { name="Rlibeemd"; version="1.4.1"; sha256="06bb939awawpwn4g63b9jzq5b658lsznzy272zl0fy19x62c6bwr"; depends=[Rcpp]; }; @@ -3891,7 +3899,7 @@ in with self; { Rmst = derive2 { name="Rmst"; version="0.0.3"; sha256="1fykpii17k460qlsjhhh5vag02lhkyk5l3zjmg8hifqp0cjhz2fl"; depends=[ggplot2 Rata reshape2 Rirt]; }; RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.4"; sha256="1k1gnkghap878fck0bbz9mm0fr4cli6lh1d11r0cf47fvl6cc4gr"; depends=[]; }; Rnmr1D = derive2 { name="Rnmr1D"; version="1.2.5"; sha256="0z97pmkksma225s948r0myd4638cy8vl1x2244w1r6n0cybymnd9"; depends=[base64enc doParallel foreach ggplot2 igraph impute MASS MassSpecWavelet Matrix plotly plyr ptw Rcpp signal speaq XML]; }; - Rnumerai = derive2 { name="Rnumerai"; version="0.3"; sha256="0zvfp9zp73gm6pflf9bx1xk1s45xwwvcd56cbris08d2zfj3b3nl"; depends=[httr lubridate]; }; + Rnumerai = derive2 { name="Rnumerai"; version="2.1"; sha256="1f16fp9gzcaz3ad7iyw10n8jrnmnhxygn00mrcg582jz62dih9bd"; depends=[dplyr ggplot2 httr lubridate purrr tidyr]; }; RobAStBase = derive2 { name="RobAStBase"; version="1.2.1"; sha256="0dn93bcyz9kxbj38sc1wisfa6v0666v9gk6y3zq0ihjkkhkmdwq3"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; }; RobAStRDA = derive2 { name="RobAStRDA"; version="1.2.0"; sha256="1s84j5in4av9zbbszv8j2rpigrd9ws9h4hz64jw7xagsj3xb49kz"; depends=[]; }; RobExtremes = derive2 { name="RobExtremes"; version="1.2.0"; sha256="150p94f0g75g54qcaq4x45lk4sxiyvv1zs4hxkicf46raybvsv89"; depends=[actuar distr distrEx distrMod evd RandVar RobAStBase RobAStRDA robustbase ROptEst startupmsg]; }; @@ -3925,7 +3933,6 @@ in with self; { RpeakChrom = derive2 { name="RpeakChrom"; version="1.1.0"; sha256="1r8f6knpz83arz2kabizx5yyh1myg0h310qlwh8rmy88cdxi1ps9"; depends=[ggplot2 minpack_lm pracma ptw]; }; Rphylip = derive2 { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; }; Rphylopars = derive2 { name="Rphylopars"; version="0.2.12"; sha256="0a3cpyw7fgfklwzzy77sm3brfdha4p9021jaaa2s2hknpr9c1fmp"; depends=[ape doBy geiger MASS Matrix mvnmle phylolm phytools Rcpp RcppArmadillo]; }; - Rpipedrive = derive2 { name="Rpipedrive"; version="0.1.1"; sha256="1rf16q0wfmd3n9idiqpmdhcw7sq27yk2cy9gfl5l6bzj0y6ax1q8"; depends=[httr jsonlite]; }; Rpoet = derive2 { name="Rpoet"; version="1.1.0"; sha256="11gp4zg0wc2a21956355rkr3i3dyaabfz0z30z4phn8s7y3yqr92"; depends=[]; }; Rpolyhedra = derive2 { name="Rpolyhedra"; version="0.4.2"; sha256="0q50f0pp72rwmflxwnridjrcl649kz5h2fm8jfz2pn473mghhya8"; depends=[digest dplyr futile_logger geometry git2r R6 rgl stringr testthat XML]; }; Rpoppler = derive2 { name="Rpoppler"; version="0.1-0"; sha256="19nvv45ahp0c241p1xzlq0sq5qarqg66jw5f1anhqnfi2hi91hcm"; depends=[]; }; @@ -3964,15 +3971,15 @@ in with self; { Rvmmin = derive2 { name="Rvmmin"; version="2018-4.17"; sha256="0mhzzwk311wa157l3n4x5x038asvjd81l45g1jclfsjr0smsffym"; depends=[optextras]; }; Rvoterdistance = derive2 { name="Rvoterdistance"; version="1.1"; sha256="16il36hkq1j6gyl5d8bx5khiiv6fy2m8vkhwiaaiqsliw2sspy4j"; depends=[Rcpp]; }; Rwave = derive2 { name="Rwave"; version="2.4-8"; sha256="1rmqwyj2r84sii0vfqhyhpi3n1n1zia2ca627fq9ksvwn110nrvh"; depends=[]; }; - Rwhois = derive2 { name="Rwhois"; version="1.0.3"; sha256="06mx98wi6r265ykkk81hk17yjkym6ar7c2cwp962ijfk3lxwc9l4"; depends=[stringr]; }; + Rwhois = derive2 { name="Rwhois"; version="1.0.4"; sha256="0gbw1fvin6hwm4893rif9grpsf5s2snzp7zvz3ra4f5jv5bflvpl"; depends=[stringr]; }; Rwinsteps = derive2 { name="Rwinsteps"; version="1.0-1.1"; sha256="0kaxhaa65k1hkhl4kqfxyyk6v967xncrdr5hy8b808zlbqriankc"; depends=[]; }; Rwofost = derive2 { name="Rwofost"; version="0.6-3"; sha256="0a6fp2hkf51hqmbyp7mlhhnzzxj2gcq0kdrlcm3qmpkv0y44wmmw"; depends=[meteor Rcpp]; }; Rwordseg = derive2 { name="Rwordseg"; version="0.3-2"; sha256="10jhfalh45rrcm76hwz4b5yl408ndx2wkr0i3q1avx6z6i45d8s6"; depends=[HMM tmcn]; }; RxCEcolInf = derive2 { name="RxCEcolInf"; version="0.1-4"; sha256="0qyhxqd5yi4d1prj0i4g3k29zi0mx6wkjx24ynb4arxw6h1vabh4"; depends=[coda lattice MASS MCMCpack mvtnorm]; }; RxODE = derive2 { name="RxODE"; version="0.9.2-0"; sha256="1ynn38wk08szi34pk0hmlnanmfg19arazsqzafyw5kd1v3fdx4g4"; depends=[assertthat brew cli dparser ggplot2 inline knitr lotri magrittr Matrix memoise mvnfast pillar PreciseSums Rcpp RcppArmadillo rex sys units]; }; RxnSim = derive2 { name="RxnSim"; version="1.0.3"; sha256="0fi4aic2brfbl6rsnnfwqq7l8ygvlmr98w0v749l3djpgn7sfrig"; depends=[data_table fingerprint rcdk rJava]; }; - Rxnat = derive2 { name="Rxnat"; version="1.0.6"; sha256="1wzb4dihzbyp23yggi1n7c5ikbq6h2gl9v7bgwxf00y2gwlabjx4"; depends=[httr RCurl]; }; - Ryacas = derive2 { name="Ryacas"; version="1.1.2"; sha256="1m5z6x4w461rwk5ay6fc7y3l4b1nwlhma0lis2q8v93adnwgmg7n"; depends=[magrittr Rcpp]; }; + Rxnat = derive2 { name="Rxnat"; version="1.0.8"; sha256="12xcs2l6vn50bwzfmv60j1qahjw2npfm1a3yjhffcxzh6p8chwbg"; depends=[httr RCurl]; }; + Ryacas = derive2 { name="Ryacas"; version="1.1.3"; sha256="12vkylq06c7kqvvf662cyzhdcnpy928xsjflf1kf0nh6y00gywf8"; depends=[magrittr Rcpp]; }; Ryacas0 = derive2 { name="Ryacas0"; version="0.4.2"; sha256="0k8q9v9016x8vfskwa6zmh2rbblqqfk8bryxslxaj8irzvkggnvl"; depends=[Rcpp settings xml2]; }; S2sls = derive2 { name="S2sls"; version="0.1"; sha256="0qq1rff2cdgrm5rj69jxgrl71i0wmzyn424fdvcg02zdv9ggqhd3"; depends=[spanel]; }; SACCR = derive2 { name="SACCR"; version="2.3"; sha256="0q5fpzmfj08mzxbxksi5fgkfw8n4zsmh37zqnbwkz30llh620hgv"; depends=[data_tree jsonlite Trading]; }; @@ -3985,7 +3992,6 @@ in with self; { SALTSampler = derive2 { name="SALTSampler"; version="1.1.0"; sha256="1lh1w5kcx2sqv5czpfypdbq5mw7pxjbdk0vyg23zzjs26ynbdkn9"; depends=[lattice]; }; SAM = derive2 { name="SAM"; version="1.1.2.1"; sha256="01gj9k1gf35vm11p0p590irqc5daaiwmq05rl2v3n8h2azaz1c7l"; depends=[Rcpp RcppEigen]; }; SAMBA = derive2 { name="SAMBA"; version="0.9.0"; sha256="0gxc1s82bfhqj1rpmp0fm87frv77rgr8qjqai7zdgfz3jm474any"; depends=[optimx survey]; }; - SAMCpack = derive2 { name="SAMCpack"; version="0.1.1"; sha256="1nnrfc74hd39vnb94lxwfjksmjaz62x0alc2ga46gqyygrrg57g5"; depends=[Rcpp RcppArmadillo RcppXPtrUtils Rdpack]; }; SAMM = derive2 { name="SAMM"; version="1.1.1"; sha256="175jk3s9w68ccw1h019380lp9cajfsy3zigcnplp87pcn3qg7x2i"; depends=[Rcpp RcppArmadillo]; }; SAMUR = derive2 { name="SAMUR"; version="0.6"; sha256="0iyv7ljjrgakgdmpylcxk3m3xbm2xwc6lbjvl7sk1pmxvpx3hhhc"; depends=[Matching]; }; SAMURAI = derive2 { name="SAMURAI"; version="1.2.1"; sha256="02fipbjcsbp2b2957x6183z20icv1yly2pd1747nyww9bmpa7ycm"; depends=[metafor]; }; @@ -4083,7 +4089,7 @@ in with self; { SLHD = derive2 { name="SLHD"; version="2.1-1"; sha256="0y3ilxd0phmks8zkmpgw7p5zrkwq4k95h976cwk58pavvhfwj9kb"; depends=[]; }; SLICER = derive2 { name="SLICER"; version="0.2.0"; sha256="10i0hfl6js26n8xwk9pldzm9vv7hmii6gzj04lhqy0g3njds25kp"; depends=[alphahull igraph lle]; }; SLIDE = derive2 { name="SLIDE"; version="1.0.0"; sha256="0x4fm29r7icg33k8gw3vqvxib8n9a1xwg484x9yffybips9ka22c"; depends=[]; }; - SLOPE = derive2 { name="SLOPE"; version="0.1.3"; sha256="12naak08qjpn6l1ikqwf17h72zk4b5mppgxx7ks9wmnqy9ylhy3x"; depends=[Rcpp]; }; + SLOPE = derive2 { name="SLOPE"; version="0.2.1"; sha256="1ilwa8hkp8frai77vn1ba6wdqxhwcqpb0mw6ag2np5hjm2a8vrs3"; depends=[foreach lattice Matrix Rcpp RcppArmadillo]; }; SMARTAR = derive2 { name="SMARTAR"; version="1.0.0"; sha256="04v6nvkcjchln8jxa9qm9j2hrxbm8rm9v96v6j313ia8js0krp9q"; depends=[MASS]; }; SMARTp = derive2 { name="SMARTp"; version="0.1.1"; sha256="0gkhl9j4l67brfmln28m4q4hfi271jlg5aijnjwahlj8nsi6384y"; depends=[covr mvtnorm sn]; }; SMC = derive2 { name="SMC"; version="1.1"; sha256="1r4ajgi785lmpnlxrba0n6phmk1f0mb6b5yqk6hx8gng2w8ggclz"; depends=[]; }; @@ -4153,9 +4159,9 @@ in with self; { SRTtools = derive2 { name="SRTtools"; version="1.2.0"; sha256="1203i6nqclx0faxyvhdaapmfxy8h95jj83svxriqh1hpava5s1dy"; depends=[magrittr]; }; SSBtools = derive2 { name="SSBtools"; version="0.6.0"; sha256="1p00kacf49h475jdq9lf955dpzw81n399zzpzx7igp8d2snccy3f"; depends=[Matrix stringr]; }; SSDM = derive2 { name="SSDM"; version="0.2.8"; sha256="19l78dkjk76ababkd7xsfn0fy99khfa4i502q4vllpvch4cjz51c"; depends=[dismo e1071 earth gbm ggplot2 mgcv nnet poibin randomForest raster reshape2 rpart scales shiny shinydashboard shinyFiles sp spThin]; }; - SSDforR = derive2 { name="SSDforR"; version="1.5.12"; sha256="12vhdh808w4qbr7ipidx79y0lsn04za7d0m6dxpn8mgbplr64kdb"; depends=[MAd MASS metafor psych SingleCaseES TSA TTR]; }; + SSDforR = derive2 { name="SSDforR"; version="1.5.15"; sha256="0cdjv32mc0j5b3ih9lkcspc4p87i1mlq21bjyx59bd9vgfa1bhkw"; depends=[MAd MASS metafor psych SingleCaseES TTR]; }; SSLASSO = derive2 { name="SSLASSO"; version="1.2-2"; sha256="0vnn9ksdf0qgjflgx1sfj6q6j9jfnarbx2222rh9kb10jy8b16jv"; depends=[]; }; - SSLR = derive2 { name="SSLR"; version="0.9.0"; sha256="1k7a8f25jhswfhagbn8dr0lhc9148475v264kh0a4p0852vsbdlr"; depends=[dplyr foreach generics magrittr parsnip plyr proxy purrr RANN Rcpp RcppArmadillo rlang RSSL]; }; + SSLR = derive2 { name="SSLR"; version="0.9.1"; sha256="00a26p9y0f6df345qkl2ga0q11a6sasv7p76nyvwjb7wcgbl09kz"; depends=[dplyr foreach generics magrittr parsnip plyr proxy purrr RANN Rcpp RcppArmadillo rlang RSSL]; }; SSM = derive2 { name="SSM"; version="1.0.1"; sha256="1h8yyzh5rn5jay70kyzvwirfndi049a5w28qigrjv5rxd7ml84l7"; depends=[]; }; SSN = derive2 { name="SSN"; version="1.1.15"; sha256="057lh2ym82ff3c25vyh97csns4jwlbvxwc4jai0i4yplxf0ccmha"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; }; SSOSVM = derive2 { name="SSOSVM"; version="0.2.1"; sha256="11wlalpw6yhvv95xr8vvgxgl4jafc2ghzsk5wqyv71ahxarmrlss"; depends=[MASS mvtnorm Rcpp RcppArmadillo]; }; @@ -4191,7 +4197,6 @@ in with self; { SWMPrExtension = derive2 { name="SWMPrExtension"; version="1.1.3"; sha256="1xyn802aadx3fxckqvimkpwbx0pv6g3wqjzjx2k46qnm2gl6ck0v"; depends=[broom dplyr EnvStats flextable ggplot2 ggthemes leaflet lubridate magrittr maptools officer RColorBrewer rgdal rgeos rlang scales sp SWMPr tidyr]; }; SYNCSA = derive2 { name="SYNCSA"; version="1.3.4"; sha256="0n9za302x638s666xs86zy94qch9wn0rln8xy6x9jymhhq9zn0kj"; depends=[FD permute RcppArmadillo vegan]; }; SafeBayes = derive2 { name="SafeBayes"; version="1.1"; sha256="09bhd3z9ia2mvpn1h0hil00j6cm4x9y9ymxc3gj8wd4ybdi3jqlm"; depends=[]; }; - SafeQuant = derive2 { name="SafeQuant"; version="2.3.1"; sha256="0rgi0ij33sdvkpmjynfmsj0f29kl9l9ylsqckg5x4v49m6mzq1yh"; depends=[Biobase corrplot data_table epiR gplots limma optparse seqinr]; }; SailoR = derive2 { name="SailoR"; version="1.0"; sha256="1gb50qd9s3dwdvl6qihpkgwlhckbhn7h3wpz9k74xgyd874krcld"; depends=[]; }; Sample_Size = derive2 { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; }; SampleSize4ClinicalTrials = derive2 { name="SampleSize4ClinicalTrials"; version="0.2.2"; sha256="19dl5sfrsmahrf1q0ljpjmp2821mn2h9d53ds9jyci0wv287gzs9"; depends=[]; }; @@ -4250,11 +4255,12 @@ in with self; { SequenceSpikeSlab = derive2 { name="SequenceSpikeSlab"; version="0.1.1"; sha256="079qm4klgaml99j4cshy3n54pg7q537zlagib4xd8mswdmqdvll6"; depends=[Rcpp RcppProgress selectiveInference]; }; Sequential = derive2 { name="Sequential"; version="3.1"; sha256="0wh5bxqgmkmlbz9bmvpv3lp8mq4iih86a73ccl6fycfpqvq6nf6i"; depends=[boot]; }; SequentialDesign = derive2 { name="SequentialDesign"; version="1.0"; sha256="1gi37pixwbpy7358id1c75rckr352hs8vjs8sk8qgsr97pkm5xdq"; depends=[Sequential]; }; + SetMethods = derive2 { name="SetMethods"; version="2.5"; sha256="1f90szzfv370k2a92p8hi8zcjcfj5dsffhkhdbqk00s45cpjsn20"; depends=[admisc betareg fmsb ggplot2 ggrepel lattice QCA scatterplot3d stargazer]; }; SetRank = derive2 { name="SetRank"; version="1.1.0"; sha256="0p7vwsw05s5hfw1mfh3fbm9nfzsymnxzrdjin7k21dx7asb618wy"; depends=[data_table igraph XML]; }; SetTest = derive2 { name="SetTest"; version="0.2.0"; sha256="08wc6cbnannmwkncqhpcw6l0y7c1v7z3awk5j7fd853nszfmpbk0"; depends=[]; }; - Seurat = derive2 { name="Seurat"; version="3.1.4"; sha256="0lhjbjhv1hnx5i3gkx41k68i8ykay3f24708h30wx9xywww9lsvi"; depends=[ape cluster cowplot fitdistrplus future future_apply ggplot2 ggrepel ggridges httr ica igraph irlba KernSmooth leiden lmtest MASS Matrix metap patchwork pbapply plotly png RANN RColorBrewer Rcpp RcppAnnoy RcppEigen RcppProgress reticulate rlang ROCR rsvd Rtsne scales sctransform tsne uwot]; }; + Seurat = derive2 { name="Seurat"; version="3.1.5"; sha256="1lbq2pqhb6ih6iqawlnzdh05zff71pwbw1cpfv2sld3pd7kz0zkm"; depends=[ape cluster cowplot fitdistrplus future future_apply ggplot2 ggrepel ggridges httr ica igraph irlba KernSmooth leiden lmtest MASS Matrix patchwork pbapply plotly png RANN RColorBrewer Rcpp RcppAnnoy RcppEigen RcppProgress reticulate rlang ROCR rsvd Rtsne scales sctransform tsne uwot]; }; ShapeChange = derive2 { name="ShapeChange"; version="1.4"; sha256="1ch7avx8mxjk8vrp17inaihmbsv968wflyk1n4fbjvacbl24vn2b"; depends=[coneproj quadprog]; }; - ShapePattern = derive2 { name="ShapePattern"; version="2.0.3"; sha256="13sp9hv0ynab1d9fmr8531qvrrx4x958pw50b5828mqbqsgk24ff"; depends=[landscapemetrics raster rgdal rgeos sp]; }; + ShapePattern = derive2 { name="ShapePattern"; version="2.0.4"; sha256="0bvcxm4rxi0a7cj7w6qpnqmpvqzdww7w43a2fa3bcks8g0hy71pc"; depends=[landscapemetrics raster rgdal rgeos sp]; }; ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.4"; sha256="15ds3024qcvnq3pnbhpyd6hbif26mdzw1srqv44hwsllgzpi7602"; depends=[coneproj raster]; }; SharpeR = derive2 { name="SharpeR"; version="1.2.1"; sha256="1xcnbjwcqc9mhb6kqcarkmjcr5zrn5hryfp4i4rayra9yk9k18r8"; depends=[matrixcalc sadists]; }; ShiftShareSE = derive2 { name="ShiftShareSE"; version="1.0.1"; sha256="09sm3frapxv1zhxy84wqyaxdk5jx62ijszfa34zlknlgivividfy"; depends=[Formula]; }; @@ -4269,8 +4275,8 @@ in with self; { SigOptR = derive2 { name="SigOptR"; version="0.0.1"; sha256="1sylchhhz6kx4r8jx95cvsmjsacjh8pin7acf2fyw2a4nlx9r1a6"; depends=[httr jsonlite]; }; SigTree = derive2 { name="SigTree"; version="1.10.6"; sha256="18gh7azjr979ijc2y4yyskj24ay697rw3j7znc5p4a63s4vpxr9w"; depends=[ape MASS phyext2 phylobase phyloseq RColorBrewer vegan]; }; SightabilityModel = derive2 { name="SightabilityModel"; version="1.3"; sha256="0rgv5735y07yyv5y9c3flzha97ykn34ysmzy6as1z94hqfr4w746"; depends=[]; }; - Signac = derive2 { name="Signac"; version="0.2.4"; sha256="1szc4a4g8c2qrjm3i597byw0sj2sksvj2w7fr93d6n5w1y251260"; depends=[BiocGenerics Biostrings BSgenome data_table dplyr future future_apply GenomeInfoDb GenomicFeatures GenomicRanges gggenes ggplot2 ggseqlogo IRanges irlba Matrix patchwork pbapply Rsamtools S4Vectors Seurat tidyr zoo]; }; - SignifReg = derive2 { name="SignifReg"; version="2.1.1"; sha256="1796qy77fm8h0gnrwfm4sdfcbf2y3c8vvz4c6yrig0h4pjhhh07h"; depends=[]; }; + Signac = derive2 { name="Signac"; version="0.2.5"; sha256="01cpya2x9dzjxicqzrkiafhn571n3dw7n10rwz3cs528qgap43db"; depends=[BiocGenerics data_table dplyr future future_apply GenomeInfoDb GenomicRanges gggenes ggplot2 ggseqlogo IRanges irlba Matrix patchwork pbapply Rsamtools S4Vectors Seurat tidyr zoo]; }; + SignifReg = derive2 { name="SignifReg"; version="3.0"; sha256="0yvbf56ap29rfm10vdv3mc67x1aklkwwapi72vzsi2xhrgwf395d"; depends=[]; }; Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="4.5"; sha256="1rrdkmyv9fj7jjafl8zvyzpdjli2s004v1wdsifnq1zp0vmv1m9q"; depends=[Deriv MASS]; }; Sim_PLFN = derive2 { name="Sim.PLFN"; version="1.0"; sha256="1jmsydhpfv2z9cr99hfy8cairhkkxpwk4wnz1adixwxazkn7qfah"; depends=[DISTRIB FuzzyNumbers]; }; SimBIID = derive2 { name="SimBIID"; version="0.1.4"; sha256="1kqa1bm0f9kx7nr936hhpsi6hjjb3mlppxycwwi5pmzv9snm83hg"; depends=[coda dplyr ggplot2 mvtnorm purrr RColorBrewer Rcpp RcppArmadillo RcppXPtrUtils tibble tidyr]; }; @@ -4283,6 +4289,7 @@ in with self; { SimEUCartelLaw = derive2 { name="SimEUCartelLaw"; version="1.0.1"; sha256="1wg9sayk55mp3f2qykvfk0cbqh050vh0n1fhpq4fmlxqll87aml9"; depends=[plot3D plot3Drgl rgl]; }; SimHaz = derive2 { name="SimHaz"; version="0.1"; sha256="04q4xyc1ki1zr3grm3khfg0kbykjy3j9qpg332l7pxp4j3wa3aw3"; depends=[survival]; }; SimInf = derive2 { name="SimInf"; version="6.5.1"; sha256="1sacky971igk2x8kmiqfavxvzvyxl53snjpb8zf72ffh3d2nn32c"; depends=[Matrix]; }; + SimJoint = derive2 { name="SimJoint"; version="0.3.7"; sha256="03xf8n1fbbq63wz8kyj19h9vqz14z463cv8xqhmaknlamnnyhis5"; depends=[Rcpp RcppArmadillo RcppParallel]; }; SimMultiCorrData = derive2 { name="SimMultiCorrData"; version="0.2.2"; sha256="0brszbqxf40y65xp96c5hp7hhvz3gv0xlg93r5ik8qdh0bn0y1sw"; depends=[BB GenOrd ggplot2 Matrix nleqslv psych triangle VGAM]; }; SimPhe = derive2 { name="SimPhe"; version="0.2.0"; sha256="01kzypahw41jk8s2c92h0k9w32yaicis07wb6k8qlqcmv0zj8xry"; depends=[]; }; SimRAD = derive2 { name="SimRAD"; version="0.96"; sha256="0ivvd3k04v1akbblxcjhlyc315z3ig7wjs0g3b37lvlfp54ppbrg"; depends=[Biostrings ShortRead zlibbioc]; }; @@ -4292,13 +4299,13 @@ in with self; { SimSCRPiecewise = derive2 { name="SimSCRPiecewise"; version="0.1.1"; sha256="0mhlx9m5db8a40wf275qh59345676m8bpjjmyx1v22f6m9p3b2n4"; depends=[]; }; SimSeq = derive2 { name="SimSeq"; version="1.4.0"; sha256="068gg484w07qb4wajik2s3z79xfj0jg5l4pz69267dxi5kzd9fas"; depends=[fdrtool]; }; SimTimeVar = derive2 { name="SimTimeVar"; version="1.0.0"; sha256="1x0lkgqwx1vz1gbyvy0hx20n638n30j0dny1iz5vs0cvviq3cdv8"; depends=[car corpcor ICC metafor miscTools mvtnorm plyr psych]; }; - SimVitD = derive2 { name="SimVitD"; version="0.1.1"; sha256="0xq9qi3vf1aggcwy2hn7q57zvis6ws1z4azvgp2xsndbn7rg9qda"; depends=[poisson]; }; + SimVitD = derive2 { name="SimVitD"; version="0.1.2"; sha256="0ilv17ngs1y09z459yn5wlg0bql93awdy3gbmrjhv00iyp30kvjp"; depends=[poisson]; }; SimilaR = derive2 { name="SimilaR"; version="1.0.7"; sha256="1zabx25wqvspyl8yxknr8glz9b0dmk9wn4yz8fry4wd1nx2hl28q"; depends=[BH Rcpp stringi]; }; SimilarityMeasures = derive2 { name="SimilarityMeasures"; version="1.4"; sha256="1w4klcln4hy9vcik9csg7b3b8kk4raxgckwfrhqg089d80xbqsxj"; depends=[]; }; Simile = derive2 { name="Simile"; version="1.3.3"; sha256="1izyjp18m1inac3svkf59z3lddrv44m7pdkhisgkr987xs8gdch4"; depends=[]; }; SimpleTable = derive2 { name="SimpleTable"; version="0.1-2"; sha256="1rkybrp7zlb7cj37799npss1ldic0yf519q5l7a6ikal4yl1afyb"; depends=[hdrcde locfit MCMCpack]; }; SimplicialCubature = derive2 { name="SimplicialCubature"; version="1.2"; sha256="1g7i31naczqf1hxmk1h5y9gq36rdfhf4al9xvwjgi9bj9zhfg3qp"; depends=[]; }; - SimplifyStats = derive2 { name="SimplifyStats"; version="2.0.2"; sha256="0jv6yh6nh26wy18b4k3bi6pxhajmm2jw4hxxrjkpznn14c173qz5"; depends=[assertthat broom dplyr moments tibble]; }; + SimplifyStats = derive2 { name="SimplifyStats"; version="2.0.4"; sha256="08775g6fdx09y8pkfq4k8zxbxpwah7yqq5cg30lmxl7zrpmza5hv"; depends=[assertthat broom dplyr moments tibble]; }; Simpsons = derive2 { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72plzq23d3l4bbzfdvhszdxmkn1pkk64h8ms"; depends=[mclust]; }; SinIW = derive2 { name="SinIW"; version="0.2"; sha256="1z7rcjy0i09a9hjpjj1x8i46lv042l20lvb6b0pnsky2sx3v78pd"; depends=[fdrtool pracma]; }; SingleCaseES = derive2 { name="SingleCaseES"; version="0.4.3"; sha256="05bd03ka6qxmq8ls9w0nfklya3qay90s3i0iqjpcd6id4g8cz2kb"; depends=[dplyr magrittr purrr rlang tidyr tidyselect]; }; @@ -4372,11 +4379,11 @@ in with self; { SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-8"; sha256="0r2byz5xxc46zqnigdax28q7446ibmzmsmi10lmm2hdks3ml6sl3"; depends=[fields maps]; }; SpatialFloor = derive2 { name="SpatialFloor"; version="1.1.0"; sha256="07mwgcvkkq478l6wxvrdjs9d578x0kgs5xy86lgy5my0xqfcv6y8"; depends=[blocksdesign fields reshape2 taRifx]; }; SpatialGraph = derive2 { name="SpatialGraph"; version="1.0-2"; sha256="0cwswa5g3a6ng8qkwi04jz9pma4i0c16m7jpq6z3djzjin0znyk2"; depends=[igraph rgeos shape sp splancs]; }; - SpatialKDE = derive2 { name="SpatialKDE"; version="0.5.0"; sha256="15v8msvmpy72d0vjrra1rmkkxn7pm11bngr3liw2n43lwkh19l9i"; depends=[dplyr glue magrittr raster Rcpp rlang sf]; }; + SpatialKDE = derive2 { name="SpatialKDE"; version="0.6.1"; sha256="15znbhfflzz1x396mnnbx9lx8xs6rfr2564kr632qb2d9ihj9s45"; depends=[dplyr glue magrittr raster Rcpp rlang sf]; }; SpatialML = derive2 { name="SpatialML"; version="0.1.3"; sha256="0akip0kkd1jjid12iwmaxkhkvcfzkxmrnrsv0b6nnvpjdl1jb589"; depends=[randomForest]; }; SpatialNP = derive2 { name="SpatialNP"; version="1.1-4"; sha256="1hj9fjhyxcvl2d0wdqyc899wy4f6iyi03g65icavkmqnwcs8c7hc"; depends=[]; }; SpatialPack = derive2 { name="SpatialPack"; version="0.3-8"; sha256="0laixlr37048x2dr1zbk41kjp533w47khc1d9rihmlrwxrflprd0"; depends=[]; }; - SpatialPosition = derive2 { name="SpatialPosition"; version="2.0.0"; sha256="00z1kbkd7as4xnzqnizaap9qga4vakx7swyayli26ghp11krgfwr"; depends=[isoband lwgeom raster rgeos sf sp]; }; + SpatialPosition = derive2 { name="SpatialPosition"; version="2.0.1"; sha256="0ljhb5j05kxhw1c2ki1m1688mgbg4pnf8z324i21b9idrcypcizn"; depends=[isoband raster rgeos sf sp]; }; SpatialRoMLE = derive2 { name="SpatialRoMLE"; version="0.1.0"; sha256="1m80vcd27g11v0gxnjz6p4ghljpxdb8jpkns8ry5yzhfvcpf29jc"; depends=[]; }; SpatialTools = derive2 { name="SpatialTools"; version="1.0.4"; sha256="0jgbrzsx2klvihv65y1ycqyr8awp5kqqz4qwfyfibx3b56lzna1q"; depends=[Rcpp RcppArmadillo spBayes]; }; SpatialVS = derive2 { name="SpatialVS"; version="1.1"; sha256="1xghfiz9wmmx11ssms7zjy3ggkjmc6kkbdwp3v5wjwpwapafzdk3"; depends=[fields MASS nlme]; }; @@ -4426,6 +4433,7 @@ in with self; { StratSel = derive2 { name="StratSel"; version="1.3"; sha256="0hd6q8s8aiymcd33kv0gd0a4wzr86xxdzwn18jgpyk9q8pmg8gvl"; depends=[Formula MASS memisc mnormt pbivnorm]; }; Strategy = derive2 { name="Strategy"; version="1.0.1"; sha256="0phja1r0qfvcswvw5w1x6ny86p84wkqb029fdqgw10djdm9xp0f2"; depends=[xts zoo]; }; StratifiedBalancing = derive2 { name="StratifiedBalancing"; version="0.3.0"; sha256="0pklnm0q0imdhyzhwyb4i0j441dkk4k6qqlx8d4q2xnl62drqnvv"; depends=[bnlearn plyr]; }; + StratifiedMedicine = derive2 { name="StratifiedMedicine"; version="0.2.3"; sha256="03hjx3c7gfzsx3frh0k484xakw9ssrar4dlilw2x85m55hsn7v9r"; depends=[dplyr ggparty ggplot2 glmnet mvtnorm partykit ranger survival]; }; StratifiedRF = derive2 { name="StratifiedRF"; version="0.2.2"; sha256="0a5djia6xacs17nnr5knr1acwzicrffz73q9nvnhdmihazq8v27d"; depends=[C50 dplyr]; }; StratigrapheR = derive2 { name="StratigrapheR"; version="1.0.1"; sha256="0b63n91ns4z745nrdrrnjmj1pmqi5plj1fkbh9ix7i6a7bd2n023"; depends=[diagram dplyr shiny stringr XML]; }; StreamMetabolism = derive2 { name="StreamMetabolism"; version="1.1.2"; sha256="1sv30i7armk7jhxg5x9lh0r9qq3xixn1k2h0q89halkh1yraal8a"; depends=[chron maptools zoo]; }; @@ -4469,7 +4477,7 @@ in with self; { Survgini = derive2 { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; }; SvyNom = derive2 { name="SvyNom"; version="1.1"; sha256="1jym2x6nd9a3y7nk5hflqpy54gs67y4sqqspkvkalf5l2cc64did"; depends=[Hmisc rms survey survival]; }; SwarmSVM = derive2 { name="SwarmSVM"; version="0.1-6"; sha256="09xq7jx70qjyhblzh6kc40hdr0636rqqdnbka7m6rawhd8ivp8yz"; depends=[BBmisc checkmate e1071 kernlab LiblineaR Matrix SparseM]; }; - SwimmeR = derive2 { name="SwimmeR"; version="0.1.0.0"; sha256="0979527aaacfq8arp1qh7z3p9crq8x2v90899z2ab0fa6f9n282m"; depends=[dplyr purrr stringr tibble]; }; + SwimmeR = derive2 { name="SwimmeR"; version="0.2.0"; sha256="0x6vidrha9wj24ync3nyfcyzdjdq4z2yf52h4m3gr5pd3ir9pb8f"; depends=[dplyr ggplot2 magrittr pdftools purrr rvest scales stringr tibble]; }; SwissAir = derive2 { name="SwissAir"; version="1.1.5"; sha256="0lh69924vhyilgn562jqn8m7z4dq3xmdj09501sbs7hbxfaiiyly"; depends=[]; }; SyNet = derive2 { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; }; SymTS = derive2 { name="SymTS"; version="1.0"; sha256="17vhm00zd9yxl6li36bsfkm4rsizjsm93ibrzgqnkl72sqmmlwfi"; depends=[]; }; @@ -4553,7 +4561,7 @@ in with self; { TSMSN = derive2 { name="TSMSN"; version="0.0.1"; sha256="0zy9r6i1p161h1zh0vnz1npsh48q3nc2c5hcgzvf78nfznnn6wg1"; depends=[mvtnorm numDeriv progress sn]; }; TSMining = derive2 { name="TSMining"; version="1.0"; sha256="1n32acagffiw31pr485ly3phx33zw7vj009bvw4lbqpixa1pszj2"; depends=[foreach ggplot2 plyr reshape2]; }; TSMySQL = derive2 { name="TSMySQL"; version="2015.4-1"; sha256="1gdda7li320ba9qfxfl5c4cwl2ln5jdbvid98cryj175g0nbmx7b"; depends=[DBI RMySQL tframe TSdbi TSsql]; }; - TSP = derive2 { name="TSP"; version="1.1-9"; sha256="183m6crb0dv17llj86059n3hbgsahbhfcqlx0ijdzkssg11i1cy7"; depends=[foreach]; }; + TSP = derive2 { name="TSP"; version="1.1-10"; sha256="0z1v6m0vqjzxc4az3zyjaayygx0jr3mdmc56jjd421iqh0b9z5s4"; depends=[foreach]; }; TSPostgreSQL = derive2 { name="TSPostgreSQL"; version="2015.4-1"; sha256="11201zpbrva6gwc9hg8pynadrps6d8pb3syzba9nyjpv2ck6x3ry"; depends=[DBI RPostgreSQL tframe tframePlus TSdbi TSsql]; }; TSPred = derive2 { name="TSPred"; version="4.0"; sha256="0zjx33llkvvj7m4z16crybw0y6s6zvlblxn2in3j7v9cv0ihhsa8"; depends=[EMD forecast KFAS MuMIn vars wavelets]; }; TSS_RESTREND = derive2 { name="TSS.RESTREND"; version="0.2.13"; sha256="0wbwkhc1b5dql87sj1441cknidpgwcflwlid2yj6d64a6wsipn1l"; depends=[bfast broom ggplot2 RcppRoll strucchange]; }; @@ -4584,7 +4592,7 @@ in with self; { TULIP = derive2 { name="TULIP"; version="1.0"; sha256="0v0qnhlgj31mdl8xhhcbdlnmfcfn2scpr0bf2jxkxpyxiavqdfxy"; depends=[glmnet MASS Matrix tensr]; }; TUWmodel = derive2 { name="TUWmodel"; version="1.1-1"; sha256="1am3ywcj1rqgz5i2g9c6d6fgiv8b2nabllfy84xx1n18pin7mfbk"; depends=[]; }; TVMM = derive2 { name="TVMM"; version="2.0"; sha256="1ijrni80i4d4mli5c8rf9jmazs3hanhvhhk20fjgalk94zvbp7md"; depends=[MASS robustbase]; }; - Taba = derive2 { name="Taba"; version="0.1.0"; sha256="0pqmz7gyf719s5b7mjmmmxr5il3pzgsymibxir6ljpgdsdgbgi5s"; depends=[robustbase]; }; + Taba = derive2 { name="Taba"; version="0.1.1"; sha256="0dm2wi8k8gligb8j31xr6n95nplq669s7brn9xfnxxmmrmjlvlrl"; depends=[robustbase]; }; Table1Heatmap = derive2 { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; }; TableHC = derive2 { name="TableHC"; version="0.1.2"; sha256="1il86xjc4h1sdq3gpi4s7xbkcgzpgfqy5ivzjdkbq45d06pssk21"; depends=[]; }; TableMonster = derive2 { name="TableMonster"; version="1.7"; sha256="1xa4bkcpzhm50dwbpya346swjjfw46n2x26xm30p8gppilg5c0lb"; depends=[xtable]; }; @@ -4604,8 +4612,8 @@ in with self; { Tcomp = derive2 { name="Tcomp"; version="1.0.1"; sha256="1k0gsf3yr5n9zc2yi6szxm6s7bf61lz4fx8m3v48jlp5w900prwb"; depends=[forecast Mcomp]; }; TeXCheckR = derive2 { name="TeXCheckR"; version="0.6.0"; sha256="1qrzslcipg3j1317dhizxhcxyx2dpx7jh91vkms10wgc6vpqgrw4"; depends=[clisymbols crayon data_table fastmatch hunspell hutils magrittr rstudioapi zoo]; }; TeachNet = derive2 { name="TeachNet"; version="0.7.1"; sha256="12kkpr96mq0jr07k7ivcmwhrfgas1qrfqfhxa4gm7vv3vkjn0gs9"; depends=[]; }; - TeachingDemos = derive2 { name="TeachingDemos"; version="2.10"; sha256="016pivvy8gzz8f3clnr5dg488rb1lf0l5s00c3v34gm1dgiw5x1f"; depends=[]; }; - TeachingSampling = derive2 { name="TeachingSampling"; version="4.0.1"; sha256="1hh56j1l8wyglnmy92cvh0awcyfjzk6iwgwnhdbc2infjq8fr1lg"; depends=[dplyr magrittr]; }; + TeachingDemos = derive2 { name="TeachingDemos"; version="2.12"; sha256="0i46d7269zhvr3c2a2w1lb3jnhc1cgwhcppqdmnl1ymgw5f40x9y"; depends=[]; }; + TeachingSampling = derive2 { name="TeachingSampling"; version="4.1.1"; sha256="02nywwmv0r8md00kra7wxwzvm6p51l4p8la51bxh8sqq8ajsdswh"; depends=[dplyr magrittr]; }; Tejapi = derive2 { name="Tejapi"; version="1.0.1"; sha256="1v80yjbik6shqad2nvi374dpzs9bjv9ah26agy0khmwnbz6029rk"; depends=[httr jsonlite]; }; TempCont = derive2 { name="TempCont"; version="0.1.0"; sha256="1pl0czrpw74zfm5vycyl0h8hc3n5whf4g6a2759a22384gk5fq7k"; depends=[nlme]; }; Temporal = derive2 { name="Temporal"; version="0.2.0"; sha256="114ld41l2dipw7cpyh7fy3n332v1dkiqvdng6vkk9wm6jmda7wya"; depends=[expint numDeriv plyr Rcpp RcppArmadillo]; }; @@ -4614,7 +4622,7 @@ in with self; { TestCor = derive2 { name="TestCor"; version="0.0.1.1"; sha256="1rxw5rz687ax3zlpaxb9bak6dd2jdl49h3fdzbz7r8vycwanwydq"; depends=[MASS Rcpp]; }; TestDataImputation = derive2 { name="TestDataImputation"; version="1.1"; sha256="10b1g9m2s6nbs8lrpcx3s1jf0fmqyd07mg3vx1pnma8r3vwy1yh7"; depends=[Amelia mice]; }; TestDesign = derive2 { name="TestDesign"; version="1.0.2"; sha256="1vz0bbbk74g3i4dlsd972n41mf0dhd74f9p2n47mgs3fh1r598zd"; depends=[crayon foreach logitnorm lpSolve Matrix Rcpp Rdpack]; }; - TestDimorph = derive2 { name="TestDimorph"; version="0.3.0"; sha256="0r9v32hz1gy1xyrz5yw8jsncnn8camzv8ha7k3df43rvnprv6xhf"; depends=[caret corrplot DescTools dplyr ggplot2 klaR MASS mda multcompView plotROC plyr purrr randomForest reshape2 Rfast rlang stringr tibble tidyr tmvtnorm truncnorm]; }; + TestDimorph = derive2 { name="TestDimorph"; version="0.3.1"; sha256="163swi09d3nhgp4zkic7gmh302955jm1qr0dv9l3ciyayrc8z842"; depends=[caret corrplot DescTools dplyr ggplot2 klaR MASS multcompView plotROC plyr purrr randomForest reshape2 Rfast rlang stringr tibble tidyr tmvtnorm truncnorm]; }; TestFunctions = derive2 { name="TestFunctions"; version="0.2.0"; sha256="018nkz8r6vqahrzq3d588i3ffb1bmd1pdk87j4ivcdsx99mq15sn"; depends=[]; }; TestScorer = derive2 { name="TestScorer"; version="1.7.2"; sha256="006c3g3gx55mfr93srldwvgz5vm6nkr3f57yi4qg6krn0d32865f"; depends=[]; }; TestingSimilarity = derive2 { name="TestingSimilarity"; version="1.1"; sha256="1iq0wh13rl6rby44ql4d286r1akzwmbpsvnq9p8lkl8709z0d34w"; depends=[alabama DoseFinding lattice]; }; @@ -4628,6 +4636,7 @@ in with self; { ThreeArmedTrials = derive2 { name="ThreeArmedTrials"; version="1.0-3"; sha256="06jhgl1fzvkvnhrjs4xcyw6yymwl499rw9xnfwpx44dzxi7nynxj"; depends=[MASS numDeriv]; }; ThreeGroups = derive2 { name="ThreeGroups"; version="0.21"; sha256="0hipxa45v9ysb2qbk33kjycnvqar7bff1ajxd6fzhpc3jc9hflw4"; depends=[]; }; ThreeWay = derive2 { name="ThreeWay"; version="1.1.3"; sha256="17yl8zq029wiy3c0f4ssljx85dnm9n862wj2d24w7p0lxlvarmz6"; depends=[]; }; + ThreeWiseMonkeys = derive2 { name="ThreeWiseMonkeys"; version="0.1.0"; sha256="1qdb3m15q0gg8dk2znc2syy2jdqsp2893a7ilfa8rg3r2vps86yg"; depends=[stringr tuneR]; }; Thresher = derive2 { name="Thresher"; version="1.1.3"; sha256="16zf5cwc2c5j61xcrqsycwrsc162spyqgk9mac7n37mymn5agbwp"; depends=[ade4 ClassDiscovery colorspace MASS movMF oompaBase PCDimension]; }; ThresholdROC = derive2 { name="ThresholdROC"; version="2.8.2"; sha256="1fsxf43syp371149wmbxjc13rrai69gc61xdlgrqplv4v0nqqk73"; depends=[MASS numDeriv pROC]; }; TickExec = derive2 { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; }; @@ -4653,10 +4662,10 @@ in with self; { TopicScore = derive2 { name="TopicScore"; version="0.0.1"; sha256="1x6s3yn25rj8mbd25yi7f2rz0nwg8n0l1vs6r250kyjb17d2javm"; depends=[combinat Matrix quadprog RSpectra slam]; }; TotalCopheneticIndex = derive2 { name="TotalCopheneticIndex"; version="1.0.1"; sha256="0yc21vs10rzmwx0z6d0gyyncr25835vb7wpn392csc5big6d73xc"; depends=[memoise]; }; TouRnament = derive2 { name="TouRnament"; version="0.2.5"; sha256="09i0frzzxi5ymjlvh81rmisxh35amrvhxbkjq5351fhlpf1n977z"; depends=[]; }; - TraMineR = derive2 { name="TraMineR"; version="2.0-15"; sha256="0yfgrbdkzy5gpd7q7s64rd7i7k4b9myr3gd1zb7spl16pgvmp7zv"; depends=[boot cluster colorspace Hmisc RColorBrewer]; }; + TraMineR = derive2 { name="TraMineR"; version="2.2-0"; sha256="1xnhj5348kp7kg1cqiqm7s4v8yb4n7gxn17xg5qnnypca58szbpf"; depends=[boot cluster Hmisc RColorBrewer]; }; TraMineRextras = derive2 { name="TraMineRextras"; version="0.4.7"; sha256="0lls9683jq0ws62sqfj3zm1v2v3ymn0flpkv3iwqb5i84mj63aq6"; depends=[cluster RColorBrewer survival TraMineR]; }; TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.2"; sha256="1kpdiwwzxsdwv5255xlvcnxvnp39ky0aws41g1l5i7cpbv88kca5"; depends=[fields RColorBrewer]; }; - Trading = derive2 { name="Trading"; version="1.2"; sha256="0wlwpf1iygcs0cy7ms57b1bbp8f3s193bvc6fcm31ih5ph8pr48i"; depends=[]; }; + Trading = derive2 { name="Trading"; version="2.0"; sha256="1n7m7kd539hpii2xvzhsg4zw4bgb63mh0k99fwk588wf19i0cywk"; depends=[PerformanceAnalytics reticulate]; }; TrafficBDE = derive2 { name="TrafficBDE"; version="0.1.0"; sha256="1lnh9lbjxaradivnd1dkd2szggjh2r4v7klpyxb862dxsmdxxrqw"; depends=[caret data_table dplyr lubridate neuralnet RCurl zoo]; }; Traitspace = derive2 { name="Traitspace"; version="1.1"; sha256="1wlrpnzb39vgkqy0ynbwlgrkkqgklrk6pw7f8p7p2i132qk2c291"; depends=[mclust permute]; }; TrajDataMining = derive2 { name="TrajDataMining"; version="0.1.6"; sha256="1n5qcyc1kb8rdrqaji7pp63l2gyr6jim8spm8ydb4lnqfcnrin9g"; depends=[geosphere rgdal RPostgreSQL sp spacetime trajectories xts]; }; @@ -4698,7 +4707,7 @@ in with self; { UKgrid = derive2 { name="UKgrid"; version="0.1.2"; sha256="135lvzaw4gjnc40aw28706fhiz7p06l1jhw830iyg03w2v4j0ar0"; depends=[data_table dplyr lubridate magrittr tsibble xts zoo]; }; UNCLES = derive2 { name="UNCLES"; version="2.0"; sha256="0c61sm09dh0yfrjrjjnizg7qrf8xgc1zdldwhjh64kq8k8g5wa69"; depends=[class kohonen pdist]; }; UNF = derive2 { name="UNF"; version="2.0.6"; sha256="0sr740dhfp7z9wvhajww43g5gz79x5y5dbflw5a813jgmiqm1jyq"; depends=[base64enc digest]; }; - UNPaC = derive2 { name="UNPaC"; version="1.0.0"; sha256="0mm5fqc5rdf24xw5kkh54nc3a0vp4vigkhl8wj14nyiw4xzi67lr"; depends=[glasso]; }; + UNPaC = derive2 { name="UNPaC"; version="1.1.0"; sha256="12w6vjvkzivnqa6jd75dwr8h8d8xbc2519pqnqw9fk3yanqzx9rk"; depends=[huge PDSCE]; }; UPMASK = derive2 { name="UPMASK"; version="1.2"; sha256="160rsb0nbndf61khcs3s8xv9nj7ln8zl6l11157ywdcjqd2q5qnq"; depends=[DBI dimRed loe MASS RSQLite]; }; UPSvarApprox = derive2 { name="UPSvarApprox"; version="0.1.1"; sha256="1lm3xzj70s070ag2sk24nq5ayckk3mnqfmwppbhq5i4y13fw6vip"; depends=[]; }; USAboundaries = derive2 { name="USAboundaries"; version="0.3.1"; sha256="1mqbxkv347307mbvn70929bi3l8wmiwrp86rxdgy45g2ddjdcb6s"; depends=[]; }; @@ -4714,15 +4723,15 @@ in with self; { Ultimixt = derive2 { name="Ultimixt"; version="2.1"; sha256="0fh2qpm7qpv1170jzbmzqhvwsn69lblizzisgasswy2nix2jjz4y"; depends=[coda gtools]; }; Umatrix = derive2 { name="Umatrix"; version="3.3"; sha256="188h959s5pawnny0fxlqmma03iww6af4x0y8p514bwh5xh9rj3kg"; depends=[abind AdaptGauss deldir fields geometry ggplot2 pdist plyr png pracma Rcpp reshape2 shiny shinyjs]; }; Umoments = derive2 { name="Umoments"; version="0.1.1"; sha256="089d0xmsp0419mxjp6fs0s1palvdkr0i5dzqckcn6r2kjqj7izjg"; depends=[]; }; - Umpire = derive2 { name="Umpire"; version="1.3.9"; sha256="0wqbi27mnjafg1cm82mrlavb9jcrxvh2z28m63gl7jw3zcyxn816"; depends=[]; }; + Umpire = derive2 { name="Umpire"; version="2.0.0"; sha256="0qdsy795r4vvf7lqwag4h2vcj6n23az15kj5vsclv343gl2xlvp9"; depends=[BimodalIndex mc2d]; }; UncDecomp = derive2 { name="UncDecomp"; version="1.0.1"; sha256="1m44pgk7nffay09m4gkwb0khq0qjd7bq1p72blsmib46wmnwqfsa"; depends=[dplyr ggplot2]; }; - UncertainInterval = derive2 { name="UncertainInterval"; version="0.5.2"; sha256="0ha3j34bzrrwywlww7370mnpx61vhf4gdz6hz0fbad7raf1ry2m1"; depends=[car MASS nloptr psych reshape2 rootSolve zoo]; }; + UncertainInterval = derive2 { name="UncertainInterval"; version="0.6.0"; sha256="0gyw1lgq1mni8m44lfi2vnd2wxq6i6ml6c6hy9amdbwmb7aymhhd"; depends=[car MASS nloptr psych reshape2 rootSolve zoo]; }; UniDOE = derive2 { name="UniDOE"; version="1.0.2"; sha256="14jz4acrvbv59sbr7gya8g0z749vv0i04gl5wl0y4218byjvw6bs"; depends=[Rcpp]; }; UniIsoRegression = derive2 { name="UniIsoRegression"; version="0.0-0"; sha256="0lmrmb9sbk41ak7sbcrzhfnijb1skgb4lqg9m9imc98lcp69h7z0"; depends=[Rcpp]; }; Unicode = derive2 { name="Unicode"; version="13.0.0-1"; sha256="12q98hdh46bbx17z6869bmn1j9bbhf524flvn76sqf20phk81xjy"; depends=[]; }; UniprotR = derive2 { name="UniprotR"; version="1.2.4"; sha256="1zzxm93390nxw27fr62vhd8pafkq6fiy8if0cx4raznlym5615is"; depends=[alakazam data_tree dplyr ggplot2 ggpubr gridExtra httr magick magrittr plyr scales tidyverse]; }; UnitCircle = derive2 { name="UnitCircle"; version="0.1.3"; sha256="0z5ssps8l5ka4aw4984qml15scw4pfssara5dls82afhfhpkszsr"; depends=[]; }; - UnivRNG = derive2 { name="UnivRNG"; version="1.2"; sha256="0cx6bdzzypxnaqi4wkb20saqd5sfa2rga5cqh694l70vj9c3zw26"; depends=[]; }; + UnivRNG = derive2 { name="UnivRNG"; version="1.2.2"; sha256="1hv0gg371ndljvn3x7s5vbkh51h1l1pjk57livw630mvb67cffqw"; depends=[]; }; UpSetR = derive2 { name="UpSetR"; version="1.4.0"; sha256="007i0njnjjy7vbrxabwav7a1kk2n0hn2mkvqsdzzfk10ckp5y7im"; depends=[ggplot2 gridExtra plyr scales]; }; UsingR = derive2 { name="UsingR"; version="2.0-6"; sha256="1lr8z45r5s7fxrd42rswm6w7s3k5nds244b9d525jb5v4n8w9kpw"; depends=[HistData Hmisc MASS]; }; UtilityFrailtyPH12 = derive2 { name="UtilityFrailtyPH12"; version="1.0"; sha256="06f5gmwwk1r14ab6v5jcxz0pmdph7ffi4y57mjg9byn7pjnibflk"; depends=[bindata mvtnorm Phase123 Rcpp RcppArmadillo]; }; @@ -4759,6 +4768,7 @@ in with self; { VSURF = derive2 { name="VSURF"; version="1.1.0"; sha256="1azfd4sb89mp27l86k293qj81x94gfiy1ihwnb6c558p8h69xsgf"; depends=[doParallel foreach randomForest ranger Rborist rpart]; }; VTShiny = derive2 { name="VTShiny"; version="0.1.0"; sha256="1zq6irla3q7hqs8jpjdya7vy3frqrj72rwmd1sgxwrkgpmpxw6x7"; depends=[EnvStats rmarkdown shiny]; }; VTrack = derive2 { name="VTrack"; version="1.21"; sha256="1acf2b8zy72shc4768rhikfa3590h3l3nwk32jk7pwsms0nb87rf"; depends=[checkmate doParallel foreach gdistance gstat Hmisc intervals lubridate plotKML plyr raster sp spacetime XML]; }; + VUROCS = derive2 { name="VUROCS"; version="1.0"; sha256="1r4hq7az50v7lbyx5w6b4zs2kwi5cypqn9k6ac4kr8jr3jlyanr3"; depends=[doParallel foreach Rcpp RcppArmadillo]; }; VWPre = derive2 { name="VWPre"; version="1.2.3"; sha256="0pvk7qmi6s8yqf6s0vbf1ldwrs2b37kgayrdsvfpvxhljg79zl1i"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; }; VaRES = derive2 { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; }; VancouvR = derive2 { name="VancouvR"; version="0.1.1"; sha256="1nzjdassan5kh7wk3xf6kry4jifgjn0gan61ibwhyzy1awpcfngv"; depends=[digest dplyr httr purrr readr rlang sf tibble urltools]; }; @@ -4822,7 +4832,7 @@ in with self; { WeibullFit = derive2 { name="WeibullFit"; version="0.1.0"; sha256="1a80gcqbmvb1rz2dr2syy16wn6ixjn6l40gayys9zy8302hky9ir"; depends=[e1071 FAdist glue kSamples mixdist optimx R_methodsS3 R_oo sqldf xtable]; }; WeibullR = derive2 { name="WeibullR"; version="1.0.12"; sha256="0rj4q9hd49b914lz8q1d8n96xrl0h29avn95aigb3z7f8knf7g9g"; depends=[Rcpp RcppArmadillo]; }; WeightIt = derive2 { name="WeightIt"; version="0.9.0"; sha256="0p16q0zc7xdxwsvdf15h97zj7cdhr1rmzawljsjn4yzqwqby7nsy"; depends=[backports crayon ggplot2]; }; - WeightSVM = derive2 { name="WeightSVM"; version="1.7-3"; sha256="0w0czic90fswiy7jdr0fqvwnj91755821kzpj7rl1dd5123qxacc"; depends=[class]; }; + WeightSVM = derive2 { name="WeightSVM"; version="1.7-4"; sha256="11j47c16q9qcxpbwi66018qvj7mmw4l9xkl47kyggmyz87kbrk73"; depends=[]; }; Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; }; WeightedCluster = derive2 { name="WeightedCluster"; version="1.4"; sha256="05rmqhgfzh9fs4c1lhmrbk8s46ihaywy7n9qnivf7zcxxzxds0lj"; depends=[cluster RColorBrewer TraMineR]; }; WeightedPortTest = derive2 { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; }; @@ -4843,7 +4853,7 @@ in with self; { Wrapped = derive2 { name="Wrapped"; version="2.0"; sha256="1z5kypsd39z9arsw57axckvl8b4jnr5wv60s9z58f5s89gn5vxxg"; depends=[AdequacyModel ald cubfits evd fBasics gamlss_dist GeneralizedHyperbolic GEVStableGarch glogis irtProb LCA lqmm metRology NormalLaplace normalp ordinal sgt SkewHyperbolic sld sn VarianceGamma VGAM]; }; WrightMap = derive2 { name="WrightMap"; version="1.2.2"; sha256="0w1iwl45kv6vq5fg88hlkv93bpbrw8jm1wnhk9qxznlm0g13z33x"; depends=[]; }; WriteXLS = derive2 { name="WriteXLS"; version="5.0.0"; sha256="1gypq7zh22kpraz0bgj4jyvy2hbj1l8r7m6y34531vjdgwf67sss"; depends=[]; }; - WufooR = derive2 { name="WufooR"; version="0.9"; sha256="13flcb7hwnhsnlak4m3mvwmbq2fd42027lgp8fhg25sra6dwcd7h"; depends=[dplyr httr jsonlite]; }; + WufooR = derive2 { name="WufooR"; version="1.0.1"; sha256="0iq1lc1b22zdvclkr4yivxxf8z5mdxik7lx9r3b38h2qy2rckqb2"; depends=[dplyr httr jsonlite]; }; XBRL = derive2 { name="XBRL"; version="0.99.18"; sha256="1bwvxqbxdf1ynz2bv27l86h05h8y19q2li2y79xk819p5nkxq341"; depends=[Rcpp]; }; XHWE = derive2 { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; }; XKCDdata = derive2 { name="XKCDdata"; version="0.1.0"; sha256="1lx9frlbc549qrh4d3m79r3l9icfzqkgfgp8raa8x46a2havi0a5"; depends=[assertthat dplyr glue htmltools httr jsonlite magrittr tibble]; }; @@ -4908,7 +4918,7 @@ in with self; { abnormality = derive2 { name="abnormality"; version="0.1.0"; sha256="1fzfskl9akl06nliy8hkv2a0pznpj8pwcypg3gj5r2nzvr3kan9v"; depends=[MASS Matrix]; }; abodOutlier = derive2 { name="abodOutlier"; version="0.1"; sha256="1pvhgxmh23br84r0fbmv7g53z2427birdja96a67vqgz18r3fdvj"; depends=[cluster]; }; abstractr = derive2 { name="abstractr"; version="0.1.0"; sha256="1ymwp7syrynwd4i8aj2x5n8jdi9d96fjzl6jb09n0bnr5fgl7vig"; depends=[colourpicker emojifont ggplot2 gridExtra rintrojs shiny shinythemes]; }; - abtest = derive2 { name="abtest"; version="0.2.0"; sha256="1ky3cf827kj24bhcpk00v5zl5jdkii1gca0x81ay1cjkzfispgws"; depends=[Matrix mvtnorm plotrix RColorBrewer Rcpp sn truncnorm VGAM]; }; + abtest = derive2 { name="abtest"; version="0.2.1"; sha256="1zfd13d7dplawk24dbdr1ka8cbdp5w6sxb0zlm7k4dhvn6ksi8h0"; depends=[Matrix mvtnorm plotrix qgam RColorBrewer Rcpp sn truncnorm]; }; abundant = derive2 { name="abundant"; version="1.1"; sha256="1m76qdmqvwpgm0sihazi2dna7cgsz9rljal18vgffb5wamwmg9k7"; depends=[QUIC]; }; acc = derive2 { name="acc"; version="1.3.3"; sha256="1ii2vm47djxbixa75h690q1s2f9m9x6i8nkygik93j6dayr6kr1m"; depends=[circlize DBI ggplot2 iterators mhsmm nleqslv PhysicalActivity plyr R_utils Rcpp RcppArmadillo RSQLite zoo]; }; accSDA = derive2 { name="accSDA"; version="1.0.0"; sha256="0sgxy5y8kkc1n35657kifwfjsba7y5m1vbr7rkk5lmbpkzahqm61"; depends=[ggplot2 ggthemes gridExtra MASS rARPACK sparseLDA]; }; @@ -4932,13 +4942,13 @@ in with self; { acss = derive2 { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; }; acss_data = derive2 { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; }; activPAL = derive2 { name="activPAL"; version="0.1.3"; sha256="1h6hp5z89ji73gdzxy1dgbfwjysiy5lvcqh90xagpb7sa7ahs3na"; depends=[devtools dplyr ggplot2 lubridate magrittr tidyr]; }; - activegp = derive2 { name="activegp"; version="1.0.3"; sha256="04yiaj908z7sl7g2z5c2irk79wym27mjdvyg5mz4c67hxmpkaj25"; depends=[hetGP lhs numDeriv Rcpp RcppArmadillo]; }; + activegp = derive2 { name="activegp"; version="1.0.4"; sha256="0sqx2pjy0mw8gls4k4qwl64ip55kgs3k10dfdixdrqly035rhr37"; depends=[hetGP lhs numDeriv Rcpp RcppArmadillo]; }; activity = derive2 { name="activity"; version="1.3"; sha256="12imqj366dp6pam5gap6ji56p5wf1073xz5g4iikfxf5l8snxw92"; depends=[circular insol pbapply]; }; activityCounts = derive2 { name="activityCounts"; version="0.1.2"; sha256="0zgxr2sk3a8kmygfxx1p5hnrfwdkxx7php6jlrhm8wv6052ck8jz"; depends=[lubridate magrittr seewave signal tibble]; }; activpalProcessing = derive2 { name="activpalProcessing"; version="1.0.2"; sha256="1y0bjx2qx53iy930y9iww4q1yzjj8y16cwgixk1mq3w4g1f116d1"; depends=[chron]; }; actogrammr = derive2 { name="actogrammr"; version="0.2.3"; sha256="1jzvarmd41yqlrkagzlc8m19n5mn0w0b36fy50lyvgrfsafjfbqa"; depends=[dplyr ggplot2 lubridate readr tidyr]; }; actuar = derive2 { name="actuar"; version="2.3-3"; sha256="0aw3hlan5y22mdqk1wvnw9ksqhwp4yy5hi0dpv21p7s0hyxhphih"; depends=[expint]; }; - actuaryr = derive2 { name="actuaryr"; version="1.1.0"; sha256="0v33rrw1m030a5w3v3f7pigfw1vwsclh48av0yjiha26mpvi3cal"; depends=[crayon dplyr lubridate magrittr purrr]; }; + actuaryr = derive2 { name="actuaryr"; version="1.1.1"; sha256="08dzn565ax2l2hrn2m32k6magjbskybywl0hsgkg11nrjvkznwnx"; depends=[crayon dplyr lubridate magrittr purrr tibble]; }; ada = derive2 { name="ada"; version="2.0-5"; sha256="1h3a07czp0w3hrhjcg1fz721y8vsfclzqi3rq8qfzgpfb4h1f06r"; depends=[rpart]; }; adabag = derive2 { name="adabag"; version="4.2"; sha256="109wrl1pwvmyv2l909hrvk7dg4aa9pv449mvdycp50zwrsw9w0a7"; depends=[caret doParallel foreach rpart]; }; adagio = derive2 { name="adagio"; version="0.7.1"; sha256="1h9l0ddrxq8y35iy9hdkxdvdwsqpnpkzzbkbwwhm4380lq1m7a3k"; depends=[]; }; @@ -4981,7 +4991,7 @@ in with self; { adjustedcranlogs = derive2 { name="adjustedcranlogs"; version="0.1.0"; sha256="08apfvpqvnnalx230p4qf5ckrwm1sgzras4zfrysgym5d4map9ci"; depends=[cranlogs dplyr lubridate rvest xml2]; }; adklakedata = derive2 { name="adklakedata"; version="0.6.1"; sha256="1lzj3ib4bgfkq5lq12n47pwc52h7k35xbbwj6brwsgx1gd4fx3x6"; depends=[httr rappdirs]; }; adlift = derive2 { name="adlift"; version="1.4-1"; sha256="14q7fnhlqvxdhnfjhdhfmadz241srplbm069a7ybbsql21cphpf3"; depends=[EbayesThresh]; }; - admisc = derive2 { name="admisc"; version="0.7"; sha256="0y3id9g792brvb7xdbg0cklsdpy4m9ayrkkaca8qmkdm1yarjmna"; depends=[]; }; + admisc = derive2 { name="admisc"; version="0.8"; sha256="071xrqimizhs7qgav84fggw8cls4dhhqvzp8f1g0xw1wvj0wnfx1"; depends=[]; }; admixturegraph = derive2 { name="admixturegraph"; version="1.0.2"; sha256="0ld4qyyvbnr5lz9ff64wjwif4c9xnqyjmbfgbl9bk6pia98zppl3"; depends=[doParallel dplyr foreach ggplot2 MASS neldermead pracma]; }; admmDensestSubmatrix = derive2 { name="admmDensestSubmatrix"; version="0.1.0"; sha256="1a5lfm10aj6wdjibdnmffn75zvy6x69w8nqcx2i23gxg6v0xlqcl"; depends=[Rdpack]; }; adnuts = derive2 { name="adnuts"; version="1.0.1"; sha256="1l52f33yzbvcz27iw0k6iwcnfanr65lw206d7w4609k2vmlw8ink"; depends=[ellipse R2admb rstan]; }; @@ -5063,7 +5073,7 @@ in with self; { altR2 = derive2 { name="altR2"; version="1.0.0"; sha256="15nvbq3n76p2857ipyf3q6rs2mwjqsp9gr3rmzbjfm8lrj0faxsv"; depends=[gsl purrr]; }; altair = derive2 { name="altair"; version="4.0.1"; sha256="0s3pvlh6y4h3ni5m8yli6gp6gps7pcpndag40ckr31302ai3bxvq"; depends=[assertthat htmlwidgets magrittr repr reticulate vegawidget]; }; alterryx = derive2 { name="alterryx"; version="0.5.0"; sha256="1p9q4244bm7hf6my8q951idw41xa5gcrdl7znmsng9pwxh8dnz3h"; depends=[base64enc digest httr jsonlite]; }; - altmeta = derive2 { name="altmeta"; version="2.3"; sha256="0fcd2pzp62871b37fcwz1zcidch5akj6a5npcvwzg4zwp8i9rmyl"; depends=[coda rjags]; }; + altmeta = derive2 { name="altmeta"; version="3.0"; sha256="0ga3w1igxfhmhxkvh20kjnxsbsx7lmcv894whpg8n59418s1h2gs"; depends=[coda lme4 Matrix metafor rjags]; }; amap = derive2 { name="amap"; version="0.8-18"; sha256="0zpcb73w413na23f6giml9311jh0j0y766w2fh9i40d2h7bbvyvs"; depends=[]; }; ambhasGW = derive2 { name="ambhasGW"; version="0.0.2"; sha256="0v517i4whip45pk6bwlwval9pz367pcgzz62b2z22mrwgi6m6bck"; depends=[raster rgdal yaml]; }; ambient = derive2 { name="ambient"; version="1.0.0"; sha256="0b8nd8g0ydglql2cwi4wmlnv5kyid8q51vz0p08f9m5x73k3z2bd"; depends=[Rcpp rlang]; }; @@ -5075,7 +5085,7 @@ in with self; { ammistability = derive2 { name="ammistability"; version="0.1.1"; sha256="1vp2857cwn4dd86vj8qf6h4z8hh5q2jvrlpmply8bf70mnmnq18h"; depends=[agricolae ggcorrplot ggplot2 Rdpack reshape2]; }; ampd = derive2 { name="ampd"; version="0.2"; sha256="0bi8qngd37n60ym516yjcahxc536vdwm60rq5ld32170hww69j7c"; depends=[]; }; ampir = derive2 { name="ampir"; version="0.1.0"; sha256="1z9ha329fbji9jlly84cn7z2fxclk3n3w0xddq1mw1gqq3dyb8ba"; depends=[caret kernlab Peptides Rcpp]; }; - amt = derive2 { name="amt"; version="0.0.9"; sha256="0hqs954gimpd24bwnac9mz91mgsw7v1nw7rw48j5ql7q0vd2bmxh"; depends=[broom checkmate circular ctmm dplyr fitdistrplus FNN geosphere glue KernSmooth lazyeval leaflet lubridate magrittr maptools purrr raster Rcpp rgeos rlang sf sp survival tibble tidyr]; }; + amt = derive2 { name="amt"; version="0.1.0"; sha256="0h7ifniqiq6cr0p42yjiykaindwkh1jf5wn0hzn2wg04x1cia995"; depends=[broom checkmate circular ctmm dplyr fitdistrplus FNN geosphere glue KernSmooth lazyeval leaflet lubridate magrittr maptools purrr raster Rcpp rgeos rlang sf sp survival tibble tidyr]; }; anMC = derive2 { name="anMC"; version="0.2.2"; sha256="0ab215nrqn535g9ayqzvgdckhwcrij1mc1296pvlj3grn3f8rhws"; depends=[mvtnorm Rcpp RcppArmadillo]; }; anacor = derive2 { name="anacor"; version="1.1-3"; sha256="0mj8g9p4fla0ax9jvcq7kii4lrhj8g872p11nys06anva22qjp51"; depends=[car colorspace fda]; }; analogsea = derive2 { name="analogsea"; version="0.8.0"; sha256="1naw9qh6rp1hz3mk19jir0qia1daizbfa695qbp1sg6rdh6is8ag"; depends=[httr jsonlite magrittr yaml]; }; @@ -5113,9 +5123,9 @@ in with self; { aods3 = derive2 { name="aods3"; version="0.4-1.1"; sha256="1kdmgzd5nkzm0awdjls6fc8p9hxsph9ha9k1jxbppdi4i6f0i7rv"; depends=[boot lme4]; }; aof = derive2 { name="aof"; version="0.1.2"; sha256="0552i5wvm04dq8a8y1x36sprc9cbx6k7c3bmsgqxm71dpsxajb0i"; depends=[bcpa]; }; aoos = derive2 { name="aoos"; version="0.5.0"; sha256="0y92vs27i0mkpjdclqzq4j9g1axkymhi3v8xp1v6hazh35yzjkfj"; depends=[magrittr roxygen2]; }; - aoristic = derive2 { name="aoristic"; version="0.6"; sha256="0b9h2l59vvrvbjjwwb43j74frvwa8lsj4x5kwhwpsfjfch1yqwjl"; depends=[classInt ggplot2 GISTools lubridate maptools MASS plotKML RColorBrewer reshape2 rgdal sp spatstat]; }; + aoristic = derive2 { name="aoristic"; version="1.0.0"; sha256="1qfphg5mh26q832pkh05q50lg60viyiwwcwmsagqb6r64llmysak"; depends=[foreign formattable ggplot2 htmltools lubridate openxlsx plyr]; }; apTreeshape = derive2 { name="apTreeshape"; version="1.5-0"; sha256="0mnydk157557pnkjvcadlghn5d8w9kxas4kwz4y4w21xg7z1jrig"; depends=[ape coda cubature pbapply quantreg]; }; - apa = derive2 { name="apa"; version="0.3.2"; sha256="09yqpl9vdi0kh5dyjlykdvvhya6cvy7mawsk2gvkvn0yq5bawvnv"; depends=[dplyr magrittr purrr rmarkdown stringr]; }; + apa = derive2 { name="apa"; version="0.3.3"; sha256="1nvhl5fqramsdrkpl1nmgr1vmki5c1lkdi1kkx7ihf0cz35f7c2a"; depends=[dplyr magrittr MBESS purrr rmarkdown stringr tibble]; }; apaTables = derive2 { name="apaTables"; version="2.0.5"; sha256="0h986jqdl65fd33gfa433ik77r6lm9zrq75qfk5r8xsdgzb4wgva"; depends=[boot broom car dplyr tibble]; }; apaText = derive2 { name="apaText"; version="0.1.1"; sha256="1r217k60w027i63nbj24b1rm37m4qf7a6iirc941s945babkxcmb"; depends=[dplyr]; }; apc = derive2 { name="apc"; version="1.3"; sha256="1hgkqkvry9is8kjk2w46k637sig7fdznnc75wbrc8bq1hbrmf785"; depends=[lattice]; }; @@ -5124,11 +5134,11 @@ in with self; { apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; }; ape = derive2 { name="ape"; version="5.3"; sha256="08wbk1kxhs32bmmvqlqanbdg1w235amd35k8m00fngsj9h9xzc08"; depends=[lattice nlme Rcpp]; }; apercu = derive2 { name="apercu"; version="0.2.4"; sha256="046gf4dzypl6mmq7xqkyrdasq9rsjxzsii7w4nxkbn4c40kh7bf7"; depends=[pls]; }; - apex = derive2 { name="apex"; version="1.0.3"; sha256="157i67yvb9xqlhzcgkxj7n5lq65svxs82z38dv2c0k8p4krjl1pd"; depends=[adegenet ape phangorn]; }; + apex = derive2 { name="apex"; version="1.0.4"; sha256="1ddzbzpnc17yvbl5yfyp0widqlx48qwlh80xcmyzhv045s680rdk"; depends=[adegenet ape phangorn]; }; apexcharter = derive2 { name="apexcharter"; version="0.1.4"; sha256="1kn0i10wrkb48r3gxxv82mih575csv5695d1l90mh35x45hjgir6"; depends=[ggplot2 htmlwidgets jsonlite magrittr rlang shiny]; }; aphid = derive2 { name="aphid"; version="1.3.3"; sha256="1jqpn7w5sgy4k49qd9ci6yj89s55gzwl5w5ldw793mzpg6if7lfn"; depends=[kmer openssl Rcpp]; }; aplore3 = derive2 { name="aplore3"; version="0.9"; sha256="0af6klscsxvh4amp519b6r41bzysf61p040fj4l5706bbya1arhw"; depends=[]; }; - aplot = derive2 { name="aplot"; version="0.0.3"; sha256="1njlqna2m4p75jh4amqx658r48mkzfmnyjs1kg04p6sfbr5kycls"; depends=[ggplot2 magrittr patchwork]; }; + aplot = derive2 { name="aplot"; version="0.0.4"; sha256="09drrirj7k06gzhda36whpl21b7ca4grsxqlayaxrmilvapmf795"; depends=[ggplot2 magrittr patchwork]; }; aplpack = derive2 { name="aplpack"; version="1.3.3"; sha256="010saim43d3hr83ksi916846rh6qfbb0gvhsf5jbdx95m4bai9g3"; depends=[]; }; apmsWAPP = derive2 { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[aroma_light Biobase DESeq edgeR genefilter gtools multtest seqinr]; }; apng = derive2 { name="apng"; version="1.0"; sha256="13hvr1w566anrhdicaqwqjgfq2lk3zkn5gcfgy8zazjnad4vy07y"; depends=[bitops]; }; @@ -5181,13 +5191,13 @@ in with self; { arrApply = derive2 { name="arrApply"; version="2.1"; sha256="0qy7iwi580rrf3sycsbv6qgxsqcdy9pdbnkdrx81j68qni9iw737"; depends=[Rcpp RcppArmadillo]; }; arrangements = derive2 { name="arrangements"; version="1.1.8"; sha256="03dzvahy8mwp6w1smnbp83zk8w8pfkmsfd1f68bd8jjvdb5lrz71"; depends=[gmp R6]; }; arrayhelpers = derive2 { name="arrayhelpers"; version="1.1-0"; sha256="02rl530qxi1idiqpmzg5wr9vl5c7phizhpj64k5pn8xq9zfxbpaz"; depends=[svUnit]; }; - arrow = derive2 { name="arrow"; version="0.16.0.2"; sha256="1h7c46qraz15dra38hfs6avv27j4d5x4s4cs10vnwyqik11gb2mv"; depends=[assertthat bit64 purrr R6 Rcpp rlang tidyselect vctrs]; }; + arrow = derive2 { name="arrow"; version="0.17.0"; sha256="0sacpxbz68797sf9irrjfchcfs1m4dbidnvb1z7gb4xiyin0npz8"; depends=[assertthat bit64 purrr R6 Rcpp rlang tidyselect vctrs]; }; ars = derive2 { name="ars"; version="0.6"; sha256="0zs1rk3i7pc9wcvxrvjcls194mfbvmkz7cb6pwd1cm3fzjwsyxsp"; depends=[]; }; arse = derive2 { name="arse"; version="1.0.0"; sha256="0ssaalc058m09gfcr1n0s729rx2plia3zkhlynj67drclyvhyb0i"; depends=[dplyr pracma]; }; arsenal = derive2 { name="arsenal"; version="3.4.0"; sha256="090q0kjpcjdxa6r22pb7wzhvgcdq41khh1af7pqgg1rvn2d97x4n"; depends=[knitr]; }; artfima = derive2 { name="artfima"; version="1.5"; sha256="1nqsq9fsqk9kag9n7i2r9yvf578nkdfrkkv7qy8650prka0jca2p"; depends=[gsl ltsa]; }; arules = derive2 { name="arules"; version="1.6-5"; sha256="0bcvfn8lvcv74vv9z3kgg7yq5hm7wjqhmzadi55cbm8zxd76g84v"; depends=[Matrix]; }; - arulesCBA = derive2 { name="arulesCBA"; version="1.1.6"; sha256="1b82am0sv5211x65r45k7pw52hfywv5i8zqr5asczdkx07s6273s"; depends=[arules discretization glmnet Matrix testthat]; }; + arulesCBA = derive2 { name="arulesCBA"; version="1.2.0"; sha256="1d72lrfbyr2g7n6r04vyaqs3pvs3jhkfr4yfgn2fj690q3ff0qr3"; depends=[arules discretization glmnet Matrix]; }; arulesNBMiner = derive2 { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; }; arulesSequences = derive2 { name="arulesSequences"; version="0.2-24"; sha256="0sgysrvmdsr6l0661llrmsnnn397n2niv0bhlm0i31ak0fwh1ljz"; depends=[arules]; }; arulesViz = derive2 { name="arulesViz"; version="1.3-3"; sha256="1c51l4hqai07qx20lbdvffxw9kx0vkgbccw7b9wz1h2n5ma90c8y"; depends=[arules colorspace DT igraph plotly scatterplot3d seriation vcd visNetwork]; }; @@ -5203,7 +5213,6 @@ in with self; { ashr = derive2 { name="ashr"; version="2.2-47"; sha256="1rqb5j30ylaf1h4l66x4jxyn5inrvhc42d90qd5mgkxsq0ghdlr4"; depends=[etrunct invgamma Matrix mixsqp Rcpp SQUAREM truncnorm]; }; asht = derive2 { name="asht"; version="0.9.4"; sha256="1aq384vgf26ig3isyp99z09glcjhl2qd43kp8qdcwk75dcrmxd7z"; depends=[bpcp coin exact2x2 exactci perm ssanv]; }; askpass = derive2 { name="askpass"; version="1.1"; sha256="07q0ik8jzk44vpwh48rr3fnpd7dzsdhjjsl4l850rffv3dyq4h6v"; depends=[sys]; }; - aslib = derive2 { name="aslib"; version="0.1"; sha256="0dkb6bb6dqavjklbciqxqhi3fdqib9asdnhiap2gp9b9wfnkyq7k"; depends=[BatchExperiments BatchJobs BBmisc checkmate corrplot ggplot2 llama mlr parallelMap ParamHelpers plyr reshape2 RWeka stringr yaml]; }; asnipe = derive2 { name="asnipe"; version="1.1.12"; sha256="01k2qr9vpazj4mhz4zpngav31d69qr73i8fc59x8gdbi3ipic7rs"; depends=[MASS Matrix]; }; aspace = derive2 { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[Hmisc shapefiles splancs]; }; aspect = derive2 { name="aspect"; version="1.0-5"; sha256="0pbc0daxw20xcbgqyyd5gbs9kmbaf2dq8ajllx0mnfwdcak9jfgj"; depends=[]; }; @@ -5229,7 +5238,7 @@ in with self; { assertr = derive2 { name="assertr"; version="2.7"; sha256="1x868pd4dac1c7b1q5390wqh2f6s50km8nqcpim3nxcj2l4qkqdb"; depends=[dplyr MASS rlang]; }; assertthat = derive2 { name="assertthat"; version="0.2.1"; sha256="17wy5bdfzg73sg2clisg1k3zyn1adkj59x56m5nwia2k8z67zkw5"; depends=[]; }; assignPOP = derive2 { name="assignPOP"; version="1.1.9"; sha256="1cbk2l827mfi4fi1jai0lzbcj2wvrzd3kw4frmqn4anx6nbcr0qf"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; }; - assignR = derive2 { name="assignR"; version="1.1.3"; sha256="0pmzgz955nqxlcnb0f0kbv415kysjl12niyh704ksvhs5yw0xhah"; depends=[maptools raster rgdal sp]; }; + assignR = derive2 { name="assignR"; version="1.2.0"; sha256="0p722j4nclbpvjrp0hrgz8c1cijlk31sfjlf84wz326qp12dy3af"; depends=[maptools raster rgdal sp]; }; assist = derive2 { name="assist"; version="3.1.6"; sha256="13r029z32f2xcspafx01jkgmabbjcvnp8wg1wx1liwxh3mf2zalg"; depends=[lattice nlme]; }; assocInd = derive2 { name="assocInd"; version="1.0.1"; sha256="16yzgvlqbapjhvzm5nw8vfrhh8mp9llnhck4bpgmszyrh93z1ha5"; depends=[]; }; assortnet = derive2 { name="assortnet"; version="0.12"; sha256="1vyzrb8vsi9pcdn6jd83k77bg0q2a3dwdvlnmxnshqiif2pakb8m"; depends=[]; }; @@ -5245,7 +5254,7 @@ in with self; { asymmetry = derive2 { name="asymmetry"; version="2.0.2"; sha256="0x5yzlf804mhwfr9244b04vnixiyh5d8vmqrfffgid3dijg2zszm"; depends=[gplots smacof]; }; asympTest = derive2 { name="asympTest"; version="0.1.4"; sha256="02l07psiy1888zx86j2r1l5lznz47wdmzbh39pd2nbj8r9i80szr"; depends=[]; }; asypow = derive2 { name="asypow"; version="2015.6.25"; sha256="0il38djkmw5ka7czpalmhq6yycx7flpdpgbd7p5nx52rsjdv49mj"; depends=[]; }; - atable = derive2 { name="atable"; version="0.1.5"; sha256="0jvlch6yhcz5azxj9yllah0x98plws5camxqis58qyqiapgvl9h8"; depends=[DescTools doBy effsize Hmisc plyr reshape2 settings]; }; + atable = derive2 { name="atable"; version="0.1.6"; sha256="17i3vhfayi8h12c4y1spagb9wcq1vsrh7miz20rbinpi9x9671nj"; depends=[DescTools doBy effsize Hmisc plyr reshape2 settings]; }; atlas = derive2 { name="atlas"; version="1.0.0"; sha256="02wm22j40llmdi6z3rzgbc5fpkzmjfq0xar33bypvj1dx1zxygnd"; depends=[httr testthat]; }; atmcmc = derive2 { name="atmcmc"; version="1.0"; sha256="05k69b5wlysz3kh0yiqvshgvr0nyz34zkvn6bjs30cwz7s9j21pn"; depends=[]; }; atmopt = derive2 { name="atmopt"; version="0.1.0"; sha256="1h79ngq1236gz4w29fs3nj46a3m1x8a28z3xnhc6wn3a46cf8zzi"; depends=[DoE_base gtools hierNet]; }; @@ -5261,7 +5270,7 @@ in with self; { audiolyzR = derive2 { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin plotrix RJSONIO]; }; audit = derive2 { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; }; auditor = derive2 { name="auditor"; version="1.2.0"; sha256="14swypvjfkd8qi34dsv2sg2fj0ls4xz42vy4csd2qxj0zwi3rlap"; depends=[DALEX ggplot2 ggrepel gridExtra hnp scales]; }; - augSIMEX = derive2 { name="augSIMEX"; version="3.7.3"; sha256="0cdqpckc4aiwi2dnkcvk2m9n0bg9f7qmd84n3rdw6clcrd0f95wz"; depends=[Formula MASS nleqslv Rcpp rootSolve]; }; + augSIMEX = derive2 { name="augSIMEX"; version="3.7.4"; sha256="0620yxqi160ar91shl5macn890zpc60c9nqy4w8i6m7sskv6gl3z"; depends=[Formula MASS nleqslv Rcpp]; }; augmentedRCBD = derive2 { name="augmentedRCBD"; version="0.1.2"; sha256="1m5iwsy6a580k8b2ph186w2aa9nqy1551mwr4zx4cwyh06m8hrq3"; depends=[dplyr emmeans flextable ggplot2 moments multcomp multcompView officer Rdpack reshape2 stringi]; }; auk = derive2 { name="auk"; version="0.4.1"; sha256="0xrxl8qzmc0dnjn7s32wwrdv1z7v7a4wfpz4vrradfn84vxway30"; depends=[assertthat countrycode dplyr httr magrittr rlang stringi stringr tidyr]; }; aurelius = derive2 { name="aurelius"; version="0.8.4"; sha256="00bpf9sggvnajpmg3zsdgfjinkb6wbrcf1ris7qfhh1rp5rz4m4m"; depends=[gbm glmnet jsonlite]; }; @@ -5286,12 +5295,15 @@ in with self; { avar = derive2 { name="avar"; version="0.1.1"; sha256="1i0bk3y0ca58ihwn4di8rpkp5vs2j5b80rcvaf72n9h2hp8i2ncz"; depends=[Rcpp RcppArmadillo simts]; }; averisk = derive2 { name="averisk"; version="1.0.3"; sha256="02j27d4jxgy2bk5sgxp1xdfyqr321civs99qj0g8cp34gwqk0j3m"; depends=[MASS]; }; aweek = derive2 { name="aweek"; version="1.0.0"; sha256="0a9d4yp694qch34mf08qc5fwsn21h9mw1ak6vylaq73nwiihajw9"; depends=[]; }; - aws = derive2 { name="aws"; version="2.4-1"; sha256="00mc1qwah6i4ajmm01sklz86vz9rwchdsdrck5yrva2a2b1war22"; depends=[awsMethods gsl]; }; + aws = derive2 { name="aws"; version="2.4-2"; sha256="1czlsy64nx6j7h1smgb561yyv3f98pwqwglk77yla4mx3fp14bvq"; depends=[awsMethods gsl]; }; aws_alexa = derive2 { name="aws.alexa"; version="0.1.7"; sha256="0k3kwkmi13j2nrkyi6ahpc98s24idx4m5s4wkqkgqhi8xaljpp7c"; depends=[aws_signature dplyr httr xml2]; }; aws_comprehend = derive2 { name="aws.comprehend"; version="0.2.1"; sha256="0qn4mkdd17c8kmrm4ml7l1x3rzaw3gbykhrj3m0ga53crcqdhqri"; depends=[aws_signature httr jsonlite]; }; aws_ec2metadata = derive2 { name="aws.ec2metadata"; version="0.2.0"; sha256="1lbljg2fp3yh1hwlbmprkc1prw80jv0ycvpg1vggagm68wm5x288"; depends=[curl jsonlite]; }; + aws_iam = derive2 { name="aws.iam"; version="0.1.8"; sha256="1p4w50icfw6mrzr6aazdbh977yvyvsf1yavjscyvv11xf3y9f9j2"; depends=[aws_signature httr jsonlite xml2]; }; + aws_kms = derive2 { name="aws.kms"; version="0.1.4"; sha256="0f9l62g4z68ickzi4if3pw3algb41rn47z9cpxga8aggkclk86l4"; depends=[aws_signature base64enc httr jsonlite]; }; + aws_lambda = derive2 { name="aws.lambda"; version="0.2.0"; sha256="0vp13qw7mw8dz01q30z7bnj47qx9js1zmxasc2n733gi07fdj62f"; depends=[aws_signature base64enc httr jsonlite]; }; aws_polly = derive2 { name="aws.polly"; version="0.1.5"; sha256="1xfx9g5iq1wcl27cmj4ss3y3f5yr1qmma77ki09g3ji2xvd50101"; depends=[aws_signature httr jsonlite tuneR]; }; - aws_s3 = derive2 { name="aws.s3"; version="0.3.20"; sha256="02n4h5y792q9xr5mcv7lylv3p6nqbi754hj63c0vslx759p0yvbc"; depends=[aws_signature base64enc curl digest httr xml2]; }; + aws_s3 = derive2 { name="aws.s3"; version="0.3.21"; sha256="132cczq0ml7lpp2yl6l4p99dn1zihrncnpa6wyad4m9mnr50a8dx"; depends=[aws_signature base64enc curl digest httr xml2]; }; aws_signature = derive2 { name="aws.signature"; version="0.5.2"; sha256="0skibgf2l6n7ql51gnlmvjyfmaqa8ijc9gywmyhvrcj9bix2pydf"; depends=[base64enc digest]; }; aws_transcribe = derive2 { name="aws.transcribe"; version="0.1.3"; sha256="1nni1b935i2ir67lfhcj0106vzr310mk2jvln32gvzbnqxcggz7m"; depends=[aws_signature httr jsonlite]; }; aws_translate = derive2 { name="aws.translate"; version="0.1.4"; sha256="1x6cvpfddgwywsji4ywygmqn3pwy3i1aci9lk4nsrrfkzggwcbpb"; depends=[aws_signature httr jsonlite]; }; @@ -5322,9 +5334,9 @@ in with self; { bacr = derive2 { name="bacr"; version="1.0.1"; sha256="14zr1v4rihx0ra3x0vsb81vsz0g8gzskkdxkg7nhiz835hp2fiy8"; depends=[MCMCpack]; }; badgecreatr = derive2 { name="badgecreatr"; version="0.2.0"; sha256="0mdixklaxky5gs8zm99ky280vxxlbq1mxnaarq6x0d1cb71bzv4l"; depends=[git2r]; }; badger = derive2 { name="badger"; version="0.0.7"; sha256="1djgzn6ixfsdr0v4f3714mv2z2kl776dd2hq670g7bla4lp6344s"; depends=[desc dlstats rvcheck]; }; - bagRboostR = derive2 { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; }; baggedcv = derive2 { name="baggedcv"; version="1.0"; sha256="1rqs4sm6g1anck5s2dxlm1vcmylpphcbs2dpvf1sjki5lrzdq9z4"; depends=[doParallel foreach kedd mclust]; }; baggr = derive2 { name="baggr"; version="0.4.0"; sha256="1cbajifb4gavamj46zs9vk6ihhg6wnv2hn75452bdc2mc4ingn5n"; depends=[bayesplot BH crayon forestplot ggplot2 gridExtra Rcpp RcppEigen rstan rstantools StanHeaders testthat]; }; + baguette = derive2 { name="baguette"; version="0.0.1"; sha256="1n8fjac9jha3g48w1iddqrh54gd4lzv1bs3f747y6jasp99y3vg7"; depends=[butcher C50 dials dplyr earth furrr generics hardhat magrittr parsnip purrr rlang rpart rsample tibble tidyr withr]; }; bahc = derive2 { name="bahc"; version="0.1.0"; sha256="1i5s3qjwwsm94vplkifv72kql8wgiwsc7n1d0707rva92iyv7rcy"; depends=[fastcluster matrixStats]; }; bain = derive2 { name="bain"; version="0.2.4"; sha256="15car9j11s0ywss13g5swf1dxjjc91xmbkvx200mivca9bj6245m"; depends=[lavaan]; }; bairt = derive2 { name="bairt"; version="0.1.2"; sha256="17nc0lp0bzwshik33v0gq5d6nd2gvm4799b7rfiq089zhnzv90kj"; depends=[coda mvtnorm shiny shinyjs]; }; @@ -5360,11 +5372,12 @@ in with self; { basefun = derive2 { name="basefun"; version="1.0-7"; sha256="1g72g77yzf6ji4aglm4hpaqbz5ma2d6y93g7r17066iwyzl0ygn3"; depends=[Matrix orthopolynom polynom variables]; }; baseline = derive2 { name="baseline"; version="1.2-3"; sha256="1d8k5py3wn82nm9pnsnh9ylbdkmkm3j938cdil3igwd3qzkjp63b"; depends=[limSolve SparseM]; }; basetheme = derive2 { name="basetheme"; version="0.1.2"; sha256="0yck4qc7qd406s7kw95xgnfc0pfvzk3ylhkv6mk6l2wbkfm8ldrb"; depends=[]; }; + basf = derive2 { name="basf"; version="0.1.0"; sha256="0v4hhgg8qq4hdih22i3akrjpc4xjnwi81968nyfcv00gy8fd5gjv"; depends=[sf tibble]; }; basicMCMCplots = derive2 { name="basicMCMCplots"; version="0.2.5"; sha256="0sdvhm7n9n67gwymv7whk6f6lfgp74gczisqw90096la566ndd2f"; depends=[]; }; basicTrendline = derive2 { name="basicTrendline"; version="2.0.3"; sha256="10rq9hriyn50b28ikvl0vsvchbkrc0pjzxamq4ix1xd04n4drkl9"; depends=[investr scales]; }; basicspace = derive2 { name="basicspace"; version="0.24"; sha256="1cy226njbax7dcgql89fns4l4w9fq328x3h0vb93l5jk883jgi8h"; depends=[]; }; basictabler = derive2 { name="basictabler"; version="0.3.1"; sha256="1yrrg0mgxfqrn068ggx7b5xqj8wccigb5x6aya2hw3b035cbfprs"; depends=[dplyr htmltools htmlwidgets jsonlite R6]; }; - basket = derive2 { name="basket"; version="0.10.1"; sha256="1hwcfm7hgi6khqkw643n5i40pmr55117b6fh5als91r60k966w2m"; depends=[cli crayon dplyr foreach GenSA ggplot2 ggraph gridExtra igraph itertools RColorBrewer rlang tibble tidygraph tidyr]; }; + basket = derive2 { name="basket"; version="0.10.2"; sha256="0d3qp1p11w9warl4cd9icnygqyiarm6vzsnph2hl09lmsqbghahl"; depends=[cli crayon dplyr foreach GenSA ggplot2 ggraph gridExtra igraph itertools RColorBrewer tibble tidygraph tidyr]; }; bastah = derive2 { name="bastah"; version="1.0.7"; sha256="08xdba16wj0inp0kq2sbcrdr6wj8bwlq7rqnfrzjrz03wxhc5bk0"; depends=[BigQuic foreach glmnet lars MASS Matrix scalreg]; }; batade = derive2 { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; }; batch = derive2 { name="batch"; version="1.1-5"; sha256="0wdgfvk2i542cqg34ikvzwlix09f2jyjb32a0f4zh9vg9nrywswq"; depends=[]; }; @@ -5379,7 +5392,7 @@ in with self; { bayesCT = derive2 { name="bayesCT"; version="0.99.2"; sha256="11y22xg7f47vj47pd5z44g20ff2jjn67s39win0qngl69ii1ph98"; depends=[bayesDP dplyr magrittr msm purrr survival]; }; bayesDP = derive2 { name="bayesDP"; version="1.3.3"; sha256="0g2kw8rsa9s5ahvsr4j363nqs4s49pmbaxgsqrlg8nizjsmj8p49"; depends=[ggplot2 MCMCpack Rcpp RcppArmadillo survival]; }; bayesDem = derive2 { name="bayesDem"; version="2.5-1"; sha256="1cxrqil1p692mbzkcj1fvsx335qyy6c1y43mq48s4shs1hhc69bn"; depends=[bayesLife bayesPop bayesTFR gWidgets gWidgetsRGtk2 RGtk2 wpp2015]; }; - bayesGARCH = derive2 { name="bayesGARCH"; version="2.1.3"; sha256="1480mmzfshchfbfh3x420cq5qblfh59jkl21hkq2jvnwppksdn9w"; depends=[coda mvtnorm]; }; + bayesGARCH = derive2 { name="bayesGARCH"; version="2.1.5"; sha256="01lmpi659cisr7rixz8khaxzyvkvdkvcxjj37x3lw7dpf4ir2535"; depends=[coda mvtnorm]; }; bayesImageS = derive2 { name="bayesImageS"; version="0.6-0"; sha256="1m0az3z8hwaxpqd1ljly9vlp41dp7c7p39r0rx7k9vcs201vlcg8"; depends=[Rcpp RcppArmadillo]; }; bayesLife = derive2 { name="bayesLife"; version="4.1-0"; sha256="1sswnwv4x77sd07d3hpsf3wfd5szrdnc4fni8glzl8rk3y0r3jns"; depends=[bayesTFR car coda data_table hett wpp2019]; }; bayesPop = derive2 { name="bayesPop"; version="8.1-1"; sha256="1xhzind6k23rcgy1iw0bqks6wz77755qs9pw6sqinfi8qbv0ax1l"; depends=[abind bayesLife bayesTFR data_table fields googleVis MortCast plyr reshape2 rworldmap wpp2012 wpp2019]; }; @@ -5398,14 +5411,14 @@ in with self; { bayesloglin = derive2 { name="bayesloglin"; version="1.0.1"; sha256="0j2ziahf6mwsz2gvb1azvdzlmszlpqgr5zqcqa68pxgq947sa2cs"; depends=[igraph]; }; bayeslongitudinal = derive2 { name="bayeslongitudinal"; version="0.1.0"; sha256="0g45ikpnbry1albb3asrzab5z3sy98yf74c64qn02d65xgafifwg"; depends=[LearnBayes MASS mvtnorm]; }; bayesm = derive2 { name="bayesm"; version="3.1-4"; sha256="154glks7rsjkza0sfi1kj7wj727py9sl1ba6sswflwmwc9n226q6"; depends=[Rcpp RcppArmadillo]; }; - bayesmeta = derive2 { name="bayesmeta"; version="2.4"; sha256="0h2b237ml90z9xcbjy5fgc4l8k09210g101cf25mngbz76wxvy87"; depends=[forestplot metafor]; }; + bayesmeta = derive2 { name="bayesmeta"; version="2.5"; sha256="1dvprpmrqnwxhsxb4h972rx7mww6r6w7y5mjw7wm4p1pddzdhqyc"; depends=[forestplot metafor]; }; bayesmix = derive2 { name="bayesmix"; version="0.7-4"; sha256="1qms1nnk2nq3gqr8zf2b9ri4wv8jrxv5i8s087k1rwdvya3k5r9a"; depends=[coda rjags]; }; bayesplot = derive2 { name="bayesplot"; version="1.7.1"; sha256="0sq0ajnm96hmlqf1cv5n2gshh3qdij4n1zbm7qrniz2q6b5aj342"; depends=[dplyr ggplot2 ggridges glue reshape2 rlang tibble tidyselect]; }; bayespref = derive2 { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; }; bayesreg = derive2 { name="bayesreg"; version="1.1"; sha256="12g5sklip3i8fpzrhvbikhgnl6kx8fxb88hfv8f34jy71r3h7zyp"; depends=[pgdraw]; }; bayess = derive2 { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[combinat gplots MASS mnormt]; }; bayest = derive2 { name="bayest"; version="1.1"; sha256="0nl3zq5bp6yqw351vcrzph5y0jn9bml7isf4nsxl7braivalf72n"; depends=[]; }; - bayestestR = derive2 { name="bayestestR"; version="0.5.3"; sha256="1q24qh5p6bz4nbf4546kckh7d518x5pm1yhhbc8fwcnbca4kgqjz"; depends=[insight]; }; + bayestestR = derive2 { name="bayestestR"; version="0.6.0"; sha256="0s7wdmk8avgaqk2b7fcf4bsh13isrkl1q4y7z2y8jhdagxxxnzd1"; depends=[insight]; }; bayesvl = derive2 { name="bayesvl"; version="0.8.5"; sha256="1gb2in8hjiqb3daqz6phn1639i6p2w641kxrm3zh4rm3d6hg6hzr"; depends=[bayesplot bnlearn coda dplyr ggplot2 reshape2 rstan StanHeaders viridis]; }; bayfoxr = derive2 { name="bayfoxr"; version="0.0.1"; sha256="1295296mbjpmd0bg1pfxvyp0az3sry6gsq9ir3l8x64w5a4qrzd5"; depends=[]; }; baymedr = derive2 { name="baymedr"; version="0.1.0"; sha256="0y01s6dpnhnxqqvl15cdxmb5ysb685bbp47xifyp5nz8sjh2pci0"; depends=[rlang stringr]; }; @@ -5418,7 +5431,7 @@ in with self; { bbmle = derive2 { name="bbmle"; version="1.0.23.1"; sha256="0p3l9shbr2846qmw8n0fyzf4j7gmi08aypl82jml3dwh26q1whk0"; depends=[bdsmatrix lattice MASS Matrix mvtnorm numDeriv]; }; bbo = derive2 { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; }; bbreg = derive2 { name="bbreg"; version="1.0.0"; sha256="1v2m7ky9kd16psm9w8njfjzkwc4prvyq0fgbl6i210pjwwv9zvhr"; depends=[betareg expint Formula statmod]; }; - bbricks = derive2 { name="bbricks"; version="0.1.1"; sha256="0y5d01sr9351skvj5xqpiirz3yl3l0sdcmgbz2gb0wfffdqzkllc"; depends=[]; }; + bbricks = derive2 { name="bbricks"; version="0.1.2"; sha256="08ylvxkcpg4imrv6qzpmkxvdckqnib8b9ly47zircyjqmzzdrain"; depends=[]; }; bbw = derive2 { name="bbw"; version="0.1.3"; sha256="1z3an561qh0rfi3jhh1ghsdbg8aimqmf4hpqri2jz39in3p0gwg4"; depends=[car]; }; bc3net = derive2 { name="bc3net"; version="1.0.4"; sha256="15dghd0v1s71h77iw8b49v5h7wcda5mb4540lfyibsdipbashv2h"; depends=[c3net igraph infotheo lattice Matrix]; }; bcROCsurface = derive2 { name="bcROCsurface"; version="1.0-4"; sha256="0bhwwr9pa78a8lhjz2cfbm09jq585p89l6dr2ihpil4q5r8cmsjr"; depends=[boot nnet Rcpp RcppArmadillo rgl]; }; @@ -5474,14 +5487,14 @@ in with self; { bench = derive2 { name="bench"; version="1.1.1"; sha256="1ldqmf0anwgw6b9jgy5mnnjjncayc1x54pvjm6f5gqv0225ksdw3"; depends=[glue pillar profmem rlang tibble]; }; benchden = derive2 { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; }; benchmarkme = derive2 { name="benchmarkme"; version="1.0.3"; sha256="003d97rs0gb6l6hq7d4lxgdngrgb5lii6fxw2n7l50m14hib2sv2"; depends=[benchmarkmeData doParallel dplyr foreach httr Matrix tibble]; }; - benchmarkmeData = derive2 { name="benchmarkmeData"; version="1.0.3"; sha256="1qiw9d93y4m2ch20hsgvf1k3r9dqf60mrdr6cc647m1qv2syjgrk"; depends=[dplyr tibble]; }; + benchmarkmeData = derive2 { name="benchmarkmeData"; version="1.0.4"; sha256="1n4vjkagqlm6kw2hilf4gjfcdjad0bcg652j9nl2ygbq3kdnh1vf"; depends=[dplyr tibble]; }; benchr = derive2 { name="benchr"; version="0.2.5"; sha256="1xh1n41ll50zz3v26i8lg5f92i90rc78ywnl0rczryh621whx80n"; depends=[Rcpp RcppProgress]; }; bender = derive2 { name="bender"; version="0.1.1"; sha256="07npksrj094h884lli0fjvwjc1lhcwzlsk9wx82761mka5xajv4v"; depends=[httr jsonlite R6]; }; benford_analysis = derive2 { name="benford.analysis"; version="0.1.5"; sha256="0y0c7l2r9s7lg9bw4ndcqwisa5l6a2cpydn1vmz88h3yva0l68cg"; depends=[data_table]; }; bentcableAR = derive2 { name="bentcableAR"; version="0.3.0"; sha256="1gjrlv94av9955jqhicaiqm36rrgmy0avxn9y7wbp2s1sbg7fyg7"; depends=[]; }; benthos = derive2 { name="benthos"; version="1.3-6"; sha256="1vywnc6k37gpaq7g59v3qa6619svcmnd8ri5zm5l0ila2s3ccb2c"; depends=[dplyr lazyeval readr]; }; berryFunctions = derive2 { name="berryFunctions"; version="1.18.2"; sha256="0yicwsz6v5nffvw2wmjmc2zhcik7avz3xmj8zhb77xhaq9dazk9s"; depends=[abind]; }; - bestNormalize = derive2 { name="bestNormalize"; version="1.4.3"; sha256="14snx2cv0bmks8lfvmvaggazak8fjch3143922lb3b1pnvcpxhg5"; depends=[doParallel doRNG dplyr foreach LambertW nortest]; }; + bestNormalize = derive2 { name="bestNormalize"; version="1.5.0"; sha256="0af21qxrz1jvkva8lz72h6c2xc5ha0rwiv253b4n1m8w27z39d7h"; depends=[doParallel doRNG dplyr foreach LambertW nortest recipes tibble]; }; bestSDP = derive2 { name="bestSDP"; version="0.1.2"; sha256="1rff6jij9wmlpalzilvid8jvj2pczrchx0yrg0vhy00j64zg6jzs"; depends=[dplyr DT ggplot2 readxl rlist shiny shinyBS shinydashboard shinyjs shinythemes shinyWidgets stringr tidyr]; }; bestglm = derive2 { name="bestglm"; version="0.37.3"; sha256="1zncy958hlwyyxrp6yvq1inq6mpyrbr6cdkf8maijfirr5j8f0ya"; depends=[glmnet grpreg lattice leaps pls]; }; betaboost = derive2 { name="betaboost"; version="1.0.1"; sha256="1zdyzxl2kp2i5lkiz280wz4av9wqklbn25zmq6n4yb6a579yjfn8"; depends=[gamboostLSS mboost]; }; @@ -5497,7 +5510,7 @@ in with self; { bezier = derive2 { name="bezier"; version="1.1.2"; sha256="1vw5128v8h973xwa1fdm9cw2jvrldj87nd55lddlp3qsz3ag4br6"; depends=[]; }; bfast = derive2 { name="bfast"; version="1.5.7"; sha256="0n75minka55rxpvs3qkj0c65ydn1gc3i8lkr2gdyn1adjkl5yn01"; depends=[forecast raster sp strucchange zoo]; }; bfp = derive2 { name="bfp"; version="0.0-40"; sha256="03risiq2b7bc3gwlgpcsy1gvja6n5w1j3kw13s2wrd420hddzk4s"; depends=[Rcpp]; }; - bfsMaps = derive2 { name="bfsMaps"; version="0.9.3"; sha256="10vp4hqha25h8hwc436zpyvryjcnswcrxmmx14cy31vsdfci571s"; depends=[DescTools maptools rgdal rlang sp spdep]; }; + bfsMaps = derive2 { name="bfsMaps"; version="0.9.4"; sha256="0pb081kpmf7040r99szhg7ppvb21cvc9k9bq6lhglinb8wxad9g8"; depends=[DescTools maptools rgdal rlang sp spdep]; }; bfsl = derive2 { name="bfsl"; version="0.1.0"; sha256="1hl53nis8bb1ffgkx91ij9vh680cpkb80y548y67y9w18iyd4aw4"; depends=[]; }; bfw = derive2 { name="bfw"; version="0.4.1"; sha256="1dwl6p70wbgippysl7vk8nv6rc78f6h5xl8fna98zv99qf0ib31c"; depends=[coda MASS runjags]; }; bgeva = derive2 { name="bgeva"; version="0.3-1"; sha256="0qm4xknyab8hdyn3in2hsvm8s062cnmqqf41b5jvax1mi5hs0z8c"; depends=[magic mgcv trust]; }; @@ -5505,15 +5518,15 @@ in with self; { bgmfiles = derive2 { name="bgmfiles"; version="0.0.6"; sha256="10qldfjjq5fx5jrrakdxc8k2pf0vp8ifg18nq56lvx9n28mqigim"; depends=[]; }; bgmm = derive2 { name="bgmm"; version="1.8.4"; sha256="1r8qd4niah18jg0lw3vqq1465likal5j7nvlgnblpidd5svn4a2n"; depends=[car combinat lattice mvtnorm]; }; bgsmtr = derive2 { name="bgsmtr"; version="0.7"; sha256="17706qims9637ppwg0vszkcm6kmvhzyrdihkgigpiv5lknhk2q3m"; depends=[CholWishart coda EDISON glmnet inline LaplacesDemon Matrix matrixcalc miscTools mnormt mvtnorm Rcpp sparseMVN statmod]; }; - bhm = derive2 { name="bhm"; version="1.15"; sha256="1xfm1k3wf4k1c65pd9201c00y4qda3lw9aycjh6q34ixyl6g5jg5"; depends=[coda MASS survival]; }; + bhm = derive2 { name="bhm"; version="1.16"; sha256="097vfpqkkbgps9wkabc1k18fa5vv0shbn1jz6g5l96xv96nvx93w"; depends=[coda ggplot2 MASS survival]; }; bhpm = derive2 { name="bhpm"; version="1.7"; sha256="0fhk2gmghibf7la864dzm19bm76525gzbj03vw0y0zwbv9shbpcp"; depends=[coda]; }; biasbetareg = derive2 { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; }; bib2df = derive2 { name="bib2df"; version="1.1.1"; sha256="0d57883df774qqwpssmly3f1gci32yc5sgwc3x8f2rjih23s1nf6"; depends=[dplyr httr humaniformat stringr]; }; - bibliometrix = derive2 { name="bibliometrix"; version="2.3.2"; sha256="02sikbjnsfd1gxwlbdiafp35af22gmz2p6i951l3syxpcvylxfc8"; depends=[dplyr DT factoextra FactoMineR ggplot2 ggraph ggrepel igraph Matrix networkD3 RColorBrewer reshape2 rio RISmed rscopus shiny shinycssloaders shinythemes SnowballC stringdist stringr]; }; + bibliometrix = derive2 { name="bibliometrix"; version="3.0.0"; sha256="0nblrda78xrvm36v0xmgfm3wgwmmwnzwprw1bgzh8sr2w72cc0ym"; depends=[dimensionsR dplyr DT factoextra FactoMineR ggplot2 ggraph ggrepel igraph Matrix networkD3 pubmedR RColorBrewer rio rscopus shiny shinycssloaders shinythemes SnowballC stringdist stringr tidyr]; }; bibtex = derive2 { name="bibtex"; version="0.4.2.2"; sha256="140hkjzdp3033cvji861rd06z1ixgpnn4n5amygqsmhnixk8ff07"; depends=[stringr]; }; biclique = derive2 { name="biclique"; version="1.0.5"; sha256="1fdf2r1jc2x8yw0fcw7yyjdxz4b870w6y7mr68qixqxwpl6943zq"; depends=[]; }; biclust = derive2 { name="biclust"; version="2.0.2"; sha256="1pk7mvwlg4hkc4cn4w6wr2c192qx03d1xfwlzclk5bw1nmcg483b"; depends=[additivityTests colorspace flexclust ggplot2 lattice MASS tidyr]; }; - biclustermd = derive2 { name="biclustermd"; version="0.2.1"; sha256="0raszh41yag08icxm1g2jbsg4xxkxmc8kn7viz0ns08w3snpvr2v"; depends=[biclust clusteval doParallel dplyr foreach ggplot2 magrittr nycflights13 phyclust tidyr]; }; + biclustermd = derive2 { name="biclustermd"; version="0.2.2"; sha256="00d7lhkcr9bj45zwpm78hdp3qllfisx097dsql3g64v9ix2q44g5"; depends=[biclust clusteval doParallel dplyr foreach ggplot2 magrittr nycflights13 phyclust tidyr]; }; bife = derive2 { name="bife"; version="0.7"; sha256="04wnc6n3wcykzmhrnd2zkj507ymzbw1n8wssi3bwcylanzj59a3h"; depends=[data_table Formula Rcpp RcppArmadillo]; }; bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; }; bigMap = derive2 { name="bigMap"; version="2.1.0"; sha256="0bpnzz3acqn006jk8db5yyvbhl3sq807926igjcxj813i3r0x98r"; depends=[BH bigmemory colorspace RColorBrewer Rcpp RcppArmadillo]; }; @@ -5524,17 +5537,18 @@ in with self; { bigchess = derive2 { name="bigchess"; version="1.7.1"; sha256="1h8i8qmnr9030xr8ld4rk7v6zpxbirw09i71imrrja6lsxr7v3qn"; depends=[ff ffbase processx RSQLite]; }; bigdatadist = derive2 { name="bigdatadist"; version="1.1"; sha256="16gkybwcp9sxqb0iic2fhmc4gndr44ayg14wrfcjvjaj4g5r6xs2"; depends=[FNN MASS pdist rrcov]; }; bigdist = derive2 { name="bigdist"; version="0.1.4"; sha256="1qfnmhyfadmnnagbhdl4jjrb53i1srszf19idp8fy6bczbjq85yi"; depends=[assertthat bigstatsr furrr proxy]; }; - biglars = derive2 { name="biglars"; version="1.0.2"; sha256="17zs25dvlja9ynx2fm5f4nmgkx4mnyqs5iscwsyahr6qigx1rz9x"; depends=[ff]; }; biglasso = derive2 { name="biglasso"; version="1.3-7"; sha256="1s9l8n0a3nv6viyp62k890nhdpfh8jl1ahhsa51x7bx2agdqplhi"; depends=[BH bigmemory Matrix ncvreg Rcpp RcppArmadillo]; }; bigleaf = derive2 { name="bigleaf"; version="0.7.1"; sha256="0hsssz5973vapkmmh9dgzrijyjj1s75iarq3cpfi7ljm4n748qig"; depends=[robustbase solartime]; }; biglm = derive2 { name="biglm"; version="0.9-1"; sha256="1z7h4by457z93k5i6qf5rq7xmd1y2kcd1rq4pv465cd32d4mb2g1"; depends=[DBI]; }; biglmm = derive2 { name="biglmm"; version="0.9-1"; sha256="1f4w59jvq7lq0bh5fs41czw0yc8h56iijbj0hlcq47zyqx6gll9a"; depends=[DBI]; }; + bigmatch = derive2 { name="bigmatch"; version="0.6.2"; sha256="16nmc0n78gzk8x8jhxdilj47gjqqv46sgiivccn5zkv08k1h3jj2"; depends=[liqueueR mvnfast plyr rcbalance]; }; bigmemory = derive2 { name="bigmemory"; version="4.5.36"; sha256="03pg8mxdc7q0249visjmc8bc3xmwxsfg3i2n6higicj4cfz7zihq"; depends=[BH bigmemory_sri Rcpp]; }; bigmemory_sri = derive2 { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; }; bigparallelr = derive2 { name="bigparallelr"; version="0.2.3"; sha256="1xg48zbwhchclc6lc67hc3j1d0b7cajd4whspj68ipm38w8h7l23"; depends=[bigassertr doParallel flock foreach RhpcBLASctl]; }; bigreadr = derive2 { name="bigreadr"; version="0.2.0"; sha256="0d5fgs16kdsl23jqrgz7in63pwhh7bvj7m8pa8nj11v84ji6lagr"; depends=[bigassertr data_table Rcpp]; }; bigrquery = derive2 { name="bigrquery"; version="1.2.0"; sha256="1ggh2gngr5x0g6y7d55y6kvn94anf7qi1bkc28cjmw61hxjq38fb"; depends=[assertthat bit64 curl DBI gargle glue httr jsonlite prettyunits progress rapidjsonr Rcpp rlang tibble]; }; bigsnpr = derive2 { name="bigsnpr"; version="1.3.0"; sha256="1021nxqpl018ph2np50n02szjdlwc71r6yx5sbszd8dxbpb0hfjn"; depends=[bigassertr bigparallelr bigreadr bigstatsr bigutilsr data_table foreach ggplot2 magrittr Matrix Rcpp RcppArmadillo rmio]; }; + bigsparser = derive2 { name="bigsparser"; version="0.1.0"; sha256="1f02hpdw2r6r4sqm16qz1rz0yz8rr42jlhnmigf0kqxvx5r9mwss"; depends=[bigassertr Rcpp rmio]; }; bigsplines = derive2 { name="bigsplines"; version="1.1-1"; sha256="1kf04p2lglzdi1fdryk27nmj2a2jca2ii7ki8vak93sq21isb179"; depends=[quadprog]; }; bigstatsr = derive2 { name="bigstatsr"; version="1.2.3"; sha256="0386hrfjsdnm5ns9kkym8nhzfadcn0shdr3yj77051lwxfngdmbx"; depends=[bigassertr bigparallelr cowplot foreach ggplot2 Rcpp RcppArmadillo rmio RSpectra tibble]; }; bigstep = derive2 { name="bigstep"; version="1.0.3"; sha256="0ygp1vljqqn5vzpjxlv9d6fxxv3bi2kfyqfs1gf0jgxwb9417b82"; depends=[bigmemory magrittr matrixStats R_utils RcppEigen speedglm]; }; @@ -5544,13 +5558,14 @@ in with self; { bigutilsr = derive2 { name="bigutilsr"; version="0.3.0"; sha256="0fjmczbfap20y39vaym01wxl0c4vckqxgjkki9z1s66rglxr6zg9"; depends=[bigassertr bigparallelr nabor Rcpp robustbase RSpectra]; }; bikeshare14 = derive2 { name="bikeshare14"; version="0.1.2"; sha256="1sib83driqv9k4aa131nw3xasslrxvnxkn3mr8kxycxccky025n9"; depends=[]; }; bikm1 = derive2 { name="bikm1"; version="1.0.0"; sha256="1pj41d59n3iflwc4iwnwv6g2vhjs9498k85cml7jwb814xpl9jsj"; depends=[ade4 ggplot2 gtools pracma reshape2]; }; - bild = derive2 { name="bild"; version="1.1-5"; sha256="03has1zi57inicahl52ja006vv5cdndyxfsxp77l6nc3zc6ixna8"; depends=[]; }; + bild = derive2 { name="bild"; version="1.2-0"; sha256="0aygx77fn2w249q6ghpxclhm9xb2ngdzrirldr3lpidg6ivc443v"; depends=[]; }; billboard = derive2 { name="billboard"; version="0.1.0"; sha256="1z3y8dijhc1381y91n5zq305xzm1gpvs0g4mdpfr7zrblpa8ws39"; depends=[tibble]; }; billboarder = derive2 { name="billboarder"; version="0.2.8"; sha256="1n51xildr8h3fqm3yhalgvq6pwlpzbcv230jg7skp8147wmwcmi7"; depends=[ggplot2 htmltools htmlwidgets jsonlite magrittr scales shiny]; }; bimetallic = derive2 { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; }; bimets = derive2 { name="bimets"; version="1.4.3"; sha256="00gbfjp4gshc5izbjlzsc6vib1rfkilbwd89xc4fn51z1hfsvpzl"; depends=[xts zoo]; }; bimixt = derive2 { name="bimixt"; version="1.0"; sha256="0nhszpzjqy8z3vngl5jdzqxzshnn92wgi0ci5n3n5kzi24xkfrzc"; depends=[pROC]; }; binGroup = derive2 { name="binGroup"; version="2.2-1"; sha256="0cb7j6b0s3y56mv1967awwri0kv0rf3sr3vwf9gc2zbjggxi9ffp"; depends=[partitions Rdpack]; }; + binGroup2 = derive2 { name="binGroup2"; version="1.0.2"; sha256="025b087av8zqn7i0ggfdzkkckqql4pc12z4h4r4bw8la2krcdw3z"; depends=[partitions rBeta2009 Rcpp RcppArmadillo Rdpack]; }; binMto = derive2 { name="binMto"; version="0.0-7"; sha256="0rg9rsdy14jx7zjv60krcz1vh0sxqimsai0wynhx2sx0kydw4ngy"; depends=[mvtnorm]; }; binaryGP = derive2 { name="binaryGP"; version="0.2"; sha256="0i4xi0gxk0lamjdygyx0azdp3kfqmva1g20nl3p65w4yx77m88d6"; depends=[GPfit lhs logitnorm nloptr Rcpp RcppArmadillo]; }; binaryLogic = derive2 { name="binaryLogic"; version="0.3.9"; sha256="19ig9qgjjnivfihjy41pc13qlrb95679mmk4zks5lbbri8qi4qxj"; depends=[]; }; @@ -5596,7 +5611,7 @@ in with self; { biomartr = derive2 { name="biomartr"; version="0.9.2"; sha256="12bw15hvjg7fbrq1mwn2xgzbplydy8rlq982hs118mlwdrlqb06q"; depends=[biomaRt Biostrings curl data_table downloader dplyr fs httr jsonlite philentropy purrr R_utils RCurl readr stringr tibble XML]; }; biomod2 = derive2 { name="biomod2"; version="3.4.6"; sha256="0nvxg0a78ynydx3wd16vaildw9x4hiagmx4wkrwkzbyhyi2pgza1"; depends=[abind caret checkmate dismo doParallel dplyr earth ENMeval foreach gbm ggplot2 lattice MASS maxnet mda nnet PresenceAbsence pROC purrr randomForest raster rasterVis reshape rlang rpart sp tidyr]; }; bionetdata = derive2 { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; }; - bios2mds = derive2 { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap cluster e1071 rgl scales]; }; + bios2mds = derive2 { name="bios2mds"; version="1.2.3"; sha256="1k0r3fnkzfczx3wp3m8zpndk6gxca7idsp0z13rw84zjrgqaw6jm"; depends=[amap cluster e1071 rgl scales]; }; bioset = derive2 { name="bioset"; version="0.2.3"; sha256="15vchim8cim42j1if0jars696rh50vmbggr9748q321f6ngm1w1i"; depends=[dplyr magrittr rlang tibble tidyr]; }; biosignalEMG = derive2 { name="biosignalEMG"; version="2.1.0"; sha256="0bbkrfqkmks4z8c7rh0k43lvm71vn3fzrw3kpj012ym77whwkvay"; depends=[signal]; }; biospear = derive2 { name="biospear"; version="1.0.2"; sha256="10y4hbncwiqpxzqvzjrmfgp804zczdgvwpjcj0dzaa0sx1njdzja"; depends=[cobs corpcor devtools glmnet grplasso MASS Matrix mboost pkgconfig plsRcox pROC PRROC RCurl survAUC survival]; }; @@ -5616,6 +5631,7 @@ in with self; { bisque = derive2 { name="bisque"; version="1.0.2"; sha256="0zp2r1vg29q2ds34hhyjv9pz761mi0qncx9p4ilwnfd5yj9pmzwq"; depends=[foreach itertools mvQuad Rcpp RcppArmadillo RcppEigen]; }; bit = derive2 { name="bit"; version="1.1-15.2"; sha256="12xjkkkmflkz8s435by4r23b57cz7z67z84907f6qg99hn1yg0qb"; depends=[]; }; bit64 = derive2 { name="bit64"; version="0.9-7"; sha256="07znvz9vp1nz1y5ljng4qyskvm943cdbmy996s67560ijxzsm6kv"; depends=[bit]; }; + bite = derive2 { name="bite"; version="0.3"; sha256="00sph3pdbb9p21s3263ni4by2ivvya1sbjm9wvwx1rwjr4f31jps"; depends=[ape coda MASS phytools sm vioplot xml2]; }; bitops = derive2 { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d47l37ndnn2w3gv854xav8nnybi6wwv"; depends=[]; }; bitsqueezr = derive2 { name="bitsqueezr"; version="0.1.1"; sha256="0dy180r9cclq46mh0fzc68p5zm9x2z5pa8ajgsk7qycdkyw5v829"; depends=[]; }; biva = derive2 { name="biva"; version="0.1.0"; sha256="1vppvk2n60hhi7p8y8rdyckmh4yk70wqyhbg7rbgh833s66whypw"; depends=[corrgram rpivotTable shiny shinyAce]; }; @@ -5629,7 +5645,7 @@ in with self; { bizdays = derive2 { name="bizdays"; version="1.0.6"; sha256="1av96rj4fllfais9xwh1p8601xvsj0awfh9n2n1x5kzca966h8fq"; depends=[jsonlite]; }; bjscrapeR = derive2 { name="bjscrapeR"; version="0.1.0"; sha256="18chbgiwify272iqf0w4vsqh73wbk12d8m2awc5hbnfqblz3phwd"; depends=[dplyr glue readr tibble]; }; bkmr = derive2 { name="bkmr"; version="0.2.0"; sha256="0dk6dn73bqlvwinn3aginls4533931xcr3h59k0w60yxs3v8yakv"; depends=[dplyr fields magrittr MASS nlme tidyr tmvtnorm truncnorm]; }; - blackbox = derive2 { name="blackbox"; version="1.1.27"; sha256="1mpxil8fr56xiy64177s6m16pygfsr6i1bn4crvnhypz9197in8c"; depends=[foreach geometry lattice MASS nloptr numDeriv pbapply proxy rcdd Rcpp RcppEigen spaMM]; }; + blackbox = derive2 { name="blackbox"; version="1.1.32"; sha256="180y19ls0vdk98smhs9hxpcwg3hwpl62d19zdiml38bjlxmr0kav"; depends=[foreach geometry lattice MASS nloptr numDeriv pbapply proxy rcdd Rcpp RcppEigen spaMM]; }; blaise = derive2 { name="blaise"; version="1.3.4"; sha256="14jk62sw4xs0yip8gh1w2795l8p0ybv83c24ijizxymg16h7i9g7"; depends=[dplyr readr stringr tibble]; }; blandr = derive2 { name="blandr"; version="0.5.1"; sha256="1rqas71hlf000b3z824d8ljshf8bx91bbrzaxxnx5n3chv19w6z6"; depends=[ggplot2 jmvcore knitr R6 rmarkdown stringr]; }; blastula = derive2 { name="blastula"; version="0.3.1"; sha256="0vanb8ghzskicnk7gw7mw67790lw953jf3jgyyhd71qdgz6wjli7"; depends=[base64enc commonmark curl dplyr fs getPass here htmltools httr jsonlite magrittr mime rlang rmarkdown stringr uuid]; }; @@ -5660,7 +5676,7 @@ in with self; { bltm = derive2 { name="bltm"; version="0.1.0"; sha256="1sx4ii65ddvdw45za8j320v1s9d1pz5k2gx979yymhyxi8fmq69z"; depends=[mvnfast Rfast]; }; bmass = derive2 { name="bmass"; version="1.0.3"; sha256="0dafixd996lamn5kfbqpiawblalhyw1gi394j46n2sij2r209d76"; depends=[]; }; bmd = derive2 { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; }; - bmem = derive2 { name="bmem"; version="1.5"; sha256="1miiki743rraralk9dp12dsjjajj3iizcrfwmplf6xas6pl8sfk6"; depends=[Amelia lavaan MASS sem snowfall]; }; + bmem = derive2 { name="bmem"; version="1.7"; sha256="1g259j2jzmbbv98l0w6jc4k18ad0a7hvq2s9jgjdxk8n6ymbx67v"; depends=[Amelia lavaan MASS sem snowfall]; }; bmeta = derive2 { name="bmeta"; version="0.1.2"; sha256="19pm60xpmlanngq4nbibp0n5m98xw24b2xghz92ly31i3mkg2n68"; depends=[forestplot R2jags]; }; bmixture = derive2 { name="bmixture"; version="1.4"; sha256="0dh4qy0snxw7d82v68zymwm5pfvzwdfkyaha6kgh2mvin5k2vaqm"; depends=[BDgraph]; }; bmk = derive2 { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda functional plyr]; }; @@ -5671,7 +5687,7 @@ in with self; { bmrm = derive2 { name="bmrm"; version="4.1"; sha256="1brdd5mhr5282wkdc62lgsqcxw077p69rknjk7fjcs282ahcik2s"; depends=[LowRankQP lpSolve matrixStats Rcpp]; }; bnclassify = derive2 { name="bnclassify"; version="0.4.5"; sha256="1ik3n0g6gw7504ryg5skwygyc545150r297gii4mr2zj252lf069"; depends=[assertthat BH entropy matrixStats Rcpp rpart]; }; bnlearn = derive2 { name="bnlearn"; version="4.5"; sha256="0y452cw1dxm1cik4na1zq6g0zv5ybiwc1cq9sdashq1jacjpc158"; depends=[]; }; - bnma = derive2 { name="bnma"; version="1.0.0"; sha256="1gaplf5lw7x6nfihk6n0kyf67vx4d8zq6mylhwlmfhpfrpiy030k"; depends=[coda ggplot2 igraph rjags]; }; + bnma = derive2 { name="bnma"; version="1.1.1"; sha256="1iwm4843hq07i4r73vaf8pymk0p4m3vpbw3l37l79i4c2ysqgv3h"; depends=[coda ggplot2 igraph rjags]; }; bnnSurvival = derive2 { name="bnnSurvival"; version="0.1.5"; sha256="1d9jmfx0id4lmw122zga7hb52vlfdfqn4amhzpsmhyck99rv92j4"; depends=[pec prodlim Rcpp]; }; bnormnlr = derive2 { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; }; bnpa = derive2 { name="bnpa"; version="0.3.0"; sha256="0qsxk47i7q4d8hbs2xj5k5sf8bqyzhq7rbj4y7w8ljprznlydgl9"; depends=[bnlearn fastDummies lavaan Rgraphviz semPlot xlsx]; }; @@ -5746,7 +5762,7 @@ in with self; { bridgedist = derive2 { name="bridgedist"; version="0.1.0"; sha256="0hqkpwpi3nv6mfhljl65zcflf4wy72ag36hdam6s7kynfj41qz6w"; depends=[]; }; bridger2 = derive2 { name="bridger2"; version="0.1.0"; sha256="0clp42nnbvd01n65azdi2ghp0mfqwsipzdl2d30q04lcvfkdpxrf"; depends=[BSDA data_table ggplot2 outliers plotly shiny shinydashboard]; }; bridgesampling = derive2 { name="bridgesampling"; version="1.0-0"; sha256="1awhvv0v42w2q6llqi1wqpaiv5zx74cqzigdsvphy2jfp8ajw64y"; depends=[Brobdingnag coda Matrix mvtnorm scales stringr]; }; - brinton = derive2 { name="brinton"; version="0.1.5"; sha256="1mc6xksf2zwpgs3q0nx4zz77307ysrsgdk3d96xb9rjxdx7l1xnh"; depends=[forcats GGally ggplot2 glue gridExtra lubridate pander RColorBrewer rmarkdown sm tibble]; }; + brinton = derive2 { name="brinton"; version="0.1.6"; sha256="080z4hs6fkfavrkfg3h6h150y7w5h4rxaag6bwlrrsx9dnwzpb3r"; depends=[forcats GGally ggplot2 glue gridExtra lubridate pander RColorBrewer rmarkdown sm tibble]; }; brio = derive2 { name="brio"; version="1.0.0"; sha256="10gjg205vvdwbw3nr8bfrxy5fzqd27y1fsbyn17xnpk57c66igvc"; depends=[]; }; briqr = derive2 { name="briqr"; version="0.1.0"; sha256="073pdk1094ng4kggzdjvihl791r2qlja1j2w3pfmh2027kn520r8"; depends=[dplyr httr jsonlite magrittr tibble]; }; briskaR = derive2 { name="briskaR"; version="0.1.2"; sha256="1y9sabj7pfgyvv6s3bbvrb0xhjhwc4pcfsfx847kqdajid92qx8w"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; }; @@ -5754,9 +5770,9 @@ in with self; { brms = derive2 { name="brms"; version="2.12.0"; sha256="1699lwkklfhjz7fddawlig552g2zvrc34mqwrzqjgl35r9fm08gs"; depends=[abind backports bayesplot bridgesampling coda future ggplot2 glue loo Matrix matrixStats mgcv nleqslv nlme Rcpp rstan rstantools shinystan]; }; brnn = derive2 { name="brnn"; version="0.8"; sha256="119lxm691ci2bf62jwmbhqsl39xy3jvsi988rr6sdslwaxqyx35b"; depends=[Formula truncnorm]; }; broman = derive2 { name="broman"; version="0.69-5"; sha256="1y1l1p0ddy4a3vwa01yhrc5zcgnl673ar9prkn89pspbdab7km2s"; depends=[assertthat ggplot2 jsonlite RPushbullet]; }; - broom = derive2 { name="broom"; version="0.5.5"; sha256="0n7zd64263kfavdi28rl2bxrsa00c3m4vjhhjdrfwvvmrcxj39fx"; depends=[backports dplyr generics nlme purrr reshape2 stringr tibble tidyr]; }; - broom_mixed = derive2 { name="broom.mixed"; version="0.2.4"; sha256="176817l4d31xbi7yfsjlw287va2wjllxizhi5z3p7x5mi7fkyv2c"; depends=[broom coda dplyr nlme plyr purrr reshape2 stringr tibble tidyr TMB]; }; - broomExtra = derive2 { name="broomExtra"; version="2.5.0"; sha256="0m00sws1gzwydyyqhddgyzsc71q0z7fmnn4c3mc3yfsd6mgbb2jf"; depends=[broom broom_mixed dplyr magrittr parameters performance rlang tibble]; }; + broom = derive2 { name="broom"; version="0.5.6"; sha256="0da3jsb02xckrk6alznicn6l5lnyvdhc64qklyarnd77miqgc1hb"; depends=[backports dplyr generics nlme purrr reshape2 stringr tibble tidyr]; }; + broom_mixed = derive2 { name="broom.mixed"; version="0.2.5"; sha256="121yqj85q6pdnfhbma98a2qli1k1vkx6jdxzfg125m2iahxs9i9y"; depends=[broom coda dplyr nlme plyr purrr reshape2 stringr tibble tidyr TMB]; }; + broomExtra = derive2 { name="broomExtra"; version="4.0.0"; sha256="0sc6cikqcjmm9hr7xzz5l383p822dygsx50g8q358y92m1w2nka8"; depends=[broom broom_mixed dplyr ipmisc parameters performance rlang]; }; brotli = derive2 { name="brotli"; version="1.2"; sha256="07rgdgxh9bvn0qavpclxmkglwyl6ndqasxcs6j12if698dkn976b"; depends=[]; }; brr = derive2 { name="brr"; version="1.0.0"; sha256="050ivnqcaxiyypd1sxfpy6ianhzzmvs6c77ga40g3440cvfigkgw"; depends=[gsl hypergeo pander stringr SuppDists TeachingDemos]; }; brranching = derive2 { name="brranching"; version="0.5.0"; sha256="07dxynk8pbpbsqwaxg9vhpjv4wx8mb1lqxy1nkczjayn1yrpjfm5"; depends=[ape conditionz crul curl phylocomr phytools taxize]; }; @@ -5776,6 +5792,7 @@ in with self; { bst = derive2 { name="bst"; version="0.3-17"; sha256="0x7hv0gx5kn8dwgbkabz7d4dh2l75zdawgdj5zxan13k7b9n3l8y"; depends=[doParallel foreach gbm rpart]; }; bsts = derive2 { name="bsts"; version="0.9.2"; sha256="1v32wsjcfcq0zwklrp0c83xw4h49v49nmjs973mdzh4q05wzlpmp"; depends=[Boom BoomSpikeSlab xts zoo]; }; btb = derive2 { name="btb"; version="0.1.30"; sha256="1f94zzpg3q6ldd436cv1wqpfbpw5f706073wk38a4dkg57dwrbgi"; depends=[BH Rcpp RcppArmadillo RcppParallel sf sp]; }; + btergm = derive2 { name="btergm"; version="1.9.7"; sha256="1p7s5432azz3rdsa7wb2nnlpajq1msard6x3lg95bdgjldnl3nfc"; depends=[boot coda ergm ggplot2 igraph Matrix network ROCR RSiena sna speedglm statnet_common xergm_common]; }; bucky = derive2 { name="bucky"; version="1.0.6"; sha256="01rlx0m6h66y1p9k5llg17qpajjhk2vmhbpwc4i5igf5x5g4clgc"; depends=[lmtest sandwich]; }; buildmer = derive2 { name="buildmer"; version="1.5"; sha256="0m9dz2fb2cwc5l7wnb2dsnqyfkh1ppnlfz9r38ihanav7awsrb17"; depends=[lme4 mgcv nlme plyr]; }; bujar = derive2 { name="bujar"; version="0.2-7"; sha256="1r14mh5j2w87mc6b192hi4qg97si2xv6v826j6c1awh7w3vqbbr9"; depends=[bst earth elasticnet gbm mboost mda modeltools mpath rms survival]; }; @@ -5796,9 +5813,9 @@ in with self; { bvenn = derive2 { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; }; bvls = derive2 { name="bvls"; version="1.4"; sha256="18aaf7kk5mks3a59wwqhm1ckpn6s704l9m5nzy0x5iw0s98ijbm2"; depends=[]; }; bwd = derive2 { name="bwd"; version="0.1.0"; sha256="1ryd5cqbpns9dsis2a9vjg6fcg23284c3dr3j3l18krdshdksfr0"; depends=[]; }; - bwimage = derive2 { name="bwimage"; version="1.2"; sha256="1wm17spxfrgf8kfc6fadri54sdk0b9813s9y4rp2xiwmy5sp6aj2"; depends=[jpeg png]; }; + bwimage = derive2 { name="bwimage"; version="1.3"; sha256="1r5l7z90q2qs92dzp78jj4gf1kg1gc85g6y5rn2z8vxjbvbc5vma"; depends=[jpeg png]; }; bwsTools = derive2 { name="bwsTools"; version="1.1.0"; sha256="06gvw966p2qgkw1c2rdr5hiha47aclb398kjf8sgh5dcka9sv256"; depends=[crossdes dplyr ggplot2 igraph magrittr rlang tidyr]; }; - bysykkel = derive2 { name="bysykkel"; version="0.2.3"; sha256="1cbfmmmw7a37fwgwgfvc8yqxl4dh5n30qcnva9wsm903wccmb2cr"; depends=[glue httr jsonlite lubridate magrittr tibble]; }; + bysykkel = derive2 { name="bysykkel"; version="0.3.1"; sha256="1lvqbax7dvli4265856f9667ckp9g5l4radz2cp0yk0slsjgsdpg"; depends=[glue httr jsonlite lubridate tibble]; }; bytescircle = derive2 { name="bytescircle"; version="1.1"; sha256="0c83d37kijcvr00pc4qqdci14cpbg6988izyjfjk1yliavyc6mwf"; depends=[]; }; bzinb = derive2 { name="bzinb"; version="1.0.4"; sha256="1424lwsm2ra124h0ahbl42szbx500fqkf9ccw9k1688iwxnfg7f2"; depends=[BH Rcpp]; }; c060 = derive2 { name="c060"; version="0.2-5"; sha256="1862lic0vvidbd7s63j65iz4rf70d5337l80vvrbgv8d7fhnxz0y"; depends=[glmnet lattice mlegp penalizedSVM peperr survival tgp]; }; @@ -5836,14 +5853,14 @@ in with self; { calmate = derive2 { name="calmate"; version="0.12.1"; sha256="07sjbq7bcrhal52pdzsb5pfmk6a8a44wg8xn79sv4y5v74c5xaqz"; depends=[aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; }; calpassapi = derive2 { name="calpassapi"; version="0.0.2"; sha256="0i81ffdfw3m15cfbag3l9s245dyhapqhy7adb3228vam3qp3n59b"; depends=[digest dplyr httr jsonlite stringr]; }; camsRad = derive2 { name="camsRad"; version="0.3.0"; sha256="06gar6qan1ka01ngjvbpcv649yvfga697mplwn1x6qnfr4ngb7cs"; depends=[httr xml2]; }; - camtrapR = derive2 { name="camtrapR"; version="1.2.3"; sha256="0sjniyi36ri0yz2bbhc0f8kwghz3wqcp1hi7sf2fx0y6hg33z6xn"; depends=[data_table overlap secr sp]; }; + camtrapR = derive2 { name="camtrapR"; version="2.0.2"; sha256="1bmxcwidzn993qsbz8cq9b9z449yhqd01bjx8imxykl0qy1xbbcq"; depends=[data_table overlap secr sp]; }; cancensus = derive2 { name="cancensus"; version="0.2.1"; sha256="09ck076csz9srz660c1y2lmmvdjk2k14w1bmwizfl5vs3sb1k010"; depends=[digest dplyr httr jsonlite rlang]; }; cancerGI = derive2 { name="cancerGI"; version="1.0.0"; sha256="1chkcyf9m98gbn6b3vmb1baw7kii4g5vxvg2xfi7i6wwdn8sqr65"; depends=[igraph qvalue reshape2 survival systemfit]; }; cancerTiming = derive2 { name="cancerTiming"; version="3.1.8"; sha256="1sfi8q2f5ag7iak0sf9pmqncb89w3gnxdiwjwpivkwhr28ais4mq"; depends=[gplots LearnBayes]; }; - candisc = derive2 { name="candisc"; version="0.8-0"; sha256="0hq5bwvq791rhff2c29xdjbbkcyydii1lbsy05c1fapyn88ir0mi"; depends=[car heplots]; }; + candisc = derive2 { name="candisc"; version="0.8-3"; sha256="0bshi686sad31052glai1wmzxshvafp1vkar7zirds3x737gb0fp"; depends=[car heplots]; }; canprot = derive2 { name="canprot"; version="0.1.2"; sha256="0lc31vw49sc2zsrn52aqqljcc4n79j4i4845sr201ga67w07vrrb"; depends=[CHNOSZ xtable]; }; cansim = derive2 { name="cansim"; version="0.3.5"; sha256="0lqkyq2n8v2y172ihyb9vh3mimrkg2yx2c42cxdaz4p7gqiq7z8r"; depends=[dplyr httr jsonlite purrr readr rlang rvest stringr tibble xml2]; }; - canvasXpress = derive2 { name="canvasXpress"; version="1.27.6"; sha256="0dhfkxmdmk3172pvby6ksysypg5z26byg26ny7wfy7b81rdwhqxk"; depends=[htmlwidgets httr]; }; + canvasXpress = derive2 { name="canvasXpress"; version="1.27.6-1"; sha256="0vk2iddcyc81qgvlw3k31sh2hsjbxsrcb77mxay3s32wkqr7knwa"; depends=[htmlwidgets httr]; }; canvasXpress_data = derive2 { name="canvasXpress.data"; version="1.27.6"; sha256="0kh5g3incl5lv4pb8fd9nzvlvfvyfs3bms78hlf71z8kkag9hzn1"; depends=[]; }; cap = derive2 { name="cap"; version="1.0"; sha256="1pv8hskxjbp589dn7rx80yaa1ld76x1w37bss2fyrys1p3qr78aa"; depends=[MASS multigroup]; }; caper = derive2 { name="caper"; version="1.0.1"; sha256="0md0sngj7wsv2d4d7fmyyz9qqismk3ps9l3qk1blqz1yi19pq124"; depends=[ape MASS mvtnorm]; }; @@ -5874,19 +5891,19 @@ in with self; { carrier = derive2 { name="carrier"; version="0.1.0"; sha256="0bqnwnnjqjk9q0lxq6kkz9s75ss10lfyyywyyi24m8wppxpw1vqc"; depends=[pryr rlang]; }; cartograflow = derive2 { name="cartograflow"; version="1.0.0"; sha256="1sczhvkkrdhcn2phjpsvb86ik0bgyhbgcza7dz6d4qmpl8195bs9"; depends=[dplyr g_data ggplot2 maptools plotly reshape2 rgdal rgeos rlang sp]; }; cartogram = derive2 { name="cartogram"; version="0.2.0"; sha256="1b6jr6sf821xa2cbm09zmnvvai6azh7p9zhz78a4yqpiwdw122sc"; depends=[packcircles sf]; }; - cartography = derive2 { name="cartography"; version="2.4.0"; sha256="1kfzs6dg3kgcs8z08qb22w2ji8fn1g5b4jcii4s76vqmwhs9rdmr"; depends=[classInt curl png raster Rcpp rgeos sf slippymath sp]; }; + cartography = derive2 { name="cartography"; version="2.4.1"; sha256="0pb914zbqvii95mfsqkxs2y22fj620ry2hdqbkbvh5pdq5ls549v"; depends=[classInt curl png raster Rcpp rgeos sf slippymath sp]; }; cartools = derive2 { name="cartools"; version="0.1.0"; sha256="0gc5502373f0c2m2rh6awvyfqrg1wx1f341dm2byk9znba887lgs"; depends=[animation devtools dplyr gapminder ggplot2 knitr rlist rmarkdown roxygen2 sde shiny tidyverse usethis]; }; carx = derive2 { name="carx"; version="0.7.1"; sha256="1qyqsj6pfzzqyaj6076zvgcimhl4cll6sxfb6aigm02rwfkq5gvh"; depends=[matrixStats mvtnorm nlme tmvtnorm xts zoo]; }; caschrono = derive2 { name="caschrono"; version="2.1"; sha256="0p103r6v37c4li1j9x5mdflhx24zil8nhgpdvw5ijrvyixds0nn2"; depends=[Hmisc zoo]; }; cascsim = derive2 { name="cascsim"; version="0.4"; sha256="0n6frnbby1pjpx1z9lzxflmja2mg0dy99c5f7biakpaqi82x5xjb"; depends=[copula fitdistrplus moments R2HTML scatterplot3d]; }; caseMatch = derive2 { name="caseMatch"; version="1.0.8"; sha256="0bp2g0zzcspa6riinsa3bp1qwiip6z058hn2y5mw0w9xah8a685a"; depends=[]; }; casebase = derive2 { name="casebase"; version="0.1.0"; sha256="0216qzyxv44cl9f806lal9lx4n0zzr9csx8ggyjva04h5iiqrq6w"; depends=[data_table ggplot2 survival VGAM]; }; - casen = derive2 { name="casen"; version="0.1.3"; sha256="0yg02n379l38b0hyg7ra1x8bbbi3ai68gzd03ykqr8y5f3s9wbcf"; depends=[dplyr fs glue haven janitor labelled magrittr purrr Rcpp rlang srvyr survey tibble tidyr]; }; + casen = derive2 { name="casen"; version="0.1.4"; sha256="19f52vqrzqd8mmnaf39jmsm5mhydv74gpnb4rxr3n9w07ppb77c9"; depends=[dplyr glue haven janitor labelled magrittr purrr rlang srvyr survey tibble tidyr]; }; casino = derive2 { name="casino"; version="0.1.0"; sha256="07fphn46718gr1zm0xr43mwv7yk697xrc40lxxin315cf3gm0cka"; depends=[crayon dplyr ggplot2 magrittr purrr R6 tibble tidyr]; }; cassandRa = derive2 { name="cassandRa"; version="0.1.0"; sha256="0rwqzxbflxn1iyggm3mq6pkbl61mhk4vdwqwzlwrhrvvr2ib236r"; depends=[bipartite boot dplyr ggplot2 magrittr purrr reshape2 tidyr vegan]; }; - castor = derive2 { name="castor"; version="1.5.5"; sha256="1bsdyi905zafk8av0svw6ql0pg4ns1q7w810xx448k0hpq4v468l"; depends=[naturalsort nloptr Rcpp]; }; + castor = derive2 { name="castor"; version="1.5.7"; sha256="1pkwjpl7mcpn4b6cbpcznjhkblx8g5m1gfyyqjm95zkmjbnqrjj0"; depends=[naturalsort nloptr Rcpp]; }; cat = derive2 { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; }; - cat_dt = derive2 { name="cat.dt"; version="0.1.0"; sha256="1rxq1kaw03c7m2jz4n6v5x4l9fiaqahdrvh9624zapf9mfhky0lm"; depends=[Matrix Rglpk]; }; + cat_dt = derive2 { name="cat.dt"; version="0.2.0"; sha256="1g9058gqkk2ij29aicvvqx9yx7iwh4a58akp6qznppfln4zw9wcb"; depends=[ggplot2 Matrix Rglpk]; }; catIrt = derive2 { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; }; catR = derive2 { name="catR"; version="3.16"; sha256="1w39dxfzqk065v64qzmfamx8p1njsv13a461s6clagbqmhysmzbx"; depends=[]; }; catSurv = derive2 { name="catSurv"; version="1.2.0"; sha256="0z91643grmzgd1qn867c7nk3v38vyy6h7q0k082r6hgnfbl6vx6c"; depends=[BH jsonlite ltm plyr Rcpp RcppArmadillo RcppGSL RcppParallel]; }; @@ -5956,7 +5973,7 @@ in with self; { ceg = derive2 { name="ceg"; version="0.1.0"; sha256="01la7kv0a3inc9vy5x010ysicfiv404bqfgs8csvqixviap9rd74"; depends=[graph Rgraphviz]; }; celestial = derive2 { name="celestial"; version="1.4.6"; sha256="1gls0qvr8mxz79lsmk76v253f747g0cqys8p8wjmpijs8r0pyr4z"; depends=[NISTunits pracma RANN]; }; cellVolumeDist = derive2 { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[gplots minpack_lm]; }; - cellWise = derive2 { name="cellWise"; version="2.1.0"; sha256="1zwpgzwrmpr354bdvqdd5hxx7a39m1057ncqzrk2azki37byhdqg"; depends=[ggplot2 gridExtra matrixStats Rcpp RcppArmadillo reshape2 robustbase rrcov scales svd]; }; + cellWise = derive2 { name="cellWise"; version="2.1.1"; sha256="10cx5nmqcxx6prwkcpv7av10qcl4qygra9sdnbavbvwgvf46l28z"; depends=[ggplot2 gridExtra matrixStats Rcpp RcppArmadillo reshape2 robustbase rrcov scales svd]; }; cellranger = derive2 { name="cellranger"; version="1.1.0"; sha256="16fgi3annn34c3cxi0pxf62mmmmxi21hp0zzlv7bkfsjqy4g4f2x"; depends=[rematch tibble]; }; celltrackR = derive2 { name="celltrackR"; version="0.3.1"; sha256="1mnqaklc3rkx5mm41n99ky11bjs4l0dppapkwfvkyg3a0h0xzsbb"; depends=[ellipse]; }; cem = derive2 { name="cem"; version="1.1.19"; sha256="17i6jp6czjgchg16zndnh828hs8v28x25gy5f8mkzfhc5pfjd8mq"; depends=[combinat lattice MatchIt nlme randomForest]; }; @@ -5973,7 +5990,7 @@ in with self; { censys = derive2 { name="censys"; version="0.1.0"; sha256="0r0yvaidn0qn96hx461415hywsjfgaz9wvvdssx7w97v2ndnk9sy"; depends=[httr jsonlite purrr stringi]; }; centiserve = derive2 { name="centiserve"; version="1.0.0"; sha256="1m6gqz2rk7023340laa5pc0ncbfka2qi9ajvh65fwijd7xvv3n5c"; depends=[igraph Matrix]; }; centralplot = derive2 { name="centralplot"; version="0.1.0"; sha256="1slzvbm1vvgj1gkcx9pb46fz8q55vfyqrxsvx4qzi5kp7d9h4dy2"; depends=[ggplot2]; }; - centrifugeR = derive2 { name="centrifugeR"; version="0.1.3"; sha256="00sdyj7p2dawnp7nbpnpxqzavfr5gbvrbvvqkldm187iclw6bci8"; depends=[pracma]; }; + centrifugeR = derive2 { name="centrifugeR"; version="0.1.4"; sha256="1gky1j5glgigpj21hhm6mkc2xvvb9q8k3y1p4zn40r82lvggpnhz"; depends=[pracma]; }; cents = derive2 { name="cents"; version="0.1-41"; sha256="03ycbd0c8b7danbblaixg6sm7msr9ixkanqswczqa8n2frhjfgj0"; depends=[]; }; cepR = derive2 { name="cepR"; version="0.1.0"; sha256="1yqny6vgsjbrfxlk965pyk38n87ylf4513kbaljmgggrlyaz0qap"; depends=[dplyr httr magrittr purrr tibble]; }; cepp = derive2 { name="cepp"; version="1.7"; sha256="01hvm6586xnb1crvk7brqh3dm2j44ia5lrl5swnf6pb682yskbq0"; depends=[randtoolbox trust]; }; @@ -6067,7 +6084,7 @@ in with self; { cit = derive2 { name="cit"; version="2.2"; sha256="1lf8r3r4zwvs08vl4byhw6rvf54nb7vg83558pi0b5866m7in4sc"; depends=[]; }; citbcmst = derive2 { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; }; citccmst = derive2 { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; }; - citecorp = derive2 { name="citecorp"; version="0.2.2"; sha256="1a5hw9xaa84n847rb8a317svhya1dpfbb79sabaw6m6db4nagm6z"; depends=[crul data_table fauxpas jsonlite]; }; + citecorp = derive2 { name="citecorp"; version="0.3.0"; sha256="0lqxa6qfysrk3rpg9fnsxhrfsd0qsbfxhc3b43090fhlxq9gk3wm"; depends=[crul data_table fauxpas jsonlite]; }; citr = derive2 { name="citr"; version="0.3.2"; sha256="1qbarvafjb8jgkrnrhh6jw7mcglmjwf7dpdiibxf39jkmlhf7las"; depends=[assertthat curl httr miniUI RefManageR rstudioapi shiny shinyjs yaml]; }; ciuupi = derive2 { name="ciuupi"; version="1.1.0"; sha256="0czfmmf62p1vml24s87pdwv52spqycchpkqzwk8vyd4n1z27r5s2"; depends=[functional nloptr pracma statmod]; }; civis = derive2 { name="civis"; version="2.1.2"; sha256="085cy1icqn78vimkjv2zdd5m1qf47qj9hl8vkpd29a948nkiv9xf"; depends=[future httr jsonlite memoise]; }; @@ -6081,7 +6098,7 @@ in with self; { clarkeTest = derive2 { name="clarkeTest"; version="0.1.0"; sha256="0vbb3j9rnh42qyp78a4jykp7p560d0ryfp28xgvxax8h8hr80457"; depends=[]; }; class = derive2 { name="class"; version="7.3-16"; sha256="1jpdgj0lsi60q0mqbhfw809w8d66whix27y6wpdzll6775g3j3ll"; depends=[MASS]; }; classGraph = derive2 { name="classGraph"; version="0.7-5"; sha256="19jb9jr1gfg4karymrbilh0zjrlsczhy2q03x5b0jxnh4ykhxfj8"; depends=[graph Rgraphviz]; }; - classInt = derive2 { name="classInt"; version="0.4-2"; sha256="0w980hrw8sgfdfyd5dsimalq7gwhvqm7507abk7k363pvgks23dv"; depends=[class e1071 KernSmooth]; }; + classInt = derive2 { name="classInt"; version="0.4-3"; sha256="1b1lqhpzxm6b8pza8l3s0cxy74mm9y45lcd3354i2v3bg8m7mply"; depends=[class e1071 KernSmooth]; }; classifierplots = derive2 { name="classifierplots"; version="1.3.3"; sha256="01rvn0jwliyxj7q4cmyv8an5g7fzn6y3sccp8mj6bcqjyblfcfaa"; depends=[caret data_table ggplot2 gridExtra png Rcpp ROCR]; }; classifly = derive2 { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; }; classyfireR = derive2 { name="classyfireR"; version="0.3.3"; sha256="17h9xx5ap77ry50rbpl9gi1hbp1vahdwl99kkqsra79b8aixs2kj"; depends=[cli clisymbols crayon dplyr httr jsonlite magrittr purrr stringr tibble]; }; @@ -6097,7 +6114,7 @@ in with self; { cleanr = derive2 { name="cleanr"; version="1.3.0"; sha256="15icq6p2sxaz5jsdwqlqg7mgal4310vk96w53wzv3dzpzxndz7s4"; depends=[checkmate pkgload rprojroot]; }; clere = derive2 { name="clere"; version="1.2.0"; sha256="0qc26ycycxphrbksk7jb1m6vh66a2zsnw8k4jnazs23sqdg24im9"; depends=[Rcpp RcppEigen]; }; clespr = derive2 { name="clespr"; version="1.1.2"; sha256="1993kd70w48a110im47vcpll0c6nfrm7m33r6l8rzgwnpsmcls8g"; depends=[AER clordr doParallel foreach magic MASS pbivnorm survival]; }; - clhs = derive2 { name="clhs"; version="0.7-2"; sha256="093hqqbmwbrcggqjcz4yiaavvwpv6xi12nc50ca9sg5ajlg4xg65"; depends=[cluster ggplot2 plyr raster reshape2 scales sp]; }; + clhs = derive2 { name="clhs"; version="0.7-3"; sha256="19v617dayirbzb5w6mz79lsjinvr2jjlwdm61pd2pppk099fxgqr"; depends=[cluster ggplot2 plyr raster reshape2 scales sp]; }; cli = derive2 { name="cli"; version="2.0.2"; sha256="1dhkah6jvr96k4h4agcc2rfls75bpjb0j58fzaz3dc0fp3jk8229"; depends=[assertthat crayon fansi glue]; }; cliapp = derive2 { name="cliapp"; version="0.1.0"; sha256="152hllp4iiva2qib79700v1mx1biy8bg4sy496vwq6mi4afvswjy"; depends=[cli crayon fansi glue prettycode progress R6 selectr withr xml2]; }; clickR = derive2 { name="clickR"; version="0.4.47"; sha256="1fs0zh9djgvy8cicvab9i6dji85l1z8wlr6wpfypnwvnblc64qam"; depends=[beeswarm boot flextable lme4 lmerTest officer xtable]; }; @@ -6105,14 +6122,13 @@ in with self; { clifford = derive2 { name="clifford"; version="1.0-2"; sha256="17br7p4zj1cjf1nbwbk0a2jjxj589qgvlnzi6yp4dqlf2g0w01z6"; depends=[BH Rcpp]; }; clifro = derive2 { name="clifro"; version="3.2-2"; sha256="11bfvaf1b1wv83dw8ggj7ldsc6fs8s3gl7jdzyq7l1w7innihp9s"; depends=[ggplot2 lubridate magrittr RColorBrewer RCurl reshape2 scales xml2]; }; clikcorr = derive2 { name="clikcorr"; version="1.0"; sha256="0zdnbcl5q293mmm6pbn4ri7p1q6z6sff74axsb3nyd153v2xamr5"; depends=[mvtnorm]; }; - climate = derive2 { name="climate"; version="0.9.3"; sha256="00gkfwzbfbpyd27w0rygmr7z143mx4dki7rj2631bc63rwj9dbch"; depends=[RCurl XML]; }; + climate = derive2 { name="climate"; version="0.9.4"; sha256="1xbywpk6xls93ipvmpislyrpmzbybg09040gvqg7w5pklnb4bvnf"; depends=[RCurl XML]; }; climateStability = derive2 { name="climateStability"; version="0.1.3"; sha256="1zag722sznr22xid2v1k4a9sh3sr3grfa3wwd2m943zpvyi1sk9a"; depends=[raster]; }; climatol = derive2 { name="climatol"; version="3.1.2"; sha256="0p3nk4n7izj0cmmqd9apa1gix5lfdzp08ydy0n7rkl5kbkmrkb6n"; depends=[mapdata maps]; }; climatrends = derive2 { name="climatrends"; version="0.1.0"; sha256="1jn7xib07n6f9vq614cxahxph4mrs8xbv484npl0702klpk6fjqg"; depends=[nasapower tibble]; }; climdex_pcic = derive2 { name="climdex.pcic"; version="1.1-11"; sha256="01ax0kas43g3h21ixzc80f9gl4m9846gmk8v48rr0gkhcmbcc6jx"; depends=[PCICt Rcpp]; }; clime = derive2 { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; }; climextRemes = derive2 { name="climextRemes"; version="0.2.1"; sha256="1ii79zfdz90agirh3kbq80qk8nib9ks8f42f6y664j4pwk9550w3"; depends=[boot extRemes]; }; - climwin = derive2 { name="climwin"; version="1.2.2"; sha256="02kc8zvmygy9vbcx6lmxz2pyiz0sii3l35m869zr3a8hi9rx000x"; depends=[evd ggplot2 gridExtra lme4 lubridate Matrix MuMIn nlme numDeriv plyr RcppRoll reshape]; }; clinDR = derive2 { name="clinDR"; version="2.2.1"; sha256="02l0k2kl3g9nq072ljiw8dfrrxpsrk7kb5drxb830jy8jdvys3hv"; depends=[doParallel DoseFinding foreach ggplot2 rstan]; }; clinPK = derive2 { name="clinPK"; version="0.9.0"; sha256="1n1m8szd8mxdshwz8l3hfdxi7zrmsah46kxkv7jiffwnfhijfhsm"; depends=[curl testit]; }; clinUtiDNA = derive2 { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; }; @@ -6129,7 +6145,7 @@ in with self; { clpAPI = derive2 { name="clpAPI"; version="1.2.13"; sha256="1v1ff7plr9x212cfsva9xp80q7x3vgkgmwj8qj0cch36p5p4973h"; depends=[]; }; clr = derive2 { name="clr"; version="0.1.2"; sha256="088ks9lrhlyvg3yvlfmb0091yp6qp5bzg9h5r6ryv3bk6y56sajx"; depends=[dplyr lubridate magrittr]; }; clttools = derive2 { name="clttools"; version="1.3"; sha256="0va9k1b4xsb2sgpxzvid6sa8m6b8i3r4kgghclmb78nnrs480cwi"; depends=[]; }; - clubSandwich = derive2 { name="clubSandwich"; version="0.4.1"; sha256="0m0akad9fs1nzwgz1b2kd9ndf40vr780fha32k1i9m3p6cynn9n8"; depends=[sandwich]; }; + clubSandwich = derive2 { name="clubSandwich"; version="0.4.2"; sha256="0zmy42n0j0li3kzkbpwxhv6walvd5cffx1ra3p4ksxxk8fjdlf61"; depends=[sandwich]; }; clue = derive2 { name="clue"; version="0.3-57"; sha256="05rdcahawxlxci3fjxihjvvh33wqpxw50sx015165ab4nh3rsdkf"; depends=[cluster]; }; clues = derive2 { name="clues"; version="0.6.2.2"; sha256="1pvalkpvxjj6qrvffbx0sqvfmcxf6dkzrpklshkx1b2k5s4z8791"; depends=[]; }; cluscov = derive2 { name="cluscov"; version="1.1.0"; sha256="0345v5r6b53243h5bir29v0w77pmwjqjkqfrjnk5j5r1wbh98q1w"; depends=[MASS quantreg]; }; @@ -6138,7 +6154,7 @@ in with self; { clustDRM = derive2 { name="clustDRM"; version="0.1-0"; sha256="1c5z08a15scp3nrwyh0c03pdaawvm3ivbygqpbglwxim7zf73rd2"; depends=[caret doParallel DoseFinding DT foreach IsoGene MCPMod multcomp ORCME ORIClust pheatmap RColorBrewer readr shiny]; }; clustEff = derive2 { name="clustEff"; version="0.1.2"; sha256="1hy7jc8yfg554l439lfrppdsizrdmvxrqf9dwbkjckbvggg54f0k"; depends=[cluster fda qrcm]; }; clustMD = derive2 { name="clustMD"; version="1.2.1"; sha256="0w4s9dab2mm5x0xibyl6s101c64if945a2cmwin9psd95p76mcny"; depends=[ggplot2 MASS mclust msm mvtnorm reshape2 truncnorm viridis]; }; - clustMixType = derive2 { name="clustMixType"; version="0.2-2"; sha256="143xq457migvdfylgyfs19arlmzc9gy360sva49fi56jaz6xqhvr"; depends=[RColorBrewer]; }; + clustMixType = derive2 { name="clustMixType"; version="0.2-5"; sha256="0i3n8w2lsaiak7nz5ypnwnjkr5qq0slklcdpykmaikfmzahihvla"; depends=[RColorBrewer]; }; clustcurv = derive2 { name="clustcurv"; version="2.0.0"; sha256="1zjyf81ifd2sgkgs548iy1awjhjmb541rrrw2pb92cn8ph7z7nc1"; depends=[data_table doParallel doRNG foreach ggfortify ggplot2 Gmedian KernSmooth npregfast RColorBrewer survival tidyr wesanderson]; }; cluster = derive2 { name="cluster"; version="2.1.0"; sha256="055af3yz2biqbsbwm4arwr1yqnj4gicpzv2i6dbfl5pnz2z5byga"; depends=[]; }; cluster_datasets = derive2 { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; }; @@ -6154,7 +6170,6 @@ in with self; { clusterfly = derive2 { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[e1071 plyr reshape2 rggobi RGtk2]; }; clusterhap = derive2 { name="clusterhap"; version="0.1"; sha256="1ic6588mqp146jsvrxlxk449zw4n81xixgrny9r29497z7hg5a1m"; depends=[]; }; clustering_sc_dp = derive2 { name="clustering.sc.dp"; version="1.0"; sha256="0cppka7613cbjjf1q2yp6fln511wbqdhh8d4gs6p0fbq379kzmvc"; depends=[]; }; - clusterlab = derive2 { name="clusterlab"; version="0.0.2.8"; sha256="10z5p79a7nafnljl3s17mw22zasxp45nfbxmhilmyfq6kblxj1zm"; depends=[ggplot2 reshape]; }; clustermole = derive2 { name="clustermole"; version="1.0.1"; sha256="15d7khwg4rjshbkkcqrmw9dk8wy683z8ix5n6xdrlvp0rq3l3n2c"; depends=[dplyr GSVA magrittr rlang tibble tidyr]; }; clustermq = derive2 { name="clustermq"; version="0.8.9"; sha256="128b71h9vxai3j7bbbkx9pm5mabpxdad5qwgxrc8a6sws790yn4b"; depends=[narray progress purrr R6 rzmq]; }; clusternomics = derive2 { name="clusternomics"; version="0.1.1"; sha256="05nkw6h2dvky07fj50myzw5xlkqyiflbn4vwqw8a1q2idv4awi7b"; depends=[magrittr MASS plyr]; }; @@ -6185,13 +6200,13 @@ in with self; { cnbdistr = derive2 { name="cnbdistr"; version="1.0.1"; sha256="05qi41jimslbngjgbwzfda0q25hb28ax79v9yckvrbpgjc8dk990"; depends=[hypergeo]; }; cncaGUI = derive2 { name="cncaGUI"; version="1.0"; sha256="1v55kvrc05bsm1qdyfw3r3h64wlv3s6clxbr8k512lfk99ry42kn"; depends=[MASS plotrix rgl shapes tcltk2 tkrplot]; }; cnmlcd = derive2 { name="cnmlcd"; version="1.2-0"; sha256="1vpn926wf8vkifscnb35y4c74721iar2wykrl50fcv0fg16yggnd"; depends=[lsei]; }; - cnum = derive2 { name="cnum"; version="0.1.0"; sha256="0hiinaa5sp5fvklgdwb3wb58cr7sczd87i4jmp23jm2nx5f4hjs6"; depends=[stringr]; }; + cnum = derive2 { name="cnum"; version="0.1.1"; sha256="03dl8s10jrkj70p4rdxj1d06n2silhfhc0w3jphzll7zx1p8w0pa"; depends=[stringr]; }; coRanking = derive2 { name="coRanking"; version="0.2.1"; sha256="10489vbd917mzz5lw7ygi6q8q5qa7sp5d8xgv1ykn4lfx0avch69"; depends=[]; }; coala = derive2 { name="coala"; version="0.6.0"; sha256="0h7kc12yc90y5i733l6sfd9h12h0a2c7wv9wscjslj18sl3w3ccv"; depends=[assertthat digest R6 Rcpp RcppArmadillo rehh scrm]; }; coalescentMCMC = derive2 { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; }; coalitions = derive2 { name="coalitions"; version="0.6.12"; sha256="11844sz65axj23xwv505jxck37xv3a5n36jpdr9ywvmb19gshar7"; depends=[checkmate dplyr ggplot2 gtools jsonlite lubridate magrittr purrr RCurl rlang rvest stringr tidyr xml2]; }; coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-5"; sha256="1k42vl49kfbllc5d66yn7y9f4jgbkfibmd85nl7hwm0gkgkssg36"; depends=[MCMCpack]; }; - cobalt = derive2 { name="cobalt"; version="4.0.0"; sha256="14g5a0j3lcd61igsi2phhfpcfxwgiq7jlakr9nr4yb5h345zwvx7"; depends=[backports crayon ggplot2 ggstance gridExtra gtable]; }; + cobalt = derive2 { name="cobalt"; version="4.1.0"; sha256="1qpvkxbiw6i3q2kp9hvhxjkz9hyffbdgqzaqf71233nrbimqbg2w"; depends=[backports crayon ggplot2 gridExtra gtable]; }; cobiclust = derive2 { name="cobiclust"; version="0.1.0"; sha256="068cqrhx7lxsvcjb62rgrca7y20cybz4445bl1qc6k16ca4bh0m9"; depends=[cluster]; }; cobs = derive2 { name="cobs"; version="1.3-4"; sha256="0hiw5smk6kgk0gb9840kcqkhkybl7n30s77xhjc395x09izbgix1"; depends=[quantreg SparseM]; }; coca = derive2 { name="coca"; version="1.0.4"; sha256="1mk6vhy3s243rn4bwfr72900x0fcfs729k179kc81zvjj3v7m0h9"; depends=[caret cluster fpc glmnet Matrix nnet pheatmap RColorBrewer]; }; @@ -6201,7 +6216,7 @@ in with self; { cocorresp = derive2 { name="cocorresp"; version="0.4-1"; sha256="10prxmc80yk0l5v1gcy92clmjvjywimypqpzjb6gh5pipsqr4swr"; depends=[vegan]; }; cocron = derive2 { name="cocron"; version="1.0-1"; sha256="0dl14y9v9kndy5gzhhbhq3f31ja724y1hra40givy6bij7h2cj30"; depends=[]; }; coda = derive2 { name="coda"; version="0.19-3"; sha256="1mn50bshky968gn4nf6vnkaa768fnvm1xmhkms7szwdw9341zpyk"; depends=[lattice]; }; - coda_base = derive2 { name="coda.base"; version="0.2.1"; sha256="1ammzzh4w8g5d6c1wfqg7pglrc5lq8sr3qzgf1bjsrm9p5ysw1li"; depends=[MASS Rcpp RcppArmadillo]; }; + coda_base = derive2 { name="coda.base"; version="0.2.2"; sha256="166j7bf7gm28176ajm9gyl56ncwhlxrjizbp3ah6ssp7a72x2xyi"; depends=[Rcpp RcppArmadillo]; }; codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; }; codebook = derive2 { name="codebook"; version="0.8.2"; sha256="1glzrvffhrgya6617m8zgbf2r8v1y1wpml11ayanz4s4k2xzzlmc"; depends=[dplyr DT forcats future ggplot2 glue haven htmltools jsonlite knitr labeling labelled likert lubridate miniUI pander psych purrr rio rlang rmarkdown rstudioapi shiny skimr stringr tibble tidyr tidyselect userfriendlyscience]; }; codemetar = derive2 { name="codemetar"; version="0.1.8"; sha256="1zqpxh0hx7jh1xki1sx9bs5a30hv4gfaqqlnd630a5n68hghjmg2"; depends=[commonmark crul curl desc gh git2r glue jsonlite magrittr memoise pingr pkgbuild purrr readr sessioninfo stringi stringr tibble usethis whisker xml2]; }; @@ -6209,8 +6224,7 @@ in with self; { codetools = derive2 { name="codetools"; version="0.2-16"; sha256="00bmhzqprqfn3w6ghx7sakai6s7il8gbksfiawj8in5mbhbncypn"; depends=[]; }; codified = derive2 { name="codified"; version="0.2.0"; sha256="1hmw7yrw4qx8v9rkqqvqf4013s9whq5qlgwz7v882j4slpvm6gb1"; depends=[checkmate dplyr kableExtra knitr magrittr readr rlang tibble tidyr]; }; codingMatrices = derive2 { name="codingMatrices"; version="0.3.2"; sha256="0kldx2h3mksw4644d0ask6ij7i63rrwk0njlsvkbdjz3bf7pdv1b"; depends=[fractional Matrix]; }; - codyn = derive2 { name="codyn"; version="2.0.3"; sha256="1jmnkipalxfy8dwgskrx3npcmb717bpvkpx97md44xhh8l7mmk2s"; depends=[assertthat permute vegan]; }; - coefficientalpha = derive2 { name="coefficientalpha"; version="0.5"; sha256="0pfw64z7f0gp415nn7519rcw829a7wnwnjx94sc55jsvgb1di3kc"; depends=[lavaan rsem]; }; + coefficientalpha = derive2 { name="coefficientalpha"; version="0.7"; sha256="0li1js501sa8m0ba76ymn4lz5y4np7kf96gnxz9kypg50kd58yis"; depends=[lavaan rsem]; }; coefplot = derive2 { name="coefplot"; version="1.2.6"; sha256="036njf2xwmjvyamanb7nfn2n09ps2rdgk3zrxn6khwp8ly245nps"; depends=[dplyr dygraphs ggplot2 magrittr plyr purrr reshape2 tibble useful]; }; coenocliner = derive2 { name="coenocliner"; version="0.2-2"; sha256="0r4h0r3av2d1cxmjpwaabjn807626pzqnra2x542wdnnf7h8nmdf"; depends=[]; }; coenoflex = derive2 { name="coenoflex"; version="2.2-0"; sha256="06f75spl4wkbgicm0bksnid2lb1gkvi05915wn5y4km45d82fkkr"; depends=[mgcv]; }; @@ -6219,7 +6233,7 @@ in with self; { cofeatureR = derive2 { name="cofeatureR"; version="1.1.1"; sha256="1awfrlnbpw9ivfvaahznx6dx5jp8ln0154vh2pznp520q59h1mbs"; depends=[dplyr ggplot2 lazyeval tibble]; }; coga = derive2 { name="coga"; version="1.1.0"; sha256="0p2mdia89gj7w0j33qxil1l2zg6civj18i3pqym7aijzz1fgwnzp"; depends=[cubature Rcpp RcppGSL]; }; cogmapr = derive2 { name="cogmapr"; version="0.9.1"; sha256="1iz776avw05a0lcna78fycixacby4bjf8ar1jazsf34yss6zka23"; depends=[car dplyr ggplot2 graph magrittr Rgraphviz tidyr]; }; - cognitoR = derive2 { name="cognitoR"; version="1.0.0"; sha256="0nyfsfnmwx3a19imr3r49c4ga6gb13x2w5czn1n0qy0qsp5881w0"; depends=[base64enc config dplyr httr jsonlite shiny shinyjs yaml]; }; + cognitoR = derive2 { name="cognitoR"; version="1.0.1"; sha256="1qd3hsblciqnjysx3hqdkwmzpl2zf72jiwywicjpbpv1i703c4wx"; depends=[base64enc config dplyr httr jsonlite shiny shinyjs yaml]; }; cohorttools = derive2 { name="cohorttools"; version="0.1.2"; sha256="0hfpl2dm5ykagwmmdmk0hpbkzzd0zqmf9andm510safjp4mlbcy0"; depends=[cmprsk DiagrammeR DiagrammeRsvg Epi ggplot2 rsvg survival]; }; coil = derive2 { name="coil"; version="1.2.1"; sha256="0s11v1hcksljpxnlkmrlnnamx4mlsck45hsjm4xlhc1zb7x9kqf5"; depends=[ape aphid seqinr]; }; coin = derive2 { name="coin"; version="1.3-1"; sha256="0qi03fyqw42a2vnqcia5l2m1mzyarj2q1iblknx9n19bdsd53qjx"; depends=[libcoin matrixStats modeltools multcomp mvtnorm survival]; }; @@ -6234,13 +6248,12 @@ in with self; { collapsibleTree = derive2 { name="collapsibleTree"; version="0.1.7"; sha256="0b65pbp1wnpsrayqi630ds4r98jvcvynnlp6wxdqrnnr9nzw5343"; depends=[data_tree htmlwidgets]; }; collateral = derive2 { name="collateral"; version="0.4.2"; sha256="1i1fzvm838s2cfmxw654vwmp9rl9f9985vjildkxyx2f6571sjfm"; depends=[crayon pillar purrr]; }; collectArgs = derive2 { name="collectArgs"; version="0.4.0"; sha256="0fz5w1xsxiddzrwahrg50px4igyhd4plq655jaix6grancs7kvix"; depends=[magrittr]; }; - collections = derive2 { name="collections"; version="0.2.5"; sha256="195i6kxy3h0q99jr5hi20m15zpk8fgb17126w7qyxfq7mhrsvhmh"; depends=[xptr]; }; + collections = derive2 { name="collections"; version="0.3.0"; sha256="01mgkfl849gy0xzs3ccbkg4pmpzs6f1n953izrcf5797qg8xqkr5"; depends=[]; }; collector = derive2 { name="collector"; version="0.1.3"; sha256="1yn6gzccdbp7n4qnwqpv66617qldjabzrlww41v6wqn9b7qyr0ii"; depends=[dplyr EnvStats evaluator flextable ggplot2 ggpubr magrittr officer purrr quanteda readr rlang rmarkdown stringr tibble tidyr xaringan]; }; collidr = derive2 { name="collidr"; version="0.1.2"; sha256="1b8yy0p1r4gs6azcl1aqkny3hws5hhl9bvsrkrhgk2r2xni9sk6f"; depends=[dplyr jsonlite stringr]; }; collpcm = derive2 { name="collpcm"; version="1.1"; sha256="14rlipdww5sm1ijp2ggpnd23m14qh10zm99cfq1w0kky9jfl0fkn"; depends=[latentnet network vegan]; }; colmozzie = derive2 { name="colmozzie"; version="1.1.1"; sha256="0sn7dqg7rnddnmdb10c6scws6kgi1lz4lw8nc698x63z431ah1p8"; depends=[]; }; coloc = derive2 { name="coloc"; version="3.2-1"; sha256="0sm2mji8bihvcshkh9g18sgbwznhh8j4hip50rk7ckac3vc8y75h"; depends=[BMA data_table ggplot2 reshape snpStats]; }; - colocalization = derive2 { name="colocalization"; version="1.0.1"; sha256="0ax560r5f629zv8rfa91ynx8g3kcn5ga553k5svircl21n65zb1y"; depends=[ggplot2]; }; colocalized = derive2 { name="colocalized"; version="0.2.0"; sha256="1q98wfqk0p9p92jgjf8liamz6grzwy6h57k7681fm07wfnyr268g"; depends=[doParallel foreach purrr]; }; colorBlindness = derive2 { name="colorBlindness"; version="0.1.6"; sha256="18922caddz7c5dj5mbyl7qihgsnk384w31k17rwngm5hckz2d5yi"; depends=[colorspace cowplot ggplot2 gridGraphics gtable]; }; colorRamps = derive2 { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; }; @@ -6270,6 +6283,7 @@ in with self; { combiter = derive2 { name="combiter"; version="1.0.3"; sha256="11pcvrpbvkzkjwks2z6ww7s9d5fkh8zl0jw52a5ya3y1wkqcs3n6"; depends=[iterators itertools Rcpp]; }; comclim = derive2 { name="comclim"; version="0.9.5"; sha256="1s6zh16j0q2n7gkvhd4bym9w3hyg4b9n5lpgspqp2nlygdl6jxxb"; depends=[]; }; cometExactTest = derive2 { name="cometExactTest"; version="0.1.5"; sha256="0ar9axm9cd1wd937xcmsmd7xqilnfyab8gsrpkiqpc3fjh86qyrp"; depends=[dplyr]; }; + cometr = derive2 { name="cometr"; version="0.1"; sha256="00ikz2096bq8fh2sy15bgnwq0b1rbjj49yc0xs9v3xsr6ghsjkph"; depends=[callr httr jsonlite R_utils R6 yaml]; }; comf = derive2 { name="comf"; version="0.1.9"; sha256="0n9893nli8rf9g5c9yyqrhbk3xsbvynv1vlpn03i5xs05aj3r88h"; depends=[plyr reshape]; }; commandr = derive2 { name="commandr"; version="1.0.1"; sha256="1d6cha5wc1nx6jm8jscl7kgvn33xv0yxwjf6h3ar3dfbvi4pp5fk"; depends=[]; }; commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; }; @@ -6294,10 +6308,9 @@ in with self; { complexity = derive2 { name="complexity"; version="1.1.1"; sha256="1lpsvry88jpqfw0wkdlwjzkqjl17f4adjcqvq0dwk483mi54xnfk"; depends=[combinat shiny]; }; complexplus = derive2 { name="complexplus"; version="2.1"; sha256="16w9v7d1ckavqmr86l34frr37pkvdn0iqnb17ssb8xaggns5lgqx"; depends=[expm Matrix]; }; complmrob = derive2 { name="complmrob"; version="0.7.0"; sha256="0dvkc5y53041agkjz3rl898hkq686pxzr6flf2qx1g3jbza3pk1y"; depends=[boot ggplot2 robustbase scales]; }; - compositions = derive2 { name="compositions"; version="1.40-4"; sha256="0z40llyij3cc80ac1vzzrpykk6ysp89bn6dyyh40fbnc4anwx69a"; depends=[bayesm robustbase tensorA]; }; + compositions = derive2 { name="compositions"; version="1.40-5"; sha256="0l9ayz2nb2wqhl7v9hkfl7pd950ba0h6hma8zqncbcxh6xh2k7l7"; depends=[bayesm robustbase tensorA]; }; compound_Cox = derive2 { name="compound.Cox"; version="3.19"; sha256="1wl8jg916567nk0wy37in6syh7z2rw70v5jm7s0w3ifiqs5v7nzb"; depends=[numDeriv survival]; }; comprehenr = derive2 { name="comprehenr"; version="0.6.7"; sha256="0c0wid4lch7yrz41b8n773hy4zj80sfb1lhy4pclvlsjdr5zryk6"; depends=[]; }; - compstatr = derive2 { name="compstatr"; version="0.2.0"; sha256="07kak4dc1q44m58wb7ps4bf5ikcnjfkvd7fn1mxfxvqljrdy6978"; depends=[dplyr fs httr janitor lubridate purrr readr rlang rvest sf stringr tibble tidyr xml2]; }; compute_es = derive2 { name="compute.es"; version="0.2-5"; sha256="00133s3l3g70xrfnxgxhvbjr8izvaj9h0c73iaiyjmlgj84x69m8"; depends=[]; }; comtradr = derive2 { name="comtradr"; version="0.2.2"; sha256="177gnmgwqns65z5y9nw4xp8qmw5z70454zb54jw1879xrgfsrciz"; depends=[httr jsonlite magrittr purrr]; }; con2aqi = derive2 { name="con2aqi"; version="0.1.0"; sha256="1gdd1y6xg26fz199hvryzsnp16qbsz13chqqxyxnkgrai1l72mhf"; depends=[]; }; @@ -6306,9 +6319,9 @@ in with self; { concaveman = derive2 { name="concaveman"; version="1.0.0"; sha256="0b6a37h4k3p879gp4qp3297q0fzq3yn79yhkwjrcxhcl86sg5nb6"; depends=[dplyr jsonlite magrittr sf V8]; }; conclust = derive2 { name="conclust"; version="1.1"; sha256="1k9y1mniy7s51dmm5ia693k72s2vxk5bznxxf74s7mx9n3mg2i8r"; depends=[]; }; concor = derive2 { name="concor"; version="1.0-0.1"; sha256="0hjyvi6p16cyrmq0bq7fph1r5f3adp7zpf123wkm5bkjnc5122k0"; depends=[]; }; - concordance = derive2 { name="concordance"; version="1.6"; sha256="0pb4mndrh1nimf59ajjcydlvc79nm6p7c219iymkn0b1hbrnx7lf"; depends=[]; }; + concordance = derive2 { name="concordance"; version="2.0.0"; sha256="1xlm0c91bsbij8dr23fh781c6bg8l74kma6x7nnapkpm7jim279x"; depends=[dplyr purrr rlang stringr tibble tidyr]; }; concreg = derive2 { name="concreg"; version="0.6"; sha256="1ncs9cpviv5kd49hahlhi7wn2yk70msi22qv8fw91hf81ccimlp2"; depends=[survival]; }; - concurve = derive2 { name="concurve"; version="2.3.0"; sha256="1bjdlr3hpnv69g5jg2y18zkly0al3g9qj8cq0dlpk7x6930imqx7"; depends=[bcaboot boot dplyr flextable ggplot2 knitr MASS metafor officer pbmcapply ProfileLikelihood rlang scales survival survminer tibble tidyr]; }; + concurve = derive2 { name="concurve"; version="2.5.0"; sha256="1zmm3y1abm6gjvl9vjmsi2rn2vxgy4qp9crmlrhx3yzij58m15sq"; depends=[bcaboot boot cowplot dplyr flextable ggplot2 knitr lme4 MASS metafor officer patchwork pbmcapply ProfileLikelihood scales survival survminer tibble tidyr]; }; cond = derive2 { name="cond"; version="1.2-3.1"; sha256="1j0gf28mg2j6ahs83nk662bix1lb2c9184vn8sblw433zxqaa2ny"; depends=[statmod survival]; }; condGEE = derive2 { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; }; condMVNorm = derive2 { name="condMVNorm"; version="2020.1"; sha256="115pxnff2ckdxx0avbs0hfdhh1sljiz1y6h7ggd5hidrxd3559m4"; depends=[mvtnorm]; }; @@ -6329,7 +6342,7 @@ in with self; { configural = derive2 { name="configural"; version="0.1.1"; sha256="0xn52lg0fzd0m0k9sw90lv8vzhlp6knaya4crzl6rhfihyv9bq3m"; depends=[cli crayon dplyr stringr]; }; confinterpret = derive2 { name="confinterpret"; version="1.0.0"; sha256="0qldaqpx7kpk71zfwv465jrscwzc9w3xfv52i4h01k9aw3q6m8ja"; depends=[]; }; conflicted = derive2 { name="conflicted"; version="1.0.4"; sha256="0xp04cdvmp3b1phazhmjqn0vmax1b2218xsb5854ffv43m7qvrra"; depends=[memoise rlang]; }; - conflr = derive2 { name="conflr"; version="0.1.0"; sha256="1ppmg3n0r5wlnhw60lkbbfdakq3q79zf2vsnzh0wjmdb34w3p535"; depends=[askpass commonmark curl glue httr knitr miniUI purrr R6 rlang rmarkdown rstudioapi shiny stringi xml2]; }; + conflr = derive2 { name="conflr"; version="0.1.1"; sha256="1bjdmvi0n8746g7dxwgzh3fi33sq4bgfr0nd3nqd2caj8ryi2gv9"; depends=[askpass commonmark curl glue httr knitr miniUI purrr R6 rlang rmarkdown rstudioapi shiny stringi xml2]; }; conformalClassification = derive2 { name="conformalClassification"; version="1.0.0"; sha256="03v6xbgipb97byarqj0d38z9yb2g54mkkw343jxmi2j058z26yw7"; depends=[doParallel foreach mlbench randomForest]; }; confoundr = derive2 { name="confoundr"; version="1.2"; sha256="000vf828qv04pplx8yc8q3mafxf4g0axip6z5zbsj2581yxv9jjh"; depends=[dplyr ggplot2 gridExtra magrittr purrr rlang Rmpfr scales stringr tidyr]; }; confreq = derive2 { name="confreq"; version="1.5.5-0"; sha256="1aww0i9mh08y05941di40f9jagy7s48rw0cs7w55gsyffl5yy1ir"; depends=[gmp]; }; @@ -6340,11 +6353,12 @@ in with self; { conjurer = derive2 { name="conjurer"; version="1.1.1"; sha256="0rxbmr2s270sy7rbyb876sidbcjzv0g99s1n0w6pd6aymmf0715c"; depends=[]; }; connections = derive2 { name="connections"; version="0.1.1"; sha256="08fbyzyp26nh1a46p0zi3q0wzgl0cd9bjp4lhw2bwv1bv7yayamp"; depends=[DBI dbplyr dplyr pins rscontract uuid]; }; conover_test = derive2 { name="conover.test"; version="1.1.5"; sha256="0f1p10klidk1xic1wd48j9rjh2fb3z6pfjx4y021lglx1w3av68k"; depends=[]; }; + conquer = derive2 { name="conquer"; version="1.0.0"; sha256="0yqk3hl0rgb71zywc8lvvdrhmzh7aij6gqk83pf3ywd69va0mq38"; depends=[matrixStats Rcpp RcppArmadillo]; }; conquestr = derive2 { name="conquestr"; version="0.5.1"; sha256="1ha2jxh4xi39w4cznbdbbdhq5s5csmbf4p4j7blr80g72b46jvcp"; depends=[Rcpp reshape]; }; constants = derive2 { name="constants"; version="0.0.2"; sha256="1j9d52riwx7v1ppfdw0x517j7xh92qgskd4mj5yk9qa233brcwyy"; depends=[]; }; constellation = derive2 { name="constellation"; version="0.2.0"; sha256="1d49rnyf2z3bvx158nsmgmb0x7xcgxl9f8y98pwg5wlqck7af99q"; depends=[data_table]; }; constrainedKriging = derive2 { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[RandomFields rgeos sp spatialCovariance]; }; - contact = derive2 { name="contact"; version="1.2.1"; sha256="1xh6m6qsz4lhjy2mhzygxwjxp5d94y3sp6sfnhdp395y56zxp211"; depends=[ape data_table doParallel foreach geosphere igraph lubridate raster rgdal rgeos sf sp]; }; + contact = derive2 { name="contact"; version="1.2.2"; sha256="0pxjz6wra5kb2z5xahsdlnfhbiybr2dmp818vfvbrb0sp9ca4wkc"; depends=[ape data_table doParallel foreach geosphere igraph lubridate raster rgdal rgeos sf sp]; }; container = derive2 { name="container"; version="0.3.0"; sha256="128fj97mx52kap299fmhn3whnaismsd4cq3zqpbfvwxx2ii4fd33"; depends=[R6]; }; contextual = derive2 { name="contextual"; version="0.9.8.3"; sha256="0mpbbg13ba5lwsh6rcy5g8vbfycv3182bqkgw66rn3r8fvkmy516"; depends=[data_table doParallel foreach Formula iterators itertools R_devices R6 rjson]; }; contfrac = derive2 { name="contfrac"; version="1.1-12"; sha256="0sq5c7ny235yrkv2xc4insgxby6rvzc1qsj8h301cd2if3lwbgwm"; depends=[]; }; @@ -6354,7 +6368,7 @@ in with self; { contribution = derive2 { name="contribution"; version="0.1.0"; sha256="06y6qa7c0zifg6fqfpwry4z367ckiyk9v09n8cqc6q98c3ddkwj3"; depends=[dplyr ggplot2 gh magrittr rlang tidyr]; }; control = derive2 { name="control"; version="0.2.5"; sha256="02s8h5kwpzfrivx3ign84gwlybkcs03ibawyxdny9zz5yhb7x3bs"; depends=[expm Matrix pracma signal]; }; controlTest = derive2 { name="controlTest"; version="1.1.0"; sha256="19r8nvi35ldzgayifskjj706fv76hv6sj68yvggybp27rgyqbjfl"; depends=[survival]; }; - convergEU = derive2 { name="convergEU"; version="0.4.1"; sha256="0ycp26h54acvhzivkp5065h3bmd6jg6v5giqjashj9lzpr8ixihc"; depends=[broom caTools devtools dplyr eurostat formattable ggplot2 ggpubr gridExtra kableExtra knitr magrittr purrr readr readxl rlang rmarkdown stringr tibble tidyr tidyverse]; }; + convergEU = derive2 { name="convergEU"; version="0.4.2"; sha256="1zdfhfzpgpjx24gzz9cn98nbn42c7r5iq2fr6bwpn1lniw3hgx27"; depends=[broom caTools devtools dplyr eurostat formattable ggplot2 ggpubr gridExtra kableExtra knitr magrittr purrr readr readxl rlang rmarkdown stringr tibble tidyr tidyverse]; }; convertGraph = derive2 { name="convertGraph"; version="0.1"; sha256="1jsrygj6ydzc0nzyzaq95j4blqavj7dqz182vgm1ckv8an3if0jx"; depends=[]; }; convertr = derive2 { name="convertr"; version="0.1"; sha256="1y9aq5in2qv1323amblmq3g22flpqvpkgkrw12kahg56mqf2b3iq"; depends=[DT miniUI rstudioapi shiny]; }; convevol = derive2 { name="convevol"; version="1.3"; sha256="1b0lygbrdm6rqascck5iwjnm248lklc4cxr71qlgand5jsblpcnn"; depends=[ape cluster geiger MASS phytools]; }; @@ -6369,6 +6383,7 @@ in with self; { copBasic = derive2 { name="copBasic"; version="2.1.5"; sha256="0p7ngjpfhl4mjrcjmadik2ly5zzyjfafywjmaxza7frgrj6bflf4"; depends=[lmomco randtoolbox]; }; copCAR = derive2 { name="copCAR"; version="2.0-2"; sha256="032gphv64v2mmy63q86qgpa31i36ix6fkjsdxmzgqyxcyzgb0jcy"; depends=[mcmcse numDeriv Rcpp RcppArmadillo spam]; }; cope = derive2 { name="cope"; version="0.2.3"; sha256="1r02nb6wy25ixhdcbqqz167s7ny3hydpxfxry5ar4136qvcamgyy"; depends=[abind fields maps MASS Matrix mvtnorm nlme]; }; + copent = derive2 { name="copent"; version="0.1"; sha256="100mkig645gis01w7cbr1hyn7kmiwi5avmwknymimchqwyf026m6"; depends=[]; }; coppeCosenzaR = derive2 { name="coppeCosenzaR"; version="0.1.3"; sha256="1chwsfyaf5rmlsypr43n7px8b2220dfa5mzcriq1swylgbx4181l"; depends=[]; }; coprimary = derive2 { name="coprimary"; version="1.0"; sha256="0pjln9p5lzv6wl5xrz0kb90hnjlnp7ch2kvh054nxdbmlxv5akc3"; depends=[digest gsDesign plyr proto]; }; cops = derive2 { name="cops"; version="1.0-2"; sha256="0ifp3cai490lw6dnyyjj4822x8g2mswhaamnw5ljwnxdbmjwhhrw"; depends=[cmaes cordillera crs dfoptim GenSA MASS minqa NlcOptim nloptr pso rgenoud rgl Rsolnp scatterplot3d smacof subplex]; }; @@ -6393,14 +6408,14 @@ in with self; { corpcor = derive2 { name="corpcor"; version="1.6.9"; sha256="1hi3i9d3841snppq1ks5pd8cliq1b4rm4dpsczmfqvwksg8snkrf"; depends=[]; }; corpora = derive2 { name="corpora"; version="0.5"; sha256="0b4yw37msx9h8hf5mjs4h10gdmc1qc2gv5bzyj1r90n4gcli042d"; depends=[]; }; corporaexplorer = derive2 { name="corporaexplorer"; version="0.8.2"; sha256="14l64mcqfa2ayyl6d48s9fc2qh485wk02s23cy4nssn7sg1b3a5z"; depends=[data_table dplyr ggplot2 lubridate magrittr padr plyr RColorBrewer rlang rmarkdown scales shiny shinydashboard shinyjs shinyWidgets stringi stringr tibble tidyr]; }; - corpus = derive2 { name="corpus"; version="0.10.0"; sha256="0c984rsnbai2qrm2s10lkdfgx31m0ax46zhl74bns2bxfmagcn3l"; depends=[utf8]; }; + corpus = derive2 { name="corpus"; version="0.10.1"; sha256="1mcjn6jsrvyxwcf8kx86fy7z0zsarvq6ccja3r27v7b8fjrb8mng"; depends=[utf8]; }; corpustools = derive2 { name="corpustools"; version="0.4.2"; sha256="00v61i4c43s69mchy5zkbxgvxjx8kqlzm2vcb7snjblmd84w4id5"; depends=[data_table digest igraph Matrix quanteda R6 Rcpp RcppProgress RNewsflow SnowballC stringi tokenbrowser udpipe wordcloud]; }; corr2D = derive2 { name="corr2D"; version="1.0.0"; sha256="12k6vbqyb33kfj2xdg8rbydnp2yk15kv4b0m4lid4gf2lqmy3jwz"; depends=[colorspace doParallel fields foreach mmand profr rgl xtable]; }; corrDNA = derive2 { name="corrDNA"; version="1.0.1"; sha256="1mfjrzpcb63ydyj1yxa0wd3vh4z0rdwsqv09w0a0l4l7mhb5jz2k"; depends=[mvtnorm]; }; corrcoverage = derive2 { name="corrcoverage"; version="1.2.1"; sha256="0r5n2g341jlinwrxxwxkav9i6qsf097pmfi07aiq663b13r3864x"; depends=[data_table magrittr matrixStats Rcpp RcppArmadillo]; }; correctedAUC = derive2 { name="correctedAUC"; version="0.0.3"; sha256="0c2kq7asq5mp48p8niqb84wnw4q2q2985wxbrywrhsszm9p3xspb"; depends=[ICC mnormt]; }; corregp = derive2 { name="corregp"; version="2.0.2"; sha256="1v048dibn2x3y5mi2damcsr9i5kdig5n53g5j9gf31lqkzzjmnh3"; depends=[data_table diagram ellipse gplots rgl]; }; - correlation = derive2 { name="correlation"; version="0.1.0"; sha256="0idhw015s1a84z87mzy35rly700bd2mgsp3g9943c5yxnda2g17z"; depends=[bayestestR boot effectsize insight parameters]; }; + correlation = derive2 { name="correlation"; version="0.2.0"; sha256="0ckwpsvpnv7caz8pgxy5cf2pfhgvkgd29jm3vwan5nbyjwhgc9nb"; depends=[bayestestR effectsize insight parameters]; }; correlationfunnel = derive2 { name="correlationfunnel"; version="0.1.0"; sha256="0kg770nfr1cd31b8y8g1kx046k401lha9hbj7lq543gl7s77aw2x"; depends=[cli crayon dplyr forcats ggplot2 ggrepel magrittr plotly purrr recipes rlang rstudioapi stringr tibble tidyr]; }; correlbinom = derive2 { name="correlbinom"; version="0.0.1"; sha256="1ix3ccxzr7vqblbda5awsva3h95b69v7kc6adz622bbi8r36xxcq"; depends=[Rmpfr]; }; corrgram = derive2 { name="corrgram"; version="1.13"; sha256="1g5159vihsz5a2cfmg4g4i1lildn2x2wzck5sd0vml5810rxjpma"; depends=[seriation]; }; @@ -6409,7 +6424,7 @@ in with self; { corrsieve = derive2 { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbicck2sr260wpmd3xj254y7pdavx2fk0b72yxs"; depends=[]; }; corset = derive2 { name="corset"; version="0.1-4"; sha256="0ladyqvkys4cldvbhkii9jwn1k5p1ym2g5bgdlz1hq1sv30ixn2f"; depends=[]; }; cort = derive2 { name="cort"; version="0.3.0"; sha256="1krb3d0g060b9a5a3pb782vd632lfncbxbmcvh6q21as0flm2hpv"; depends=[furrr magrittr nloptr osqp purrr Rcpp Rdpack]; }; - corto = derive2 { name="corto"; version="1.0.5"; sha256="042bz48qiwkhms5ad6189dlng91nz6mdfwjar7816ry7vzfn92iw"; depends=[dplyr knitr pbapply plotrix rmarkdown]; }; + corto = derive2 { name="corto"; version="1.0.8"; sha256="0p9issdhi5iz7fjc0qc3s3vp286j1b3aydjvj273zcjshjhc27ia"; depends=[dplyr knitr pbapply plotrix rmarkdown]; }; corx = derive2 { name="corx"; version="1.0.2"; sha256="1k9k1w5i5yky6c9jn5s80rf0r5r6qn7w0xwamjbankp2i4ryna5z"; depends=[clipr crayon ggcorrplot glue moments ppcor psych tidyselect]; }; cosa = derive2 { name="cosa"; version="2.0.0"; sha256="1ra1m75ay829xlhjax82px4ffflnfgh2mrmzzj4i8ml545d9hmgr"; depends=[msm nloptr]; }; cosinor = derive2 { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; }; @@ -6427,7 +6442,7 @@ in with self; { countcolors = derive2 { name="countcolors"; version="0.9.1"; sha256="1gnwmw3inh8asbk6qba34vzx1k2cnh4m9d1346gxhzhlxvl6xiza"; depends=[colordistance jpeg png]; }; countfitteR = derive2 { name="countfitteR"; version="1.0"; sha256="1kb7na35xk257a6bd9ihgbn13ygn5s553s9nph0hg7iw5nikknap"; depends=[ggplot2 MASS shiny]; }; countgmifs = derive2 { name="countgmifs"; version="0.0.2"; sha256="0k6fjg0v9n7vi89wd025gdjh1q3l6nnc5yn8i2bfw0i5vmv8rhi3"; depends=[MASS]; }; - countrycode = derive2 { name="countrycode"; version="1.1.1"; sha256="1ys76s1sa6xj0mr5kryscwsh3dlrn9w35fx3fnr325j35xalyka4"; depends=[]; }; + countrycode = derive2 { name="countrycode"; version="1.1.2"; sha256="0ha2qmsmdrb6dkw62srcl1jxljkhh67jaj96ypz91c0sqz11zjjf"; depends=[]; }; countyfloods = derive2 { name="countyfloods"; version="0.1.0"; sha256="0ld8p8dfk9khvwffbn8sad0j3an25s7cvbi6jxljgx4zc6ldh699"; depends=[dataRetrieval dplyr ggplot2 lubridate maps plyr R_utils tidyr]; }; countytimezones = derive2 { name="countytimezones"; version="1.0.0"; sha256="0sk22fmz9d3wvlfvjl1xdavvl04q1ywy8ww2gi5am3yiizkf0v9w"; depends=[dplyr lubridate]; }; countyweather = derive2 { name="countyweather"; version="0.1.0"; sha256="0q56bnh9x6jyj1sdd1q4yv2n774mbv268pgp285bjybgqm2pyisz"; depends=[dplyr geosphere ggmap ggplot2 lubridate purrr raster rnoaa sp stringi tibble tidyr tigris]; }; @@ -6441,9 +6456,10 @@ in with self; { covequal = derive2 { name="covequal"; version="0.1.0"; sha256="1qj6djqf1rnjmnaz1nryj9dc104082w258dzjjp5q18gg1ck8v0c"; depends=[corpcor RMTstat]; }; covfefe = derive2 { name="covfefe"; version="0.1.0"; sha256="178qc77y4bn04qad3g70wr8y4v0ggyg807w67m8wvhbcxqr8yq7c"; depends=[tokenizers]; }; covglasso = derive2 { name="covglasso"; version="1.0.1"; sha256="1wyh5f7rhwrk042wcr31db4v0wpd12kxwfg1qqszdg3jq6xbyz25"; depends=[Rcpp RcppArmadillo]; }; - covid19_analytics = derive2 { name="covid19.analytics"; version="1.0"; sha256="18gk0n93f8by9695xpxbk16np7m925r8s5mghsbg2r85m8d3z70y"; depends=[ape deSolve gplots htmlwidgets pheatmap plotly]; }; + covid19_analytics = derive2 { name="covid19.analytics"; version="1.0.1"; sha256="1lig3sdx6a9r2b1mz3ichm0scjb9akaar0qziq7vsfp8ynsgb11r"; depends=[ape deSolve gplots htmlwidgets pheatmap plotly]; }; + covid19france = derive2 { name="covid19france"; version="0.1.0"; sha256="11072mc794l0m84k2b08zhyfvxf6n6ym91i7kkm3cbirxp6bhnqy"; depends=[dplyr glue lubridate magrittr readr stringr tidyr]; }; covid19italy = derive2 { name="covid19italy"; version="0.1.0"; sha256="1wd4f97gmw7l9zc0dpfwxii8gfhnwhk0c04gjvwk9xjdp5psx5gb"; depends=[devtools]; }; - covid19us = derive2 { name="covid19us"; version="0.1.1"; sha256="1rqfi0rgx7kl6pdvjiwrh4x4hr5x7jxr1v9sxma9jgqhg82mlmpi"; depends=[curl dplyr glue httr lubridate magrittr purrr snakecase stringr tibble tidyr]; }; + covid19us = derive2 { name="covid19us"; version="0.1.2"; sha256="13sj6pz81czima6n5zi1vdbzjbxa37nc6l6md3ix6w9rdhiajfbg"; depends=[curl dplyr glue httr lubridate magrittr purrr snakecase stringr tibble tidyr]; }; covr = derive2 { name="covr"; version="3.5.0"; sha256="1pvr95h7jg9hqq1qq1cccy323pkxldrwafl08151cc410499k4fb"; depends=[crayon digest httr jsonlite rex withr yaml]; }; covreg = derive2 { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; }; covsep = derive2 { name="covsep"; version="1.1.0"; sha256="19dvwhl85yx9ddwxvnq5sdd534s6llcw61gckrav48hq49x1bqld"; depends=[mvtnorm]; }; @@ -6482,7 +6498,6 @@ in with self; { cqcr = derive2 { name="cqcr"; version="0.1.2"; sha256="11bcqr4bw11vjqdgddpfjb4dsk0dxdasddkp1g310l71vw7zaryg"; depends=[anytime dplyr httr jsonlite purrr rlang snakecase]; }; cqrReg = derive2 { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; }; cquad = derive2 { name="cquad"; version="2.1"; sha256="1cq57qd33cbzhgnnw4fk36xch0prwr9a404sxi7b4ijwgzw84d0h"; depends=[MASS plm]; }; - cr17 = derive2 { name="cr17"; version="0.1.0"; sha256="1zyq77gxycbwyqhv5w0zw4n7v3ipjs6rcbja43g0k5q8h0gjnnn1"; depends=[cmprsk dplyr ggplot2 gridExtra gtable scales survival]; }; cramer = derive2 { name="cramer"; version="0.9-3"; sha256="1kdad8nndhics4282gfy9ncllk2kpawdy8ybq71vcd7hc7kf0zq5"; depends=[boot]; }; crank = derive2 { name="crank"; version="1.1-2"; sha256="0wwbdh5sfi2bg13nrlkxxij4k053kjx9afm4gjpgs6iir6pml711"; depends=[]; }; cranlike = derive2 { name="cranlike"; version="1.0.2"; sha256="06xgxgwpmfrwmcd0gnr9prjjbhd1y0ky1zb8yh09v0bvsf6ixnyx"; depends=[DBI debugme desc RSQLite]; }; @@ -6495,7 +6510,7 @@ in with self; { crblocks = derive2 { name="crblocks"; version="1.0-0"; sha256="0y101kgi7ryjv18fyjp0ralp4qj7kgshmbd4mf7n3hdjay0znss5"; depends=[]; }; crch = derive2 { name="crch"; version="1.0-4"; sha256="18qjvh1lkw1f6rrhnb21f30xxrcq8whbs3x1jgkw6q14rf1483ri"; depends=[Formula ordinal sandwich scoringRules]; }; credentials = derive2 { name="credentials"; version="1.1"; sha256="0izwskymymkxdwsdj7zapqpkc6g37c0m6c2na0y00s1kwr73d2qd"; depends=[askpass curl jsonlite openssl sys]; }; - creditmodel = derive2 { name="creditmodel"; version="1.1.8"; sha256="1l9l56cs9kh22j8ky2iklakwsw69j89gb6kz57yklj2sj543hzir"; depends=[cli data_table doParallel dplyr foreach ggplot2 glmnet rpart xgboost]; }; + creditmodel = derive2 { name="creditmodel"; version="1.1.9"; sha256="19jgxckjyssvr6nv6vsqizm3rzn1m445a0bsk4kp57nggrpnyahs"; depends=[cli data_table doParallel dplyr foreach ggplot2 glmnet rpart xgboost]; }; credsubs = derive2 { name="credsubs"; version="1.0.1"; sha256="0n3684fxknvvs57g2vjqykgdjfbpl6242nd23sm9nv2fn57q8k2c"; depends=[]; }; credule = derive2 { name="credule"; version="0.1.3"; sha256="1vciqkxkf93z067plipvhbks9k9sfqink5rhifzbnwc2c5gxp5mx"; depends=[]; }; cregg = derive2 { name="cregg"; version="0.3.0"; sha256="08dhn4i5i27zw3ayqp7lkw5z8dzckv8fhflpvz0mphax34pm3z72"; depends=[ggplot2 ggstance lmtest sandwich scales survey]; }; @@ -6507,7 +6522,7 @@ in with self; { crisp = derive2 { name="crisp"; version="1.0.0"; sha256="1gs8jnd9y9pd55w6kwv9mvmg3wd8hjiw3lwx7k242pxccsxklfxq"; depends=[MASS Matrix]; }; crmPack = derive2 { name="crmPack"; version="1.0.0"; sha256="11zy1ci9d0zjbmc0gws9j9qrnfcqvky1ws9p41wjn0zifcckc5gi"; depends=[GenSA ggplot2 gridExtra MASS mvtnorm rjags]; }; crmReg = derive2 { name="crmReg"; version="1.0.1"; sha256="1i3i4pd1ff7cmyd268p5kmncrk0lrq4q4cjhkhxbp2pah041q4wk"; depends=[FNN ggplot2 gplots pcaPP plyr robustbase rrcov]; }; - crminer = derive2 { name="crminer"; version="0.3.0"; sha256="03ynpnk3ni0l2cdlfk69vm1swlva0wjm7lnrb7b1dl9xdjr57lzn"; depends=[crul hoardr jsonlite pdftools xml2]; }; + crminer = derive2 { name="crminer"; version="0.3.2"; sha256="1zq689dk13z0sjp8awjj8jqiw2vkdw70fpyadyis0yfqxyvnzcv5"; depends=[crul hoardr jsonlite pdftools xml2]; }; crmn = derive2 { name="crmn"; version="0.0.21"; sha256="0wp99fsw7y859gp1x22f77r9rv1m0xspbzhzgshzf7hi86xb57k5"; depends=[Biobase pcaMethods]; }; crn = derive2 { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; }; crochet = derive2 { name="crochet"; version="2.2.0"; sha256="1cbv79nyycxk6f8ldcsnn2pvgxqlnrj0qs19nhafnq2clxy863k6"; depends=[]; }; @@ -6524,8 +6539,8 @@ in with self; { crossval = derive2 { name="crossval"; version="1.0.3"; sha256="0acpcisg6pkxblyc4j9hiri58h1rn7ay43p5ib5ia8a4a8bnfa4p"; depends=[]; }; crosswalkr = derive2 { name="crosswalkr"; version="0.2.6"; sha256="1rxd6vy7vdrawmg7zkydl1f2wwklnzgh9dsnxbg966xrr3l9x1n9"; depends=[haven labelled readr readxl tibble]; }; crossword_r = derive2 { name="crossword.r"; version="0.3.6"; sha256="1s31613s4qxxspka9bhgq3rq8xraf48mwfv6phvz6v06gijh64lr"; depends=[dplyr jsonlite magrittr R6 r6extended stringr]; }; - crov = derive2 { name="crov"; version="0.1.3"; sha256="0gvrki9ldm3yrnp6zx2awqg4p3pqjzv1088gn3nbg00j0i3s9m5h"; depends=[gtools VGAM]; }; - crplyr = derive2 { name="crplyr"; version="0.3.3"; sha256="0jkh4jq0pwz1pqgckdylcdjg7d45z0xl3pdvyb93pcvi073na9na"; depends=[crunch dplyr ggplot2 lazyeval purrr rlang scales stringr tibble viridisLite]; }; + crov = derive2 { name="crov"; version="0.2.0"; sha256="1i3a5nagzinsla6p3wjyj3x12gyfqs6vapaqxgr3dh6m727jw5i5"; depends=[gtools VGAM]; }; + crplyr = derive2 { name="crplyr"; version="0.3.4"; sha256="1vpvp11xrlqq7qinndfda6r9dqfqin9gg75hx4y8sh3b9ar2zywd"; depends=[crunch dplyr ggplot2 lazyeval lifecycle purrr rlang scales stringr tibble tidyselect viridisLite]; }; crqa = derive2 { name="crqa"; version="1.0.9"; sha256="1k6jgkmgbjab78dynng1hlxdbnqrpwmiiw54rgyfhx6v3lcir75d"; depends=[fields Matrix plot3D pracma tseriesChaos]; }; crqanlp = derive2 { name="crqanlp"; version="0.3"; sha256="1ndd5k44w232x6k564r84lyahljgcnldfwgih3iiar3il94drbdg"; depends=[corpus crqa gutenbergr RCurl tm]; }; crrSC = derive2 { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; }; @@ -6569,9 +6584,9 @@ in with self; { ctqr = derive2 { name="ctqr"; version="1.1"; sha256="1iv6mms7p0xca91mpj61cj8kxv2bwqrpvwdsbx2lk6hgys8g70y2"; depends=[pch survival]; }; ctrdata = derive2 { name="ctrdata"; version="1.2"; sha256="146nb5sv6mj43kqs8iz58nzyx4xrrk5khay2hjjpfrh1g076bw8k"; depends=[clipr curl httr jsonlite nodbi rvest xml2]; }; ctrlGene = derive2 { name="ctrlGene"; version="1.0.1"; sha256="0x7j11v7jj4k1jml6lrnjq79awhrvsm3pig1yxsd337jlfml3ra9"; depends=[psych]; }; - ctsem = derive2 { name="ctsem"; version="3.1.1"; sha256="0l45bfvjjy4ak5bg6nfj8i9adl3qy79nllb0ldmhmg0wqxw76zs4"; depends=[BH cOde data_table Deriv ggplot2 MASS Matrix mize mvtnorm numDeriv OpenMx pkgbuild plyr quantreg Rcpp RcppEigen rstan rstantools StanHeaders]; }; + ctsem = derive2 { name="ctsem"; version="3.2.0"; sha256="1dsk74vci4k43b53lz9dwbrcj59f9fr527bls0l83kkas8dsd6m8"; depends=[BH cOde data_table Deriv ggplot2 MASS Matrix mize mvtnorm numDeriv OpenMx pkgbuild plyr quantreg Rcpp RcppEigen rstan rstantools StanHeaders]; }; ctv = derive2 { name="ctv"; version="0.8-5"; sha256="0kl6z8dbbjgm29q0c5xy6lihjgf5cdihrllm27x0zbcvy8lyl51p"; depends=[]; }; - cuRe = derive2 { name="cuRe"; version="1.0.0"; sha256="0bdj3ak1s6rg84d82iy95g1sdanl6y5a4rdsnixqzrhb9kvnrv0s"; depends=[date numDeriv relsurv rootSolve rstpm2 statmod survival]; }; + cuRe = derive2 { name="cuRe"; version="1.0.1"; sha256="0vw2iv9inz8md7lz6f1p456wxjc07kap1mvqf58hixqxbrb23dgi"; depends=[date numDeriv relsurv rstpm2 statmod survival]; }; cubature = derive2 { name="cubature"; version="2.0.4"; sha256="0jpyq8j7x06dpiz29w48av879ygldzgls9z810192hsymkmfaz6r"; depends=[Rcpp]; }; cubelyr = derive2 { name="cubelyr"; version="1.0.0"; sha256="0h9s5j9q05bdzdv7dbghzfbhqf96kyxyrxx1mqf8phzc77w4yh25"; depends=[dplyr glue pillar purrr rlang tibble tidyselect]; }; cubeview = derive2 { name="cubeview"; version="0.2.0"; sha256="1352hi2j9x9rx4iy3xvsca86nsh39x1vnymd17f5qc8c3plfm8db"; depends=[base64enc htmltools htmlwidgets lattice raster stars viridisLite]; }; @@ -6596,21 +6611,22 @@ in with self; { cusum = derive2 { name="cusum"; version="0.4.1"; sha256="0vjq3slkjdgls41xm637xkrg8jhv6y75xiyfcgpwrp32ixmakpcd"; depends=[checkmate data_table Rcpp]; }; cutoff = derive2 { name="cutoff"; version="1.3"; sha256="0anrvmlvcxah620il3fkq6ldp7hx4nwdnzcpmfc5mhlsry0lp178"; depends=[do ROCit set survival]; }; cutoffR = derive2 { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; }; + cutpointr = derive2 { name="cutpointr"; version="1.0.2"; sha256="0jlh7d1nj9w1rw04sg89a81qxm6dfmsdqq37y1b10fllvhnc93fq"; depends=[dplyr foreach ggplot2 gridExtra purrr Rcpp rlang tibble tidyr]; }; cuttlefish_model = derive2 { name="cuttlefish.model"; version="1.0"; sha256="1rmkfyfd1323g2ymd5gi1aksp160cwy5ha5cjqh5r6fzd8hhqjxs"; depends=[]; }; cvAUC = derive2 { name="cvAUC"; version="1.1.0"; sha256="13bk97l5nn97h85iz93zxazhr63n21nwyrpnl856as9qp59yvn64"; depends=[data_table ROCR]; }; cvGEE = derive2 { name="cvGEE"; version="0.3-0"; sha256="085qjm520l2441nakfxy851s6bfy5832b5fy54z5fp4xr1jn6snm"; depends=[]; }; cvTools = derive2 { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase]; }; cvar = derive2 { name="cvar"; version="0.4-0"; sha256="1rfsmw2a639pkj8l5g2xm6z48jrxsywbysk7c0czpdvrh4h9h84f"; depends=[fGarch gbutils Rdpack]; }; cvcqv = derive2 { name="cvcqv"; version="1.0.0"; sha256="0327r4jw6m4avcz1zvdkxszqwaw2s9sh1i1jagl6aggd7aaiiyg0"; depends=[boot dplyr MBESS R6 SciViews]; }; - cvcrand = derive2 { name="cvcrand"; version="0.0.4"; sha256="1150vn753m95gpc1clyf4xzzgwmnzdh83prw8a3ikps0l6grvrps"; depends=[tableone]; }; + cvcrand = derive2 { name="cvcrand"; version="0.1.0"; sha256="0zdf41sjqyi7mybxhypfx1vpc15w7qj9jg9bav64qbk0q5nk7jyc"; depends=[tableone]; }; cvequality = derive2 { name="cvequality"; version="0.2.0"; sha256="1im839vzfqylphp2vr20avnzkyl02n88fngbs63d4ik7c72d9992"; depends=[]; }; cvmdisc = derive2 { name="cvmdisc"; version="0.1.0"; sha256="19b9kxqgbk1d631l3jph87pzhk4zf3xd5q5j2xsrbqz8zmm96sn9"; depends=[CompQuadForm]; }; cvmgof = derive2 { name="cvmgof"; version="1.0.0"; sha256="0rnd7icqjprhbpmn383ah4fi5nz0hmg88fa612fmivkvnpn79v6j"; depends=[lattice]; }; - cvms = derive2 { name="cvms"; version="0.3.2"; sha256="0k7v5m95dqanm8hb8j4jx4r4phxx8zrl9nagqampy2sgiwlld6wg"; depends=[broom caret data_table dplyr ggplot2 lifecycle lme4 mltools MuMIn plyr pROC purrr rlang stringr tibble tidyr]; }; + cvms = derive2 { name="cvms"; version="1.0.1"; sha256="0z7vp323vlz53icpksgl9idnkg5sf3kh6gi2fpkwafrx0h7fqdr7"; depends=[broom checkmate data_table dplyr ggplot2 lifecycle lme4 MuMIn plyr pROC purrr recipes rlang stringr tibble tidyr]; }; cvq2 = derive2 { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; }; cvxbiclustr = derive2 { name="cvxbiclustr"; version="0.0.1"; sha256="00k75zy8v6qd5fg0h258i5z8ljjkfgkxz45cspysl1ap89d5n7df"; depends=[igraph Matrix]; }; cvxclustr = derive2 { name="cvxclustr"; version="1.1.1"; sha256="0idmx4wgz4d0b1xzmlq5bsk2f2q38lpf9c117hg97xsfndzn7vqj"; depends=[igraph Matrix]; }; - cwbtools = derive2 { name="cwbtools"; version="0.1.2"; sha256="0ylzh61587299zqa3i6fc76x2lhdmpvhj0h4bhqwy75csp1wisvp"; depends=[curl data_table pbapply R6 RcppCWB stringi xml2]; }; + cwbtools = derive2 { name="cwbtools"; version="0.2.0"; sha256="1f60zlj75a1fxvw92j8gg707lw4p23c7qg9zzk1s9ph4d42g63sb"; depends=[curl data_table jsonlite pbapply R6 RcppCWB RCurl rstudioapi stringi usethis xml2]; }; cwhmisc = derive2 { name="cwhmisc"; version="6.6"; sha256="1pf365g4f51cfrhlff9mqw2ddvkps0abax17zcn3vw1ba2djalnp"; depends=[lattice]; }; cwm = derive2 { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; }; cxhull = derive2 { name="cxhull"; version="0.2.0"; sha256="1m03ym83ghgmb0j14aihfj6divmnr13f5s9jwknicjsxz3p3divk"; depends=[]; }; @@ -6628,6 +6644,7 @@ in with self; { cytofan = derive2 { name="cytofan"; version="0.1.0"; sha256="0gqs98mnwiawnyfb9hs5nlin8d1fj64bszn4b40gs8ajyh36r9pp"; depends=[ggplot2 RColorBrewer]; }; cytometree = derive2 { name="cytometree"; version="2.0.2"; sha256="18g7av73lmnyga1kk24bf8jy599zn9n6qhr13mxsqgi0zdinicfa"; depends=[cowplot ggplot2 GoFKernel igraph mclust Rcpp RcppArmadillo]; }; cytominer = derive2 { name="cytominer"; version="0.2.1"; sha256="0snifz15ijn5bfl3ppfqjp7ac68hsx0rzxlcnxj3285d10p0wljq"; depends=[caret doParallel dplyr foreach futile_logger magrittr Matrix purrr rlang tibble tidyr]; }; + czso = derive2 { name="czso"; version="0.2.3"; sha256="1gaflfi1sq49vjaah8mnbydvyqwwkl1ca2ay399dn9gw1kjcq0fd"; depends=[curl dplyr httr jsonlite lifecycle magrittr readr rlang stringi stringr tibble usethis]; }; d3Network = derive2 { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; }; d3Tree = derive2 { name="d3Tree"; version="0.2.0"; sha256="0xjr36hdd00dy8s8z1a1s44dn2wg0nm6yqc1rri2l0dqrbh4nrbn"; depends=[dplyr htmlwidgets magrittr plyr stringr]; }; d3heatmap = derive2 { name="d3heatmap"; version="0.6.1.2"; sha256="1ici8j0wzzklhmw94qlxm292qs562vc32wq8mnjsas2n1p35vkmk"; depends=[base64enc dendextend htmlwidgets png scales]; }; @@ -6642,7 +6659,7 @@ in with self; { dMod = derive2 { name="dMod"; version="1.0.1"; sha256="1xw52kliyiv9vrw0m9y7baqdcpqz4706625if8b63nfr70i77a9p"; depends=[cOde deSolve doParallel dplyr foreach ggplot2 plyr rootSolve stringr]; }; dSVA = derive2 { name="dSVA"; version="1.0"; sha256="0vy0flyg82x0n9vw6jf9f76qy84sp0wnis91faj37ac5hdv3pvsb"; depends=[sva]; }; daarem = derive2 { name="daarem"; version="0.4.1"; sha256="1krixphwjh4wp38in7ypwc4y4ncdrryhsnjnn1y48fm2jgc8zvjl"; depends=[]; }; - dabestr = derive2 { name="dabestr"; version="0.2.4"; sha256="1xy1fzfjajphpqwa3x0hsl6fyr55zq1az7la5wpdh0n3sbj1wkbd"; depends=[boot cowplot dplyr ellipsis forcats ggbeeswarm ggforce ggplot2 magrittr plyr rlang simpleboot stringr tibble tidyr]; }; + dabestr = derive2 { name="dabestr"; version="0.2.5"; sha256="0kaxqlagp7ckq3h67l608vzfq98yrd47skwb2pzcf3dg3q5gsjz6"; depends=[boot cowplot dplyr ellipsis forcats ggbeeswarm ggforce ggplot2 magrittr plyr RColorBrewer rlang simpleboot stringr tibble tidyr]; }; dad = derive2 { name="dad"; version="3.4.0"; sha256="0jgirdnp3gaychnjg4mp4p1mdn31hlngs1znzvlxhrd0cqyi4ccd"; depends=[DescTools e1071 ggplot2]; }; dae = derive2 { name="dae"; version="3.1-23"; sha256="1qpsnyjq2imci45hn0c00cwgvhdrcbrfrvwmjm87k8vb3g0wqhgr"; depends=[ggplot2 plyr]; }; daewr = derive2 { name="daewr"; version="1.2-3"; sha256="0ic7lpydsdiilqsbvc5yskrrl6a2l6kmgiz1idz0ic0klyk6rnig"; depends=[FrF2 lattice stringi]; }; @@ -6659,6 +6676,7 @@ in with self; { dann = derive2 { name="dann"; version="0.2.0"; sha256="18c9rx7qg76pnmg2h4zazqq7k0vxgqh70j85cb7cc8lf0qsj6l8i"; depends=[fpc ggplot2 MASS purrr Rcpp RcppArmadillo rlang stringr tibble]; }; danstat = derive2 { name="danstat"; version="0.1.0"; sha256="1wb4v4s9qc7qna7jgd1kk0xvyaqmxhnmjvr5wlk5jjl355lhjxbc"; depends=[httr jsonlite readr]; }; dapr = derive2 { name="dapr"; version="0.0.3"; sha256="136chxijyxrl5sbiggxf56zga26zqds647z1z2igwn5mdff1wxyb"; depends=[]; }; + daqapo = derive2 { name="daqapo"; version="0.3.0"; sha256="1fyl95y57grqckyx1vp4x4f2mq8rk0l2vxh4cyr75cw23j6p4lsc"; depends=[bupaR dplyr edeaR glue lubridate magrittr miniUI purrr readr rlang shiny stringdist stringr tidyr xesreadR]; }; darksky = derive2 { name="darksky"; version="1.3.0"; sha256="1740cw5qifgvqa0nafd6lmllxi32n1zm45zlify1yn3h1qdcszhb"; depends=[ggplot2 gridExtra gtable httr plyr]; }; dartR = derive2 { name="dartR"; version="1.1.11"; sha256="0k768ppm4iw4fi72dp8f1684kizqp1spfb4cnnqxq1dy6w0qz5i8"; depends=[adegenet ape data_table directlabels dismo doParallel foreach gdistance ggplot2 hierfstat igraph leaflet MASS mmod pca3d pegas plyr PopGenReport qvalue reshape2 rgdal rrBLUP seqinr SNPassoc SNPRelate sp StAMPP stringr tidyr vegan]; }; darts = derive2 { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; }; @@ -6666,7 +6684,6 @@ in with self; { dat = derive2 { name="dat"; version="0.4.0"; sha256="1nw16hsw9b4hpcl5rqrlw6yk9y2h1pd0ra1c7iz82sknkyd5afi6"; depends=[aoos data_table dplyr Formula magrittr progress tibble]; }; data_table = derive2 { name="data.table"; version="1.12.8"; sha256="1p7rf4v3ysflpgcmy9krkwmcy7z22wb08xm443649waz6lx5z9yk"; depends=[]; }; data_tree = derive2 { name="data.tree"; version="0.7.11"; sha256="1mm27p3k2qw77wqrx05qs39nazcgpn0af0ahlps4gm62fs9pzddq"; depends=[R6 stringr]; }; - dataCompareR = derive2 { name="dataCompareR"; version="0.1.2"; sha256="0n10dqnrlpwafxys68b3ly156235lhqby71qay0vb0r6bvl2g349"; depends=[dplyr knitr markdown stringi]; }; dataMaid = derive2 { name="dataMaid"; version="1.4.0"; sha256="133ipl06sc8iicvkbgjxfs0qia76r2p1qhi693vacgfdbd7cmak5"; depends=[ggplot2 gridExtra haven htmltools magrittr pander rmarkdown robustbase stringi whoami]; }; dataMeta = derive2 { name="dataMeta"; version="0.1.1"; sha256="13xxayqxbps07h0xr5b7sb7q30gy5zm7jzzaq4k20fskkjrzhzcm"; depends=[dplyr]; }; dataPreparation = derive2 { name="dataPreparation"; version="0.4.3"; sha256="1fchr68siq6vxz4qzlkrm2p6zld3s8mw7izmyzqffvrlqmrh0bdm"; depends=[data_table lubridate Matrix progress stringr]; }; @@ -6676,6 +6693,7 @@ in with self; { datadigest = derive2 { name="datadigest"; version="1.0.2"; sha256="1v4nwflrgjhwkrdlrjnqyq1spv1jkgxn1kmapml0zrvnvwf0r1a1"; depends=[haven Hmisc htmltools htmlwidgets jsonlite miniUI shiny tibble]; }; datadogr = derive2 { name="datadogr"; version="0.1.2"; sha256="10zbxb9gkymw78ras9y4wrifz7cxh3y630yzjcf9ds2p557vcjzp"; depends=[anytime dplyr glue httr lubridate purrr stringr tibble tidyr]; }; dataesgobr = derive2 { name="dataesgobr"; version="1.0.0"; sha256="10znkaq45m4bgiyjx4x8s6ilvxlry6h0z54pkg8jgmblrpfazmqb"; depends=[dplyr DT httr jsonlite readODS readr readxl shiny shinycssloaders shinyFiles shinyjs shinythemes stringi stringr yaml]; }; + dataframeexplorer = derive2 { name="dataframeexplorer"; version="0.1.6"; sha256="0sp2323lf3sq7na6z9v1lir46v75c7ssklbkkmjxx43pbw3q4rjy"; depends=[data_table dplyr magrittr openxlsx plyr tibble tidyr]; }; dataframes2xls = derive2 { name="dataframes2xls"; version="0.4.7"; sha256="10krlv0l5w021z0qd7rj93pzfjjmcjlda4xz4vq470bxbjmn1bss"; depends=[]; }; datafsm = derive2 { name="datafsm"; version="0.2.3"; sha256="18q6s8sz8bm2xlfvhj0x5sagpn363s3k21s428wd0bqzqlppwbmb"; depends=[caret GA Rcpp]; }; datagovsgR = derive2 { name="datagovsgR"; version="0.3.1"; sha256="03ynpga01yh8xm4p41kq32wvmbh9cf1jp1mbyzzl6ziwgz95n0q8"; depends=[data_table dplyr httr purrr stringr]; }; @@ -6691,7 +6709,6 @@ in with self; { dataresqc = derive2 { name="dataresqc"; version="1.0.3"; sha256="1b04lzb479p95iv7gzb5ds6c48l8kcps857qjy3wqkhr67jhd0dc"; depends=[]; }; datarium = derive2 { name="datarium"; version="0.1.0"; sha256="1v98yxsxhfqlalz5qy3x5axb7fy067vf3y0qg7ngixphmy9qybym"; depends=[]; }; datarobot = derive2 { name="datarobot"; version="2.17.0"; sha256="1k4idrbc9fgw8afc7cq9fqg189b86h1q0fkpq06k7dc4fl65wyna"; depends=[curl httr jsonlite yaml]; }; - datasailr = derive2 { name="datasailr"; version="0.8.2"; sha256="18zqvhgdhkgmwh01plz8n8vdga2yas76lqwsqhk7qxnjd2hnj0hx"; depends=[Rcpp]; }; datasauRus = derive2 { name="datasauRus"; version="0.1.4"; sha256="1w1yhwwrmh95bklacz44wjwynxd8cj3z8b9zvsnzmk18m5a4k0fl"; depends=[]; }; dataseries = derive2 { name="dataseries"; version="0.2.0"; sha256="11wc2p5m8qbdmkpbd21lpwl28a1dpab88c3gqyrhsn0298lpnip4"; depends=[]; }; datasets_load = derive2 { name="datasets.load"; version="1.2.0"; sha256="0x2m3k4grqizm97p41gjy3zkmhshicndp6cwyncl149yay6x8y5i"; depends=[DT miniUI shiny]; }; @@ -6721,7 +6738,7 @@ in with self; { dbnR = derive2 { name="dbnR"; version="0.3.4"; sha256="0m273disj1byg4g21zgwspryjsxsdqj9scih2m0hcghf76n22822"; depends=[bnlearn data_table magrittr Rcpp]; }; dbparser = derive2 { name="dbparser"; version="1.1.0"; sha256="12fx17bj076nl493mian9rz3iv1fx86qr0q2k2z6hqsvg4866q1j"; depends=[DBI dplyr odbc purrr readr RMariaDB RSQLite tibble XML]; }; dbplot = derive2 { name="dbplot"; version="0.3.3"; sha256="1svizj9hcd417yii8ll9s3mnvdqpa5awy9xl71kbwpfcnpdzqf1r"; depends=[dplyr ggplot2 magrittr purrr rlang]; }; - dbplyr = derive2 { name="dbplyr"; version="1.4.2"; sha256="1q2dflr88s5a1amzfld3087q422vf70052qn84zyd8895kdg10xp"; depends=[assertthat DBI dplyr glue purrr R6 rlang tibble tidyselect]; }; + dbplyr = derive2 { name="dbplyr"; version="1.4.3"; sha256="1si8sahr1kwq1xgjzi9klkahad07pyrsngy75y1f74f64907pb39"; depends=[assertthat DBI dplyr glue lifecycle purrr R6 rlang tibble tidyselect]; }; dbscan = derive2 { name="dbscan"; version="1.1-5"; sha256="1vh29nmmana2755zcy15i1mhj3amwc2r84cq9d71wqr7ygzynphk"; depends=[Rcpp]; }; dbstats = derive2 { name="dbstats"; version="1.0.5"; sha256="0pr80mx8y87l96hhg0rp3ajxl7yx2f8qr0y1zrjkbzxavjmp9k34"; depends=[cluster pls]; }; dbx = derive2 { name="dbx"; version="0.2.5"; sha256="1g1pm0zw667m0wdzndak1qzym527lcl6gmdfzi5b3rlinkk2y0s2"; depends=[DBI]; }; @@ -6759,7 +6776,7 @@ in with self; { decisionSupport = derive2 { name="decisionSupport"; version="1.105.2"; sha256="095qwgsw6y1clv2hyjr56s2wg8q1nhd22ikh9b3l2mcsw2xdzvjy"; depends=[chillR fANCOVA ggplot2 msm mvtnorm nleqslv rriskDistributions]; }; deckgl = derive2 { name="deckgl"; version="0.2.5"; sha256="1rqw84pzbip9752q4zmhrhv8gis5dc8q6v1kkgnblhkg10wrb0lw"; depends=[base64enc htmltools htmlwidgets jsonlite magrittr readr tibble yaml]; }; decode = derive2 { name="decode"; version="1.2"; sha256="1qp0765gl3pgfdzjwj7icf3zminxxmrlw6gx3vj51y6c2y5ws4as"; depends=[]; }; - decoder = derive2 { name="decoder"; version="1.1.13"; sha256="1kpcx754djfr8y0flpa1hrr92s0wbxw23rlvb6q3k9absvdvvmg6"; depends=[backports]; }; + decoder = derive2 { name="decoder"; version="1.2.2"; sha256="1jxgd32bn36ldal26wivhdxgjy247l7r4ickacr1p8rrwxvhpk18"; depends=[]; }; decomposedPSF = derive2 { name="decomposedPSF"; version="0.1.3"; sha256="0p9n0qi21facdp9c4fzs78ap4w1wvpvkv51kgx1gkr949kw8cv4n"; depends=[forecast PSF Rlibeemd tseries]; }; decompr = derive2 { name="decompr"; version="4.5.0"; sha256="1kbk4z1pr1j4i1sgfkjxzjy2j2fcmrf3vacnrpv1fba2ib10619k"; depends=[]; }; decon = derive2 { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; }; @@ -6773,7 +6790,6 @@ in with self; { deepdep = derive2 { name="deepdep"; version="0.2.0"; sha256="1yl1vnz9qysv38zn7dhz05s38l701zrbrx58bcpg862i8xf1nl40"; depends=[cranlogs ggforce ggplot2 ggraph graphlayouts httr igraph jsonlite scales]; }; deepdive = derive2 { name="deepdive"; version="1.0.1"; sha256="1385pxkcdaf3rs2br1dghm7d7zd94mfgmqjns4z09mryv72n7cl0"; depends=[data_table fastDummies plyr rpart stringr treeClust]; }; deepgmm = derive2 { name="deepgmm"; version="0.1.59"; sha256="1kmvk0vmfzs49n67j2cd1d46fi9gvmxklcqghgmwfw25k4xmpgkb"; depends=[corpcor mvtnorm]; }; - deeplr = derive2 { name="deeplr"; version="1.0.0"; sha256="0pg1vy4x53qns8qn5sv0nqplf23w8dwj0b0wbibpr52lgqjc34r7"; depends=[httr purrr rjson stringr tibble tokenizers utf8]; }; deepnet = derive2 { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; }; default = derive2 { name="default"; version="1.0.0"; sha256="0hzxgp9la9kll5cw3m4gd02rii571xsn1v53kz407k7k6rfg5mda"; depends=[]; }; define = derive2 { name="define"; version="0.2.8"; sha256="12xy1l1z1ilk85kbl7x4na99n6hc5axwrhpb6m6ipmbii4vv407v"; depends=[encode Hmisc latexpdf SASxport spec]; }; @@ -6803,6 +6819,7 @@ in with self; { denovolyzeR = derive2 { name="denovolyzeR"; version="0.2.0"; sha256="03ya5clzqp12lfhw073ri0pwgxn53a6pvnais317a8bv1yinxspb"; depends=[dplyr reshape2]; }; denpro = derive2 { name="denpro"; version="0.9.2"; sha256="19hrpfd44jaavq81dbyj3frris4aflfc8lig0471whv0pc6jci2k"; depends=[]; }; denseFLMM = derive2 { name="denseFLMM"; version="0.1.2"; sha256="1lfhd73zvvz6glq41lb2a9x63fjwjfp53zmy9g78fg6gz5lbnbpm"; depends=[MASS Matrix mgcv mvtnorm]; }; + densitr = derive2 { name="densitr"; version="0.1.0"; sha256="1vqdvfka6wdfxqfy2qcacss0h6wxykmwyijr5blpvlpafjdmngaq"; depends=[changepoint]; }; densityClust = derive2 { name="densityClust"; version="0.3"; sha256="1zry0vafajzmr37aylglxfvwplhdygbkb9cvzvh8cy0xgnjrnx13"; depends=[FNN ggplot2 ggrepel gridExtra RColorBrewer Rcpp Rtsne]; }; densratio = derive2 { name="densratio"; version="0.2.1"; sha256="0x333kfx5mdzzjsqy37j4bmv9iddlgp3wi4774lx8d159lbr6irp"; depends=[]; }; denstrip = derive2 { name="denstrip"; version="1.5.4"; sha256="0hzxphj740q6pfa1q42knr7n12bmnawg7b2fs74msxn83dka5cmq"; depends=[lattice]; }; @@ -6845,7 +6862,7 @@ in with self; { devFunc = derive2 { name="devFunc"; version="0.1"; sha256="0f2s5gssk9napmah7zcss1rnh7pzlq90gzwcnvyr9rrq6k118n8q"; depends=[plyr stringr]; }; devRate = derive2 { name="devRate"; version="0.1.10"; sha256="0c5hg98w83d02lvb7rbgx8c24li58vpxjy71if337p7cyzzd1lqg"; depends=[]; }; devoid = derive2 { name="devoid"; version="0.1.0"; sha256="1aq7yyfpid3r41c6v5v92im2iq9m3d7gnisc9rkc9zpjfpbpzpx8"; depends=[]; }; - devtools = derive2 { name="devtools"; version="2.2.2"; sha256="1bhb2j8ilpdzwd0c678mcgfpdw88vncsjma79afcikxmzcsz9279"; depends=[callr cli covr crayon desc digest DT ellipsis git2r glue httr jsonlite memoise pkgbuild pkgload rcmdcheck remotes rlang roxygen2 rstudioapi rversions sessioninfo testthat usethis withr]; }; + devtools = derive2 { name="devtools"; version="2.3.0"; sha256="1l6w765q180bg5mmdq5k2ymf6apz7ldhnknzf6ynfp1kf70pbhsg"; depends=[callr cli covr crayon desc digest DT ellipsis git2r glue httr jsonlite memoise pkgbuild pkgload rcmdcheck remotes rlang roxygen2 rstudioapi rversions sessioninfo testthat usethis withr]; }; dexter = derive2 { name="dexter"; version="1.0.7"; sha256="0didyrdiyv3vcimkmr7g4nl9pl6678vj0a7750nbi5zyn6q6dll9"; depends=[DBI dplyr MASS Rcpp RcppArmadillo rlang RSQLite tidyr]; }; dexterMST = derive2 { name="dexterMST"; version="0.1.2"; sha256="1h56dr2z2pzi4zdy3dmyb2vg2jg1v5602c497khkvrbr7qfx8zra"; depends=[crayon DBI dbplyr dexter dplyr fastmatch igraph Rcpp rlang RSQLite tibble tidyr]; }; dextergui = derive2 { name="dextergui"; version="0.2.2"; sha256="1g6qxjmxkrna10lahsdfilpjw587kk6zh8vs1saw9l27i3izpbi9"; depends=[Cairo DBI dexter dplyr DT ggExtra ggplot2 ggridges htmltools htmlwidgets jsonlite networkD3 RCurl readODS readxl rlang shiny shinyBS shinyFiles shinyjs tibble tidyr writexl]; }; @@ -6870,6 +6887,7 @@ in with self; { dgo = derive2 { name="dgo"; version="0.2.15"; sha256="16z3vag1fwsnmynqh0zpwq5qp5ac3xf4787lwqy7asx8qgcc3wmw"; depends=[assertthat data_table dgodata ggplot2 lubridate R6 rstan survey]; }; dgodata = derive2 { name="dgodata"; version="0.0.2"; sha256="03cyiig8pn7fdkrkrd29cwy5g63bp57bpl9jmdxfi03smngzbz0m"; depends=[]; }; dgof = derive2 { name="dgof"; version="1.2"; sha256="02qnb3i131hx05k8l5n3xbl5sqmmc2fh19bsgcacgj8ixs4wyjvi"; depends=[]; }; + dgumbel = derive2 { name="dgumbel"; version="1.0.1"; sha256="1qlc81rh6fcrai9ls27j83bjac26qhpfnchf9pdjz86dyclfjx43"; depends=[Rcpp RcppEigen]; }; dhReg = derive2 { name="dhReg"; version="0.1.0"; sha256="07x2zfcskia79xvz40g30qd9f2d4bn2s26bw892s469v3hcdqzyp"; depends=[forecast future future_apply testthat]; }; dhga = derive2 { name="dhga"; version="0.1"; sha256="1n48irj53g3kn451ak5ly50wxdn7qmzi2kib8clsvcx2n7mvpgcm"; depends=[VennDiagram]; }; dhglm = derive2 { name="dhglm"; version="2.0"; sha256="1918wkylldcdxjggly3a4yh4cv2nkig5bjfx0j79av633hahlg92"; depends=[boot car MASS Matrix sandwich]; }; @@ -6946,7 +6964,7 @@ in with self; { discreteRV = derive2 { name="discreteRV"; version="1.2.2"; sha256="1lhf67cccr96zl3j1sysh2bv0pbgvkbgjdzm35fvrdm7k74ypjsi"; depends=[MASS plyr]; }; discretecdAlgorithm = derive2 { name="discretecdAlgorithm"; version="0.0.7"; sha256="01x3qfjj7dwv0m9q8zdhfrpbj9ys9y5p7d3z8ywjrqy4jw88svjs"; depends=[igraph Rcpp RcppEigen sparsebnUtils]; }; discretization = derive2 { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; }; - discrim = derive2 { name="discrim"; version="0.0.1"; sha256="1g698bimrvzbzzv6mfafwmdyyziscr055zhssnz69j250mh81kyw"; depends=[dials parsnip purrr rlang tibble withr]; }; + discrim = derive2 { name="discrim"; version="0.0.2"; sha256="0zwr0rm8qsykimsqpxv8g76fzrspkfafrf4kfqvb7z941pi65y23"; depends=[dials parsnip purrr rlang tibble withr]; }; diseasemapping = derive2 { name="diseasemapping"; version="1.4.6"; sha256="16y2w8qjq442qdbqlrg3s2mn53rlcipl22m3q168gda5klm4f7sl"; depends=[sp]; }; disk_frame = derive2 { name="disk.frame"; version="0.3.4"; sha256="03mm73fps4hsryk3mlw088jx2z1a75xifwbixbv4fy38xihs973j"; depends=[benchmarkme bigreadr bit64 crayon data_table dplyr fs fst furrr future future_apply globals glue jsonlite pryr purrr Rcpp rlang stringr]; }; diskImageR = derive2 { name="diskImageR"; version="1.0.0"; sha256="1r19k5fdjn6vkn11p5df77fnxfqaz3nciiaai0f3pr2bgpfppzka"; depends=[subplex zoo]; }; @@ -6968,11 +6986,11 @@ in with self; { distdrawr = derive2 { name="distdrawr"; version="0.1.3"; sha256="1c8wznfml8k5gwyanfg7rqr22a96xx8rgm7f4z3bv5gsgsbps49y"; depends=[]; }; distfree_cr = derive2 { name="distfree.cr"; version="1.5.1"; sha256="0h7cywxnasxmqnl9f2f9wp4viwvv72hjx2drr78prqy3nn3lvqwx"; depends=[]; }; distill = derive2 { name="distill"; version="0.7"; sha256="111i58s7c9q317ypnpxm1gzc8ssb3751yr4l4j1wyjv49l72sayi"; depends=[base64enc bookdown digest downloader htmltools jsonlite knitr lubridate mime png progress rmarkdown rprojroot rstudioapi stringr whisker xfun xml2 yaml]; }; - distillery = derive2 { name="distillery"; version="1.0-6"; sha256="1mi3ig9jq0kd7yrwc5m37lmrw04p1b4lirnbsxi10z3n5yay4429"; depends=[]; }; + distillery = derive2 { name="distillery"; version="1.0-7"; sha256="0w72vb3p51m0hwms9icwgy1xg3dplmpjrxibl2s92lpdrv737249"; depends=[]; }; disto = derive2 { name="disto"; version="0.2.0"; sha256="09pafy8y1ifgglqmal32dy34acx06ypsq2bgwsn6fjiqr9kw401j"; depends=[assertthat broom dplyr factoextra fastcluster fastmatch ggplot2 pbapply proxy tidyr]; }; - distory = derive2 { name="distory"; version="1.4.3"; sha256="1mszk8fv1z46d7y1q37mhq9b5yk39w2i9rq6mgdf03afdslrmrip"; depends=[ape]; }; + distory = derive2 { name="distory"; version="1.4.4"; sha256="1ljrs91h4v1h5lb295hjki8bmra2lg3d1bn5x731pnv43pf3ck06"; depends=[ape]; }; distr = derive2 { name="distr"; version="2.8.0"; sha256="1dyff4m33xmw6hxb3jxzr8vvajg3qz3rfcrfxjxwsswlddfz0zdv"; depends=[MASS sfsmisc startupmsg]; }; - distr6 = derive2 { name="distr6"; version="1.3.5"; sha256="0qx5r8rwxpw6sqnyygr3z76srdfnkz1b72ymirpwbp865kmphx3j"; depends=[checkmate data_table R6 R62S3 set6]; }; + distr6 = derive2 { name="distr6"; version="1.3.6"; sha256="133vk8n21icdacwb2f5mq1rgnxz2gy11mqirlw55srzamy9mwdfw"; depends=[checkmate data_table R6 R62S3 set6]; }; distrDoc = derive2 { name="distrDoc"; version="2.8.0"; sha256="1iq2gbfbsf3h279yh3fnqsi39gdw15vc6r1g33xcb8kgmmqmvf0p"; depends=[distr distrEx distrMod distrSim distrTeach distrTEst MASS RandVar startupmsg]; }; distrEllipse = derive2 { name="distrEllipse"; version="2.8.0"; sha256="1ymfa8xpgs8zjp4psiwmll5z0vji496fivxmcavspzxy31cw70wx"; depends=[distr distrEx distrSim mvtnorm setRNG startupmsg]; }; distrEx = derive2 { name="distrEx"; version="2.8.0"; sha256="1gwhsnlrnzyp2x97d9wfdy5pa9z3q5il934wjv4kxs9wsvkwsr5h"; depends=[distr startupmsg]; }; @@ -7007,7 +7025,7 @@ in with self; { dlmap = derive2 { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[ibdreg mgcv nlme qtl wgaim]; }; dlnm = derive2 { name="dlnm"; version="2.3.9"; sha256="0vbrp9x7n94wjrigw124i3i7szy0bsh4sdggi8nsizn2ccsv5pnq"; depends=[mgcv nlme tsModel]; }; dlookr = derive2 { name="dlookr"; version="0.3.13"; sha256="1i1aiy4v3bvlrz0w0hc5qlv5flqgzbgavqmaql6bc8nz5s9p071s"; depends=[classInt corrplot DMwR dplyr ggplot2 gridExtra kableExtra knitr magrittr mice moments prettydoc purrr RcmdrMisc RColorBrewer rlang rmarkdown rpart smbinning tibble tidyr tidyselect tinytex xtable]; }; - dlsem = derive2 { name="dlsem"; version="2.4.5"; sha256="0ywcssjzkdqxlmjbsqdcgl9kivih5zw865556lnxx3zqnfygxzlv"; depends=[graph Rgraphviz]; }; + dlsem = derive2 { name="dlsem"; version="2.4.6"; sha256="1h3bwqqpfjkl41b2mbfhsj0pi9kri0h0i28wiid6arjrmm87nsf8"; depends=[graph Rgraphviz]; }; dlstats = derive2 { name="dlstats"; version="0.1.3"; sha256="0inij1rzw8i683lyzvnjhfzrng7zx727y9wcijv6ny2fw64cdd6n"; depends=[ggplot2 jsonlite magrittr RColorBrewer scales]; }; dm = derive2 { name="dm"; version="0.1.1"; sha256="15268znsb90ndpq7x55lb7brg67ydshki8mc6b53c5y6b8icl5mr"; depends=[backports cli DBI dplyr DT glue igraph lifecycle magrittr pillar purrr rlang tibble tidyr tidyselect vctrs]; }; dma = derive2 { name="dma"; version="1.4-0"; sha256="003snr09hazszwqnvjrbv8vyz6ihgcfcfhrlshg451dddn920615"; depends=[MASS]; }; @@ -7043,13 +7061,14 @@ in with self; { documenter = derive2 { name="documenter"; version="0.1.1"; sha256="0y6zrvmb9bhc1ni4v89h9pq5ara8p2v4b35ylasia5s9x1y93mcp"; depends=[htmltools magrittr officer xml2 yaml]; }; docxtools = derive2 { name="docxtools"; version="0.2.1"; sha256="09fcamrr3yw1zrj4bx8ra9yidprk1h44p48by85zjqwd1ly4gqbf"; depends=[dplyr ggplot2 lubridate purrr rlang stringr tidyr]; }; docxtractr = derive2 { name="docxtractr"; version="0.6.1"; sha256="03bcaiwxxybbdxh26rp4bl66aiv4hxmgn21w6dxm383xha03iqfw"; depends=[dplyr httr magrittr purrr xml2]; }; - dodgr = derive2 { name="dodgr"; version="0.2.5"; sha256="0n4jh7rdj4qxmi1wns3ida8pa7rlvz6lrjl0n9ba18w3mgg1z483"; depends=[callr digest igraph magrittr osmdata Rcpp RcppParallel]; }; + dodgr = derive2 { name="dodgr"; version="0.2.6"; sha256="0fy7dd4gi1kymmlipz5xgl9sx9m7rybhqm6jjjj36bjmik90g675"; depends=[callr digest magrittr osmdata Rcpp RcppParallel RcppThread]; }; doex = derive2 { name="doex"; version="1.2"; sha256="1r999z30ipa04pgck0hfalqxihb1bj8sdhlkkhf4plb7maaz3qm3"; depends=[]; }; dominanceanalysis = derive2 { name="dominanceanalysis"; version="1.3.0"; sha256="0850z2ppdgbfwbv8l40ngl00n4mdj4ciky1g918zazd3jrg88s38"; depends=[]; }; domino = derive2 { name="domino"; version="0.3.1"; sha256="0f67w0z5jy82kgm3l1rji430ayigw30vmmwp3i1nz0xibsx7jxv4"; depends=[]; }; donut = derive2 { name="donut"; version="1.0.1"; sha256="17qiy9j0qm2q2gcysd5717bdl9nmkd7pd5z22pcj3icvxcpssval"; depends=[]; }; doremi = derive2 { name="doremi"; version="0.1.1"; sha256="1h36sj60l5sd5ybbdyrv0wkr9p18j7iwg111khq0znb71xi5nzp7"; depends=[data_table ggplot2 lme4 lmerTest zoo]; }; dosearch = derive2 { name="dosearch"; version="1.0.4"; sha256="1hq85jym0plf8hj77bfd623nhyjgfqqzm1w92n3lii3j5lv9vrwg"; depends=[Rcpp]; }; + dosedesignR = derive2 { name="dosedesignR"; version="0.2.4"; sha256="0c8rilx4afih457f9gafgijm569g366lp4wms0vhc0f9kgr1z8h3"; depends=[DoseFinding DT ggplot2 lattice latticeExtra shiny shinyjs]; }; dosresmeta = derive2 { name="dosresmeta"; version="2.0.1"; sha256="0qdalzdk7q4wx3vl5f3i64m8cb7vhi4pqzghar32j0a7l6gla04z"; depends=[mvmeta]; }; dostats = derive2 { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; }; dotCall64 = derive2 { name="dotCall64"; version="1.0-0"; sha256="1b8p7m3w0m7bp977c6jz74xkd611cxg11j49yza59k5fp338scb9"; depends=[]; }; @@ -7059,13 +7078,12 @@ in with self; { doubcens = derive2 { name="doubcens"; version="1.1"; sha256="1hn65n67by3xqbcnaf5jja5pli0g6wpbbz2sfzd7i2nms7kiywhp"; depends=[]; }; double_truncation = derive2 { name="double.truncation"; version="1.4"; sha256="190fwl119ycmiszkq0mqc6dh8adwqx7b0ipmhz71qvqdzgh9gjm9"; depends=[]; }; downloader = derive2 { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; }; - downloadthis = derive2 { name="downloadthis"; version="0.1.2"; sha256="1d22xyy11gwvhqd8fks4gfq3j1sirbll2irj7jai01s7c4q2qswc"; depends=[base64enc bsplus fs htmltools magrittr mime purrr readr rmarkdown writexl]; }; + downloadthis = derive2 { name="downloadthis"; version="0.1.3"; sha256="187vgc9rmqq8iqqyqc79rd5q0ccnfs65794gs2pna1ma94ahcxc4"; depends=[base64enc bsplus fs htmltools magrittr mime purrr readr rmarkdown writexl]; }; downscale = derive2 { name="downscale"; version="3.0-1"; sha256="0kmv4d5fa6mmhmbfqfxzk1gv55j15d7madsdqi8470bwh0kkya4y"; depends=[cubature minpack_lm raster Rmpfr sp]; }; downscaledl = derive2 { name="downscaledl"; version="1.0"; sha256="0lqxngzpxj65b48j5w0n8dg6fp4lgg5zpgxc2wj6d9wh5f97l71b"; depends=[dplyr keras magrittr raster Rcpp RcppArmadillo rgdal rstack sp tensorflow]; }; downsize = derive2 { name="downsize"; version="0.2.2"; sha256="18b9shd79z0bsdnp0apqqwv6c73j4wnfiv41ywqz761nmxbldxbn"; depends=[magrittr R_utils]; }; dpa = derive2 { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[igraph sem]; }; dparser = derive2 { name="dparser"; version="0.1.8"; sha256="1yx425s3iq03j043g41pyfp3cgmajb4qh50zirhd0qpplzwy8xj5"; depends=[digest]; }; - dpcR = derive2 { name="dpcR"; version="0.5"; sha256="17l9g11qqs2fkskg331889m8nkkrwzrq0n684rdn62pnd5j2n5pi"; depends=[binom chipPCR dgof e1071 evd multcomp pracma qpcR rateratio_test readxl shiny signal spatstat]; }; dpcid = derive2 { name="dpcid"; version="1.0"; sha256="1gx8gyrxvm07mjiasl0b80y0x3crq6gy170v6s817d11jw44n86z"; depends=[]; }; dplR = derive2 { name="dplR"; version="1.7.1"; sha256="1df4g9zz47h0flx5ww6bvlm364q81l2c5flzpa985sv87rq6cz4j"; depends=[digest lattice Matrix matrixStats plyr png R_utils signal stringi stringr XML]; }; dplRCon = derive2 { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; }; @@ -7079,7 +7097,6 @@ in with self; { dqshiny = derive2 { name="dqshiny"; version="0.0.3"; sha256="1fra6fbv8if7wwr8vi3261rdzv4kj99y841lb9xiv1mh72r3mx58"; depends=[htmltools shiny]; }; dr = derive2 { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; }; dr4pl = derive2 { name="dr4pl"; version="1.1.11"; sha256="0vv3h4sxw38grhr70s28sxkca20adnqdmpp8qqwlbr3dw950yaa3"; depends=[ggplot2 Matrix matrixcalc Rdpack tensor]; }; - drLumi = derive2 { name="drLumi"; version="0.1.2"; sha256="09ps8rcqrm6a1y8yif2x82l0k4jywq60pkndh9nzfpbsw4ak2lby"; depends=[chron gdata ggplot2 Hmisc irr minpack_lm msm plyr reshape rootSolve stringr]; }; dragon = derive2 { name="dragon"; version="0.2.1"; sha256="1y2dav9151zdcqw1maxhh3s4c1syk5rs8yb8grx8xkffvg5123w7"; depends=[broom colorspace colourpicker cowplot DT igraph magrittr RColorBrewer shiny shinyBS shinydashboard shinythemes shinyWidgets tidyverse visNetwork]; }; dragonking = derive2 { name="dragonking"; version="0.1.0"; sha256="01b01wd1s2b8sa9f0kfbf2pbzhaqra7xxskigqh3vlj389xqm1id"; depends=[]; }; dragulaR = derive2 { name="dragulaR"; version="0.3.1"; sha256="1cw5v7m1b4pxsizsjb3zdzhydxj577p6q5fcjklsvpzmiixzlyav"; depends=[htmlwidgets shiny shinyjs]; }; @@ -7087,6 +7104,7 @@ in with self; { drat = derive2 { name="drat"; version="0.1.5"; sha256="0i80c4hyclwnq8g8amvdid9pwr11mwbscwydaxmvbrbhv3qzjg6d"; depends=[]; }; draw = derive2 { name="draw"; version="1.0.0"; sha256="0kbz8rcgygl4fhmljzaan5jl7wjvfljcaykm7q9lw9s6m78p06gz"; depends=[]; }; drc = derive2 { name="drc"; version="3.0-1"; sha256="0c8xn8ripzq270hy8d16fcnx02l02alddznd7fqwk3jyi6113h1y"; depends=[car gtools MASS multcomp plotrix scales]; }; + dreamerr = derive2 { name="dreamerr"; version="1.0.0"; sha256="1ri5krfkk538x0afgs6jqv34sg3vad4dn2r395iivixpd77swvg1"; depends=[Formula]; }; drfit = derive2 { name="drfit"; version="0.7.2"; sha256="03ahzmjzrkdrv36yj6vfg3g5bwn6lb7mlxmli68sixag5h83xq7f"; depends=[DBI drc MASS odbc qcc reshape2]; }; drgee = derive2 { name="drgee"; version="1.1.10"; sha256="0hy7887mvlxh73zk2yzp46bqakq924n940j21lw25jgygmzz1176"; depends=[data_table nleqslv Rcpp RcppArmadillo survival]; }; driftR = derive2 { name="driftR"; version="1.1.0"; sha256="0mvrmwfqg234kk5klhmw7vmf8i0g485xkx5nk73iam16fbzl9y5g"; depends=[dplyr glue janitor lubridate magrittr readr readxl rlang stringr tibble]; }; @@ -7098,18 +7116,19 @@ in with self; { drugCombo = derive2 { name="drugCombo"; version="1.1.1"; sha256="0f4akxmj5jd89jm7kzkmqksxmb6fqj7jawvm3hpw6limyry3mp4z"; depends=[BIGL Deriv ggplot2 minpack_lm nlme rgl]; }; drumr = derive2 { name="drumr"; version="0.1.0"; sha256="09xi3sf424bpq10fq25j209dylfbi1lfd911r44ffadkxzvp5p1s"; depends=[audio stringr]; }; ds = derive2 { name="ds"; version="4.0"; sha256="1iic5fb27cnhsa83zg28hydrhzc01i9z0711xvk95c3gv7mbfp2p"; depends=[]; }; - ds4psy = derive2 { name="ds4psy"; version="0.1.0"; sha256="15knnl0ld8vnb3mv06p7425h7w5y5m598k4dny8svqwranhs856a"; depends=[cowplot ggplot2 here readr stringr tibble tidyr tidyverse unikn]; }; - dsa = derive2 { name="dsa"; version="0.70.3"; sha256="0ilfrrfdvw86p6q5jskh0fqnqrcz75j2ldzhvwfpbdr9bh65jfai"; depends=[dygraphs extrafont forecast ggplot2 gridExtra htmlwidgets R2HTML reshape2 rJava timeDate tsoutliers xtable xts zoo]; }; + ds4psy = derive2 { name="ds4psy"; version="0.2.0"; sha256="0gh224lyrbrky9p68cp47w7zzp8gmy3hgd9dzq0fng47lx97v6dq"; depends=[cowplot dplyr ggplot2 here magrittr tibble unikn]; }; + dsa = derive2 { name="dsa"; version="0.74.18"; sha256="17pyr5jn6mjcch5cl22z8mg31anirmgdjs6k9vjmz5ar35fcb1vi"; depends=[dygraphs extrafont forecast ggplot2 gridExtra htmlwidgets R2HTML reshape2 rJava timeDate tsoutliers xtable xts zoo]; }; dsample = derive2 { name="dsample"; version="0.91.2.2"; sha256="18c0zxaqwgbn9kmkwlnicwd74ljy2sxj0b9ksif13pdlj3zn57h1"; depends=[MASS]; }; dscore = derive2 { name="dscore"; version="1.2.0"; sha256="01lv9yq5d817rx686l1cw1s2265a7wx9g41xhsdx59wkz37wrzwv"; depends=[dplyr Rcpp RcppArmadillo stringr tidyr]; }; dse = derive2 { name="dse"; version="2020.2-1"; sha256="170rxrniszs8h59ah4mn4mz8d7kzix4g3vlz4icd8w6bl40c6ykc"; depends=[setRNG tfplot tframe]; }; dslabs = derive2 { name="dslabs"; version="0.7.3"; sha256="0fhd6zwa4lmgrrybywvj1vxd98a483yca605dj2pwipqifh1x6ka"; depends=[ggplot2]; }; dslice = derive2 { name="dslice"; version="1.2.0"; sha256="1k9hxpmr563p8bpd9m991lx5ig366mzk9j1lzldci9pq4jiayin1"; depends=[ggplot2 Rcpp scales]; }; + dsm = derive2 { name="dsm"; version="2.3.0"; sha256="0b7jdhfrpkyjhxxlkgxsnnidmmpbb3jkx41iqmp08bxipbjyw4kr"; depends=[ggplot2 mgcv mrds nlme numDeriv plyr statmod]; }; dsr = derive2 { name="dsr"; version="0.2.2"; sha256="0bs5aspi2khs9n60q7d2ah6zv4rzhbyk2bafd17c12jzjqlh1228"; depends=[dplyr frailtypack rlang]; }; dsrTest = derive2 { name="dsrTest"; version="0.2.1"; sha256="1kljlfi7jf6fa8b5f3wxjsa9rlmzcp4qix3m2qyapz2lqd85mbb7"; depends=[asht exactci loglognorm]; }; dssd = derive2 { name="dssd"; version="0.2.1"; sha256="0lfr3bb3nba6pkg13d3kiblbp4naqxcdkvdqsa0y1zlhak74cgcj"; depends=[plot3D rgdal sf]; }; dst = derive2 { name="dst"; version="1.4.1"; sha256="1cz1fcyxpyv0ywmwlqdhgj3nzidnzcaxc1nkh8y5mph9wm612c25"; depends=[]; }; - dstack = derive2 { name="dstack"; version="0.1.0"; sha256="05a44d9wzl7jxd1q1jcrnih6w99rblchwh072fw3bhxsh7x35hga"; depends=[base64enc httr nanotime rjson rlist uuid yaml]; }; + dstack = derive2 { name="dstack"; version="0.2.0"; sha256="091hxqg6sy0qsz6jypi1nybg42mgdqw2ygkpmr5bnpc0n8yp55mq"; depends=[base64enc httr nanotime rjson rlist uuid yaml]; }; dstat = derive2 { name="dstat"; version="1.0.4"; sha256="023jp0xdbg200ww1gnr3fzgjqd82acag0jps7q6j6m27q11psvgz"; depends=[]; }; dtangle = derive2 { name="dtangle"; version="2.0.9"; sha256="0yg1fbrqixqp93vdw3grvz1la5l2kidgs730qp6yihkp3260cxf3"; depends=[DEoptimR]; }; dti = derive2 { name="dti"; version="1.5.1"; sha256="08da7v7sl88g2jixfplvw9rc5rvlifq3fvyrgh9naa5jsmd8h5ia"; depends=[adimpro aws awsMethods gsl oro_dicom oro_nifti quadprog rgl]; }; @@ -7132,7 +7151,7 @@ in with self; { dundermifflin = derive2 { name="dundermifflin"; version="0.1.1"; sha256="0rp8p4ln92kfxkczl7vi9r2jhxb1ky203s02940cjjkczsphpcc1"; depends=[crayon stringi]; }; dunn_test = derive2 { name="dunn.test"; version="1.3.5"; sha256="0lqwvyl3pyygfc73nf81gzw3zl3w43r7ki0yw2dgrzhkpb2iji4a"; depends=[]; }; dupiR = derive2 { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; }; - dupree = derive2 { name="dupree"; version="0.2.0"; sha256="12dlqmvk2zlxh283xjf2d6x12cy6r3rsy88y5g40h9002m7i2jqy"; depends=[dplyr lintr magrittr purrr rlang stringdist tibble]; }; + dupree = derive2 { name="dupree"; version="0.3.0"; sha256="0q8c0z1yhym20rhfjrc8n03gk458z0n8axx013rcwk1vc2zwk670"; depends=[dplyr lintr magrittr purrr rlang stringdist tibble]; }; durmod = derive2 { name="durmod"; version="1.1-4"; sha256="0d721sbxjfh00gpxd4hj8iq04awfd0pcd6bw8cv7kny21l2f3w44"; depends=[data_table mvtnorm nloptr numDeriv Rcpp]; }; dvmisc = derive2 { name="dvmisc"; version="1.1.4"; sha256="01v6sixx0f3nrn6ymfifb3pvd2msfrwm21kmdv38laxq29vc4rsi"; depends=[cubature data_table dplyr ggplot2 MASS mvtnorm pracma rbenchmark Rcpp survey tab]; }; dwdradar = derive2 { name="dwdradar"; version="0.2.0"; sha256="06wa3m77931lv47530hyczwdjrrfdmgczmbhwy0z9fzhn8kz0ipp"; depends=[]; }; @@ -7179,7 +7198,7 @@ in with self; { ePCR = derive2 { name="ePCR"; version="0.9.9-11"; sha256="0bkvjvygdnzcc23sslgkcrx11mzwgsqss37lwnbr7rq0jp1sw46s"; depends=[Bolstad2 glmnet hamlet impute pracma survival timeROC]; }; eRTG3D = derive2 { name="eRTG3D"; version="0.6.2"; sha256="04m39jkp4lvv145wmcswc87qx36wpfkm95kq9fik8a3jb5myvjll"; depends=[CircStats ggplot2 gridExtra pbapply plotly plyr raster rasterVis sp tiff]; }; eRm = derive2 { name="eRm"; version="1.0-1"; sha256="0njqzznnhnkvalmhiq5yq1w7gwp2myki5cv61w42ydvd27hdyyg9"; depends=[colorspace lattice MASS Matrix psych]; }; - eSDM = derive2 { name="eSDM"; version="0.3.2"; sha256="0vjphknba4a6y1wdgv9v6r3a6kj088fq83b4387d4z72g0kkwcmc"; depends=[colorRamps colourpicker dichromat dplyr DT leaflet lwgeom purrr raster RColorBrewer rlang ROCR sf shiny shinycssloaders shinydashboard shinyjs tmap units viridis zip]; }; + eSDM = derive2 { name="eSDM"; version="0.3.3"; sha256="1iss3l7krcfjxa1pana1ijsbggpbv72gs2sc2gskdrhy5jwlk334"; depends=[dplyr magrittr purrr rlang ROCR sf shiny units]; }; eaf = derive2 { name="eaf"; version="1.9-1"; sha256="0h7nilqa11s4casalilmk4ssgcl1lqn1w4033zxgc20y7f9rxhsg"; depends=[modeltools]; }; earlyR = derive2 { name="earlyR"; version="0.0.1"; sha256="14davqhh3n5dfsddnfd79ni56bssrpwhvkqkdb77a8x9fn8w32pv"; depends=[distcrete EpiEstim epitrix]; }; earlygating = derive2 { name="earlygating"; version="1.0"; sha256="0y6xjkh9p8bvanc9p5sycah8v81k85xr8i7vyvjb9g4a64srwhd7"; depends=[betareg doParallel foreach]; }; @@ -7204,6 +7223,7 @@ in with self; { easypower = derive2 { name="easypower"; version="1.0.1"; sha256="1vf0zv55yf96wjxja6ifdjvgc9nw0jl0hnc1ygyjd8pmwbgdz9bl"; depends=[pwr]; }; easyr = derive2 { name="easyr"; version="0.3-1"; sha256="139xg91j01i5sczbifga3476j98qv9n3vs5wp4ai66blfsiqf1yy"; depends=[data_table digest dplyr foreign glue Hmisc lubridate openssl qs readxl rlang stringr tibble XML]; }; easyreg = derive2 { name="easyreg"; version="4.0"; sha256="1w4wlhziyhdyldm0zgnm73fnxrh0fv8hwcw5j8ircxb4npx7bcgg"; depends=[nlme]; }; + eatDB = derive2 { name="eatDB"; version="0.4.0"; sha256="0jdz36mzv8x2p4aifdscplnl1nb2dwwdmvc29wn14k47lm8c982h"; depends=[DBI RSQLite]; }; ebGenotyping = derive2 { name="ebGenotyping"; version="2.0.1"; sha256="1jllzc7kvvckrws8qhgvwy626llyb68sp1davp7swx48sf7rwcxc"; depends=[]; }; ebSNP = derive2 { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfvdgpiq8i7sqdp5assb8z1823w0b"; depends=[]; }; eba = derive2 { name="eba"; version="1.9-0"; sha256="1xbjd7n895wzzybpjf634a1jpbwqxwh7l17phz6zv7h6dfw19nx4"; depends=[nlme psychotools]; }; @@ -7225,13 +7245,12 @@ in with self; { eclust = derive2 { name="eclust"; version="0.1.0"; sha256="01x327w02m357lngmgv3drni2s67sass25xk9vni1z434n8i4428"; depends=[caret data_table dynamicTreeCut magrittr pacman pander stringr WGCNA]; }; ecm = derive2 { name="ecm"; version="4.4.0"; sha256="1f9x3lcihvnkc5fr4g94h0m5a9h4rjmq9hkjs34il2id8bw92gj7"; depends=[car]; }; ecmwfr = derive2 { name="ecmwfr"; version="1.2.2"; sha256="0gr1cqvl6p3x63kqg8v1xnk8h6g1acqb3agq9p51zqzcx40hdsrc"; depends=[curl getPass httr keyring memoise]; }; - ecodist = derive2 { name="ecodist"; version="2.0.3"; sha256="1fhlsiywvfyw03dhbwk2g9blymsjvzhcbwdsqn59bmdjk7aiy79x"; depends=[]; }; + ecodist = derive2 { name="ecodist"; version="2.0.5"; sha256="1kijyik0fnjhl69j230mkkdnkknmrbzj43mcj3xv7jy61i2sy0by"; depends=[]; }; ecolMod = derive2 { name="ecolMod"; version="1.2.6"; sha256="1n30faldfhpm2jkaw793vr220kgn3bmn8hxhw32rax294krmwn4v"; depends=[deSolve diagram rootSolve shape]; }; ecolottery = derive2 { name="ecolottery"; version="1.0.0"; sha256="0w5aq1aaqzz74vlj8hgnmn60l8rdrchx022dpspqnpvpzdlh65z5"; depends=[abc ggplot2]; }; econet = derive2 { name="econet"; version="0.1.81"; sha256="0hm1v4fjzyzdaxiw6lar7fxnqsckis3n7nrsravhbllhcf0aqq7w"; depends=[bbmle dplyr igraph intergraph MASS Matrix minpack_lm plyr sna spatstat_utils tnet]; }; econetwork = derive2 { name="econetwork"; version="0.4"; sha256="0p20yj4xki4cj4pww51i6wj6cxp5k3ksc2vcb4f4qh7lr82hnb09"; depends=[bipartite blockmodels igraph Matrix_utils rdiversity]; }; economiccomplexity = derive2 { name="economiccomplexity"; version="1.0"; sha256="1bqayzpfz26lb985l66j27qybyqx0148fiikb8diamq0mbx3picc"; depends=[igraph Matrix]; }; - econullnetr = derive2 { name="econullnetr"; version="0.2.0"; sha256="1amgwcsm42ffrdx5a11nkvdx37qqjfh7z54z1hl4b07n8rg1rp7c"; depends=[bipartite gtools reshape2]; }; ecoreg = derive2 { name="ecoreg"; version="0.2.3"; sha256="1bhh4bnvrvgz49wim5r0b4awfsn9l23wvl4kl0vny0s4hm7cgahc"; depends=[]; }; ecoseries = derive2 { name="ecoseries"; version="0.1.5"; sha256="1q35hp5hl6z28hns5rnp3mjn6hqp5qh714pagw7fw4d4a6wnvacy"; depends=[magrittr RCurl readr rjson rvest tibble xml2 zoo]; }; ecosim = derive2 { name="ecosim"; version="1.3-1"; sha256="0gpgjswqmibnz9lpcidvw3y1wmd38l4lyha4fbs0agiz6yyfiyjn"; depends=[deSolve stoichcalc]; }; @@ -7246,7 +7265,7 @@ in with self; { ed50 = derive2 { name="ed50"; version="0.1.1"; sha256="058p1750ba5hp4rczi26grgwjia2ny1880v1vfp6wxad13r459pq"; depends=[boot]; }; ed50simulation = derive2 { name="ed50simulation"; version="0.1.1"; sha256="00fknpssrpin8bpjhf2lsjx3lbpinrmqa6jzmgy3nslkc51x0939"; depends=[boot]; }; eda4treeR = derive2 { name="eda4treeR"; version="0.2.0"; sha256="0fh6nfgvbkvjm1f0b292ggi0mr8ylq5pg2wp8cph46j8rhbgbdxz"; depends=[dae dplyr emmeans ggplot2 lme4 magrittr pbkrtest tidyverse]; }; - edbuildmapr = derive2 { name="edbuildmapr"; version="0.1.0"; sha256="1wk0xxdlvpa9wj2cbiwj23kh6f24x29391lmwvw1rnhlqxrfypk7"; depends=[dplyr lwgeom magrittr sf spdep stringr tidyselect tmap]; }; + edbuildmapr = derive2 { name="edbuildmapr"; version="0.1.1"; sha256="1zv5031zx9lz6ii74947kp5vw8lqx0gi5si2mbvmfk7ywc4dv3jh"; depends=[dplyr magrittr sf spdep stringr tidyselect tmap]; }; edbuildr = derive2 { name="edbuildr"; version="0.1.1"; sha256="0cbwkvlj5w3vbg2k20fqxanrahly3ca22zdlfqk62v38i78cpldq"; depends=[dplyr magrittr openxlsx scales stringr tidyselect]; }; edcc = derive2 { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; }; edci = derive2 { name="edci"; version="1.1-3"; sha256="1f1ry2adfranfrrvf1gkiy58pra3z6bray4v5fgr0z9n1ybcaff0"; depends=[]; }; @@ -7261,6 +7280,7 @@ in with self; { edgeCorr = derive2 { name="edgeCorr"; version="1.0"; sha256="19n67yc58ksin7xydrnfsyyw7fqawm5xli67cz4lv4wb62w6r6ld"; depends=[]; }; edgeRun = derive2 { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table edgeR]; }; edgebundleR = derive2 { name="edgebundleR"; version="0.1.4"; sha256="0pajr95qqppk2m4l7rfi46rll32z8a7lmq0vmb3p8n0aks5ajn1n"; depends=[htmlwidgets igraph rjson shiny]; }; + edgedata = derive2 { name="edgedata"; version="0.1.0"; sha256="0fx8s2gq9haj66r2zm9hmq0g93g8xgkraakpdpzd8n37pp0ivv7f"; depends=[]; }; edina = derive2 { name="edina"; version="0.1.1"; sha256="1lpmidyxi54byrsnwwadkh5rr454635xrwa4v2wz8mqr2hngxis3"; depends=[ggplot2 jjb Rcpp RcppArmadillo reshape2 rgen]; }; editData = derive2 { name="editData"; version="0.1.2"; sha256="1ibpd2rlm6i9izyizmdhzxv8agrw920hxbin5y79cmf78rdg1sxy"; depends=[DT miniUI rstudioapi shiny tibble]; }; editrules = derive2 { name="editrules"; version="2.9.3"; sha256="07j8wj0fk34irqgsz70h2wad3wdjv5xl1cl702vxbr0nvmpw2ngl"; depends=[igraph lpSolveAPI]; }; @@ -7273,15 +7293,14 @@ in with self; { eegkitdata = derive2 { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; depends=[]; }; eel = derive2 { name="eel"; version="1.1"; sha256="0cv6dhw57yy140g73z94g9x1s42fpyfliv9cm2z1alm7xwap1l0x"; depends=[emplik rootSolve]; }; eemR = derive2 { name="eemR"; version="1.0.1"; sha256="1w3nwlrbxm7z4c3acx991zk5drgs67qys7kgl0qakh5vrdsrxw3v"; depends=[assertthat dplyr pracma purrr R_matlab rlist stringr viridis]; }; - eeptools = derive2 { name="eeptools"; version="1.2.2"; sha256="1sc9km926pnl6dhk7ir2zx4693bki10zrq09v07k177wq7xlphw9"; depends=[arm data_table ggplot2 maptools vcd]; }; eesim = derive2 { name="eesim"; version="0.1.0"; sha256="0ljj1jp9cl0im8k7sfjd28ggj4q9a14df3554kwxkssr1vsn1wbc"; depends=[dplyr lubridate purrr viridis]; }; effectFusion = derive2 { name="effectFusion"; version="1.1.2"; sha256="0m392wrkmgvys7a2bk2w1swfkjikkllng8sy8wb8s2j9y6c3wanp"; depends=[bayesm cluster ggplot2 GreedyEPL gridExtra MASS Matrix mcclust]; }; effectR = derive2 { name="effectR"; version="1.0.2"; sha256="1icr1sx98x3h8rbky1agdh809arhjqcypyajl7y50yis8a5pkycb"; depends=[ggplot2 reshape2 rmarkdown seqinr shiny viridis]; }; effects = derive2 { name="effects"; version="4.1-4"; sha256="1jbpyji7qn5hz8a6afsfbng0nx0a7w0v3v51wpmnbipfjchyalhy"; depends=[carData colorspace estimability lattice lme4 nnet survey]; }; - effectsize = derive2 { name="effectsize"; version="0.2.0"; sha256="1liix8rf8xq3hzi7684bl0s20iflsq6g5mxr5k59wp2qwn1i6aww"; depends=[bayestestR insight parameters]; }; + effectsize = derive2 { name="effectsize"; version="0.3.0"; sha256="0kijp4wamkidaxysc11dd4vhvnm4wnbi87871wcbwn27k5b6i5dg"; depends=[bayestestR insight parameters]; }; effectsizescr = derive2 { name="effectsizescr"; version="0.1.0"; sha256="0shfjk6r3bz04jakrn5nwgymjx60lk83i0akcx7zqfxp3k8yncs5"; depends=[Kendall]; }; efflog = derive2 { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; }; - effsize = derive2 { name="effsize"; version="0.7.9"; sha256="01gl6bacsn7yyg9a3s5f6z6i115rxrdfi19vz551xq287k4i6qqn"; depends=[]; }; + effsize = derive2 { name="effsize"; version="0.8.0"; sha256="129g9nv6qmbh6z7gazx4vxs5myvcgdhszi28396gsvzrlzi0ik8b"; depends=[]; }; efreadr = derive2 { name="efreadr"; version="0.2.2"; sha256="1h27by1m451wrnw017005avs5yj3fjzrm2lq5153aqm1mbbxxwvs"; depends=[dplyr ensurer magrittr readr]; }; efts = derive2 { name="efts"; version="0.9-0"; sha256="1cdn37sij3q73z9gal6x3nnnds55whfj5ywyww119hx092xcb2h4"; depends=[lubridate magrittr ncdf4 plyr stringr udunits2 xts]; }; ega = derive2 { name="ega"; version="2.0.0"; sha256="04kwh24aap22yclmcrix3vi553qb30hd43mgfzpdl0cw3ibrh7xg"; depends=[ggplot2 mgcv]; }; @@ -7301,10 +7320,11 @@ in with self; { eigenprcomp = derive2 { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; }; eikosograms = derive2 { name="eikosograms"; version="0.1.1"; sha256="13s5wqcc8iwnhn3msrh9dfrvq9bwlby93p9v5wcnrm8m9iskax1s"; depends=[plyr]; }; eimpute = derive2 { name="eimpute"; version="0.1.0"; sha256="0q8b98fmfrbk00jr7gzqaij781g5v9wj883xphyrvr0khlr499xl"; depends=[Rcpp RcppEigen]; }; + einet = derive2 { name="einet"; version="0.1.0"; sha256="02v4k6031q2bcjkhbypzkgdj1lyvqbsi1nb0y40zb26bk2381ycq"; depends=[assertthat entropy igraph magrittr shiny]; }; eive = derive2 { name="eive"; version="2.3"; sha256="073hwx944db7zxq6yib6yvciaic11k49zl1iqphippcd5ygkad80"; depends=[Rcpp]; }; eivtools = derive2 { name="eivtools"; version="0.1-8"; sha256="0ynmrql6dv10m7cwba5mzwlbvp6ab53nzqqvk3ihwyiqzmnnmpk4"; depends=[R2jags]; }; eiwild = derive2 { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[coda gtools lattice]; }; - eixport = derive2 { name="eixport"; version="0.4.5"; sha256="13c717ws4b71x2dd7x33v72plqkd88nhsbxr0w3wm09xfana7l5b"; depends=[cptcity ncdf4 raster sf sfheaders silicate sp tidyr]; }; + eixport = derive2 { name="eixport"; version="0.4.6"; sha256="0jyz6xqhl893zf902i36fpmj7a8hncpp1s0n9qr8kkwjba6yd1ba"; depends=[cptcity ncdf4 raster sf sfheaders silicate sp tidyr]; }; elaborator = derive2 { name="elaborator"; version="1.0"; sha256="1jhs1hiwlww0sr3yacg5amr1mhwjwa10b374klrkkvzzw2y20p1x"; depends=[bsplus dendextend dplyr forcats gclus haven plotly purrr RColorBrewer reshape2 rlang seriation shape shiny shinyBS shinycssloaders shinydashboard shinyjs shinyWidgets tidyr V8]; }; elasso = derive2 { name="elasso"; version="1.1"; sha256="0nz3vw803dvk4s45zc9swyrkjwna94z84dn4vfj3j17h74a0cij2"; depends=[glmnet SiZer]; }; elastic = derive2 { name="elastic"; version="1.1.0"; sha256="1xg8gqa0maasx85fbff4vid2r8s0fgzj4iswyayybzik99zb26ly"; depends=[crul curl jsonlite R6]; }; @@ -7332,9 +7352,8 @@ in with self; { elo = derive2 { name="elo"; version="2.1.1"; sha256="1i6qcw2plw12v065142kx58d911zr1gcsd1xic152zxvh89nmhxx"; depends=[pROC Rcpp]; }; elsa = derive2 { name="elsa"; version="1.1-28"; sha256="01sj2a4yhv5m6qj6ih26zw4yzd8s27lll7yp0yysjjrwz79a0fbq"; depends=[raster sp]; }; emIRT = derive2 { name="emIRT"; version="0.0.11"; sha256="1h91q9vi9cv14bmkaakyynw2z9sx51w0c2kw2in0x91wx7scmd0p"; depends=[pscl Rcpp RcppArmadillo]; }; - emax_glm = derive2 { name="emax.glm"; version="0.1.2"; sha256="04di6bp97cxjbbszakb64y15bjmnd2j8zvxdj8gdbgmhxk9wmbwd"; depends=[AER MASS pander pracma pROC]; }; emayili = derive2 { name="emayili"; version="0.3.9"; sha256="0cc4i0d56k1l87ifa0x9vpfw0615hk7hzgyxfp68fh5yrj0fc6ab"; depends=[base64enc curl glue httr magrittr mime stringi]; }; - emba = derive2 { name="emba"; version="0.1.2"; sha256="0bf0wvzhjr0xig9rz6jkb08bb6jfv8za48lyqgp9fkkv1nnz9hjg"; depends=[Ckmeans_1d_dp igraph magrittr purrr rje usefun visNetwork]; }; + emba = derive2 { name="emba"; version="0.1.4"; sha256="133831zghkjr8bx2b995zw7rmn9vwws3xwkjzd9akz8myfdzp55v"; depends=[Ckmeans_1d_dp igraph magrittr purrr readr rje usefun visNetwork]; }; embed = derive2 { name="embed"; version="0.0.6"; sha256="1bwr32923b04cnvsm3pqzsw4rnihjqdfpqkh6pga520dw9x2w1dd"; depends=[dplyr generics keras lme4 purrr recipes rlang rstanarm tensorflow tibble tidyr uwot withr]; }; embryogrowth = derive2 { name="embryogrowth"; version="7.6"; sha256="0bsg904jikb1dqichkinpgm0difg17sfczw6q4zab6r02s7yb53s"; depends=[deSolve HelpersMG numDeriv optimx]; }; emdbook = derive2 { name="emdbook"; version="1.3.12"; sha256="0ls3zxxlwmdv7zn1v9i1y9zc2sn0hbgmyjvsj7zn3ajsw7wwlih6"; depends=[bbmle coda lattice MASS plyr]; }; @@ -7345,7 +7364,7 @@ in with self; { emld = derive2 { name="emld"; version="0.4.0"; sha256="16ikzkvl4xn7ixa4sfh21isx2gpppvx5ajpann26f35645pm51xk"; depends=[jsonld jsonlite xml2 yaml]; }; emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; }; emme2 = derive2 { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; }; - emmeans = derive2 { name="emmeans"; version="1.4.5"; sha256="10fmvmd6q4zjr6b18hhc85mwrzv778qzj6lwl9kbs2fsfvsgw7mm"; depends=[estimability mvtnorm numDeriv plyr xtable]; }; + emmeans = derive2 { name="emmeans"; version="1.4.6"; sha256="0mxk7ghlv4r6sna4897q1la2xgyn1dw3r9srhm9x4h5l4701avfa"; depends=[estimability mvtnorm numDeriv plyr xtable]; }; emoa = derive2 { name="emoa"; version="0.5-0.1"; sha256="0rkr4d4fyqxmsrlbzar27z97qkw4cl1dkvfnhbdwpgg9fi1cixmz"; depends=[]; }; emojifont = derive2 { name="emojifont"; version="0.5.3"; sha256="1cdrrl3hvrs8rskyy6zgr7q2mmg8yb9k8sld1m64zsp7y009g19k"; depends=[ggplot2 proto showtext sysfonts]; }; emon = derive2 { name="emon"; version="1.3.2"; sha256="19khjjpyxvzhzihqq15w02l5v5ryyvxlklz1ch2gkmqcpnvyga32"; depends=[MASS mgcv]; }; @@ -7386,8 +7405,8 @@ in with self; { entropy = derive2 { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; }; entrymodels = derive2 { name="entrymodels"; version="0.2.0"; sha256="18byy6ky37n0a3ixrl6jik9pqbv07sbfkm9vb7wrziyywdfqmzp8"; depends=[dplyr magrittr readr]; }; envDocument = derive2 { name="envDocument"; version="2.4.1"; sha256="074m7adnasvys28kjdgj9071fi90vsl4yv5zvpxik4crlx098dlw"; depends=[]; }; - envalysis = derive2 { name="envalysis"; version="0.3.3"; sha256="1ys93g5gxr9x1v4hg98dcpwa40n5xkh1j8drrmpnmxwq6gv01r6r"; depends=[drc ggplot2]; }; - enveomics_R = derive2 { name="enveomics.R"; version="1.7.0"; sha256="0nk356svi25lzw5iza0jmg6krxhizilm7ja3sgym65319jpcflbp"; depends=[fitdistrplus investr sn]; }; + envalysis = derive2 { name="envalysis"; version="0.4"; sha256="1qfg8z63qc6n8agv0g7n3qjcwid32axwkyyjjxa271by335aplha"; depends=[drc ggplot2]; }; + enveomics_R = derive2 { name="enveomics.R"; version="1.8.0"; sha256="00akdhqs7jabk7g33rwmxs92jcr39shy9s456nqxk6x4244d2vb3"; depends=[fitdistrplus investr sn]; }; enviGCMS = derive2 { name="enviGCMS"; version="0.6.0"; sha256="0d0a7zv3nlsk8dq7wn3mg0nnvry56r9zm4y593mr1shcnmfm6nyn"; depends=[animation BiocParallel broom crosstalk data_table dplyr DT genefilter ggplot2 ggraph ggridges igraph mixtools plotly RColorBrewer Rdisop reshape2 rmarkdown shiny shinythemes]; }; enviPat = derive2 { name="enviPat"; version="2.4"; sha256="1gvb7jmwwh4l44b50xmrq3bysr2iv6442yh9pdk6n81g3bgpz1d0"; depends=[]; }; enviPick = derive2 { name="enviPick"; version="1.5"; sha256="04q6zwqq2ip8b8h2n1jpgx1bzcvi7lazljs0806wiakbc79x232p"; depends=[readMzXmlData shiny]; }; @@ -7408,7 +7427,7 @@ in with self; { epicontacts = derive2 { name="epicontacts"; version="1.1.0"; sha256="0f4a1y311z3fxw7ygj6fgsq6d2qn0ivxsjlh742pkmg3jb63s0f3"; depends=[colorspace dplyr igraph magrittr threejs visNetwork]; }; epidata = derive2 { name="epidata"; version="0.3.0"; sha256="1b00k086wiwhhrlh4348wqqza1v0whakwy5h7q95rmgxz7lppiim"; depends=[dplyr httr jsonlite purrr readr rvest stringi tidyr xml2]; }; epiflows = derive2 { name="epiflows"; version="0.2.0"; sha256="09ri1p73ih0i08irc06ff169hi5vcl8bdi63b056kzxgmv17yqkp"; depends=[epicontacts geosphere ggmap ggplot2 htmltools htmlwidgets leaflet sp tibble visNetwork]; }; - epikit = derive2 { name="epikit"; version="0.1.0"; sha256="0whb36y8z5apyiywd2bhqnay3qr6b8h5rqp8mxkksrhifibjjx4w"; depends=[binom dplyr forcats glue rlang scales tibble tidyr tidyselect]; }; + epikit = derive2 { name="epikit"; version="0.1.1"; sha256="0wa7lfkkwygqmbyfjmwr4si2cdi7s1hd1bwsk1jaip1d3r0hyyrb"; depends=[binom dplyr forcats glue rlang scales tibble tidyr tidyselect]; }; epimdr = derive2 { name="epimdr"; version="0.6-5"; sha256="1nxdlz7gl9vrha9iw92y0s9dmm101gkz0rsqxqg1rdxanr6hs6sh"; depends=[deSolve polspline shiny]; }; epinet = derive2 { name="epinet"; version="2.1.8"; sha256="10bgq66n99kkz0nhmsz508aypxk57zk19p5l3xrb28n72k4rfgrf"; depends=[network]; }; epiphy = derive2 { name="epiphy"; version="0.3.4"; sha256="04wsppjycnrzrml3zxrpr0xdxxas3hj8rskiivx5vfmfjpwipq4r"; depends=[ggplot2 msm pbapply Rcpp transport]; }; @@ -7426,6 +7445,7 @@ in with self; { eponge = derive2 { name="eponge"; version="0.1.0"; sha256="19wd80l35acij793spxglcwz346i2iivk6n0q2304wjcca6qzds7"; depends=[rlang]; }; epr = derive2 { name="epr"; version="3.0"; sha256="0czfz6qkcpa2qqs3pqii27hgpdvdzfrvxl0ip67v58hamq7kvjfv"; depends=[car lme4]; }; epsiwal = derive2 { name="epsiwal"; version="0.1.0"; sha256="0lmcmiqcc1pjj1d0zyn0hc23if1lkm85p6vcjqbddpnv9ags2mbh"; depends=[]; }; + epuR = derive2 { name="epuR"; version="0.1"; sha256="0dx808dq78c1s78fv0my79ar7h20fyxa0gpfdv85zi80v9g82g4z"; depends=[data_table lubridate openxlsx stringr xts zoo]; }; epubr = derive2 { name="epubr"; version="0.6.1"; sha256="0rp9q6hriilps5h6nc1226w5dvzws1g78pg3ldrq2r4dakpvsmjj"; depends=[dplyr magrittr tibble tidyr xml2 xslt]; }; epxToR = derive2 { name="epxToR"; version="0.4-0"; sha256="1vw9czdxp80jpvcc8bj5m4fshlavlawc1735m0s0d0x14z3giy6g"; depends=[httr XML]; }; eq5d = derive2 { name="eq5d"; version="0.7.0"; sha256="0k9hvazynphhpwpbxi9dgmrjqp0nlmgkikx6qpdg5hp2psl0lmyx"; depends=[]; }; @@ -7467,7 +7487,7 @@ in with self; { esaddle = derive2 { name="esaddle"; version="0.0.6"; sha256="0i89yid4zryc95aj8n512wj3cs5nx351w4rc1nghq5a7vp139fa7"; depends=[doParallel mvnfast plyr Rcpp RcppArmadillo]; }; esaps = derive2 { name="esaps"; version="0.1.0"; sha256="1rchs4i7n221gyhj9kbka4zmi2lf72q3ak2pdxkr7w6pcx6803yz"; depends=[plyr readODS readxl]; }; esc = derive2 { name="esc"; version="0.5.1"; sha256="0gns7gz55p6pha05413r3hlvd7f2v1amxkg13d197mab1ypqic7q"; depends=[]; }; - escalation = derive2 { name="escalation"; version="0.1.1"; sha256="16dw8c6cjmzazchwxyh5x2gqpbiaqwrfbjiv7bp5b06kazy106s1"; depends=[BOIN dfcrm dplyr gtools magrittr purrr stringr tibble tidyr tidyselect]; }; + escalation = derive2 { name="escalation"; version="0.1.2"; sha256="1s1kkh9wmd4sanmyramq4fa23fpb26v9nk4d2yg2phgaigxyp041"; depends=[BOIN dfcrm DiagrammeR dplyr ggplot2 gtools magrittr purrr RColorBrewer stringr tibble tidyr tidyselect viridis]; }; eseis = derive2 { name="eseis"; version="0.5.0"; sha256="03pjcms3aj7sm2wrld64v1dw53bqn9pmsayndma03abjh66rblii"; depends=[caTools fftw IRISSeismic matrixStats multitaper raster Rcpp reticulate rgdal rmarkdown shiny signal sp XML]; }; eshrink = derive2 { name="eshrink"; version="0.1.0"; sha256="0s1jl652za7qwv70kmc1h3vbwlijl49527pwpm0z347lz2jdcigj"; depends=[glmnet MASS]; }; esmisc = derive2 { name="esmisc"; version="0.0.3"; sha256="1d6xrdxwn85c8s60s7vzaymh7wa9f7fzd79hq5spzd12fr3zisvj"; depends=[ggplot2 raster readr]; }; @@ -7476,7 +7496,7 @@ in with self; { esreg = derive2 { name="esreg"; version="0.5.0"; sha256="1njwqm3hrcxwl6y7gwa4zq0q5139293qk503ahw23dxwzdsiy2z5"; depends=[Formula quantreg Rcpp RcppArmadillo]; }; essHist = derive2 { name="essHist"; version="1.2.2"; sha256="0rvlxfcl42h4pjqf37mx7bc4k21iwvnys6l5rf2jsl7yk1b9hmbn"; depends=[Rcpp]; }; essurvey = derive2 { name="essurvey"; version="1.0.5"; sha256="078bm5knrhij4rdv7hqv5ci0dfdci7lw4yrqbikp8miapivv88vp"; depends=[haven httr rvest tibble xml2]; }; - estatapi = derive2 { name="estatapi"; version="0.3.0"; sha256="0gjc5x1b2l5qnwdg77nzy6d7bf9q93ll39sfy89izqm8wsydwwkp"; depends=[dplyr httr purrr readr]; }; + estatapi = derive2 { name="estatapi"; version="0.4.0"; sha256="0wp5w9w0b832fnl7kchjqmychnf5896q50grw8hwdc1km14dfzkg"; depends=[dplyr httr purrr readr rlang tibble]; }; estimability = derive2 { name="estimability"; version="1.3"; sha256="0cifdaa71spkcxl4db4z884jrya865sg3dhcv4isd8fnzg2pjcd3"; depends=[]; }; estimatr = derive2 { name="estimatr"; version="0.22.0"; sha256="1kfih2fak7w9zqbhjgfrysdzrk4lpcx9p23x0gys4f9hxl9j1pm2"; depends=[Formula generics Rcpp RcppEigen rlang]; }; estmeansd = derive2 { name="estmeansd"; version="0.2.0"; sha256="07xbdsfz8vidp8pv2ix5g2y6y2cks14fzbjx74pa17696rnklrw3"; depends=[metaBLUE]; }; @@ -7489,7 +7509,7 @@ in with self; { ether = derive2 { name="ether"; version="0.1.6"; sha256="1f3phh5vdfvlxqrpzsn6ysz0q3mbhr862fzsd3sp8m8qhry86cbx"; depends=[dplyr httr jsonlite Rmpfr]; }; ethnobotanyR = derive2 { name="ethnobotanyR"; version="0.1.7"; sha256="13xbiywrw6ixby9s1ipwb45p9c96d75vw906fpzy6axdv2c4pp70"; depends=[circlize cowplot dplyr ggplot2 ggridges magrittr reshape]; }; etl = derive2 { name="etl"; version="0.3.8"; sha256="19m1sp3ryqb1gw7i9lh8dpmwbgy0c0dpsivj27wkr36bdhfvrfls"; depends=[DBI downloader dplyr janitor lubridate readr rlang rvest stringr tibble usethis xml2]; }; - etm = derive2 { name="etm"; version="1.0.5.1"; sha256="0m41pm277sd50pharigcqzr1a2g92wnmdf6fcab6fx16ia2fzrm7"; depends=[data_table lattice Rcpp RcppArmadillo survival]; }; + etm = derive2 { name="etm"; version="1.1"; sha256="02yvh473l5qajaymhsxwb235a9r7q3nsig9a9mrfca68xih8yvgd"; depends=[data_table lattice Rcpp RcppArmadillo survival]; }; etma = derive2 { name="etma"; version="1.1-1"; sha256="0g9244yx50y1gw0f37hskbcgyv4nldmzr86v3rmf3afabmjbyzjj"; depends=[]; }; etrunct = derive2 { name="etrunct"; version="0.1"; sha256="0ayazgyqlc8jcqr03cwfmfhm4pck6xri1r6vkgqy4arqkrrnrcqr"; depends=[]; }; eudract = derive2 { name="eudract"; version="0.9.2"; sha256="1yl72vhfaqq005h00bxafdqxpbm0qf9349gd9fq80h5vy20qrm3q"; depends=[dplyr magrittr tidyr xml2 xslt]; }; @@ -7501,7 +7521,7 @@ in with self; { evabic = derive2 { name="evabic"; version="0.0.1"; sha256="196gmq8v8a45zkk4qqr3hzbrrxnmwryb0q81bqcdap5zf4w7153x"; depends=[]; }; evalITR = derive2 { name="evalITR"; version="0.1.0"; sha256="05nqcy9x3f2ks9xvzd3cd000q2kybdycgrlvz5pv7ipw1dlysgg2"; depends=[]; }; evaluate = derive2 { name="evaluate"; version="0.14"; sha256="0a2y7j534gbgixkwj9r1z76l2vssw4g1hznzbpclc076wkdqpj58"; depends=[]; }; - evaluator = derive2 { name="evaluator"; version="0.4.1"; sha256="1h1s2n09i6r9w17lr8ry9acg6kfsmf3c4w45jdwvz1pmy1ss8whi"; depends=[cli crayon dplyr extrafont ggplot2 magrittr mc2d purrr readr readxl rlang rstudioapi scales stringi tibble tidyr vctrs viridis]; }; + evaluator = derive2 { name="evaluator"; version="0.4.2"; sha256="0k2fwim023lbnxq67hhv03cds824x8n374pnqsk67ajgahxwh3by"; depends=[cli crayon dplyr extrafont ggplot2 magrittr mc2d purrr readr readxl rlang rstudioapi scales stringi tibble tidyr vctrs viridis]; }; evclass = derive2 { name="evclass"; version="1.1.1"; sha256="00lbhcgswpv0amz0mb93kx9p91sf0d7zvxfw9i8x1zpmpfd6nhcj"; depends=[FNN]; }; evclust = derive2 { name="evclust"; version="1.1.0"; sha256="06w1spqz5gidycwzwf51414iy182bc1ncis7m4bwx6a268vrznnx"; depends=[FNN limSolve Matrix mclust plyr quadprog R_utils]; }; evd = derive2 { name="evd"; version="2.3-3"; sha256="1d2r8ppblxrq6s60pf0gv4rp8ja58j8lbpax8a996ais1hpfzi9g"; depends=[]; }; @@ -7511,7 +7531,7 @@ in with self; { eventdataR = derive2 { name="eventdataR"; version="0.2.0"; sha256="11apbbj68x1kxpwvihf4ng7wxy54jl1aw7r9hyq6gn7h8sk6lpjn"; depends=[]; }; events = derive2 { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; }; eventstream = derive2 { name="eventstream"; version="0.1.0"; sha256="0imrs872b6fjvw74smniiiicvizyign6wmwwybljk704cshzcy2f"; depends=[abind AtmRay changepoint dbscan glmnet MASS tensorA]; }; - evgam = derive2 { name="evgam"; version="0.1.1"; sha256="0hhhbawmaywv3fb2qclngdsa4bdmrrl1kgy297hdhmlg9nqzanp6"; depends=[mgcv Rcpp RcppArmadillo]; }; + evgam = derive2 { name="evgam"; version="0.1.2"; sha256="0wnyrvfg1pj1adwmsvqwpnz31pfhj6vdsivj2mmdzqh4milf9l22"; depends=[mgcv Rcpp RcppArmadillo]; }; evian = derive2 { name="evian"; version="2.1.0"; sha256="1slnzq55gg3p16fs22v69mafiggiy5f70sj8fh65lc0hphybh6w2"; depends=[doParallel foreach ProfileLikelihood sandwich]; }; evidence = derive2 { name="evidence"; version="0.8.10"; sha256="02kqk95kx4nv13fg6z55a5rv6sq6lv8azg0jjxbkg1j6hg15p7ai"; depends=[LaplacesDemon lattice LearnBayes loo rstan rstanarm]; }; evidenceFactors = derive2 { name="evidenceFactors"; version="1.8"; sha256="0g9w1q8ir6qmvk5vvbpipiyias7nj74ks2h94ja7al8sz68gralx"; depends=[sensitivitymv]; }; @@ -7533,7 +7553,7 @@ in with self; { exactci = derive2 { name="exactci"; version="1.3-3"; sha256="03r35f6dyrck5pf43ypb1sjwfnvkhjkm1mbms3wh67ayfs2ypn0s"; depends=[ssanv]; }; exactextractr = derive2 { name="exactextractr"; version="0.2.1"; sha256="0wspmg4vb96yq38g17f10q54k8ijpzlhh3hac1d2dn9zgk3riffh"; depends=[raster Rcpp sf]; }; exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; }; - exampletestr = derive2 { name="exampletestr"; version="1.5.2"; sha256="0lfhgjirsl2b1vksjfrw3wlvw6x34d20vldh313qkjrg2yihpk1q"; depends=[checkmate filesstrings fs glue magrittr ore purrr readr rlang roxygen2 stringr styler usethis withr]; }; + exampletestr = derive2 { name="exampletestr"; version="1.6.1"; sha256="1szkx35wn24yi6iw6hkl85hzwqd8glvjq69hsypsxg1k4r1i99wg"; depends=[checkmate filesstrings fs magrittr ore purrr readr rlang roxygen2 rstudioapi stringr styler usethis withr]; }; exams = derive2 { name="exams"; version="2.3-6"; sha256="1cn0gmaayv857zl7l7zmnblmpx84qkjxqrigrymy578y04qjc4zx"; depends=[]; }; exceedProb = derive2 { name="exceedProb"; version="0.0.1"; sha256="02pb8b0rxygbv6501rcr2hb0bhz1r78k5znav161kk25fb9bxs5v"; depends=[BH Rcpp]; }; excelR = derive2 { name="excelR"; version="0.4.0"; sha256="1pb4sy54zjv5vrh7gjjv7qlpab74km6mfsmfyl0yhmr0jx01hrw0"; depends=[htmlwidgets jsonlite]; }; @@ -7566,7 +7586,7 @@ in with self; { extRC = derive2 { name="extRC"; version="1.0"; sha256="1cawfkd98n70y54qg8i2h82xrrgygr48sq31yzx9hllkx33pk97d"; depends=[MASS]; }; extRemes = derive2 { name="extRemes"; version="2.0-11"; sha256="0hmgynxhzswqnhwb2sxrkczgam8c17s3vpxqc5bcz0bwczpxxyvm"; depends=[distillery Lmoments]; }; extWeibQuant = derive2 { name="extWeibQuant"; version="1.1"; sha256="08dzw5xfgqx0c7ac632c5mg5jmjjw7wwpcr4c9lvz5rv72ykh2rh"; depends=[]; }; - extdplyr = derive2 { name="extdplyr"; version="0.1.4"; sha256="0rxwpspn3905f4l27cwgi9rlj379hb6b4kkb0kjq8gzpkg2fznh1"; depends=[dplyr lazyeval tidyr]; }; + extdplyr = derive2 { name="extdplyr"; version="0.1.5"; sha256="1zbnp0h0lv1dr40dhdw6ii8rmc5lxcq4wjsm83xpd3y8x9xpglnl"; depends=[dplyr lazyeval tidyr]; }; exteriorMatch = derive2 { name="exteriorMatch"; version="1.0.0"; sha256="0cdfj1n502iws1g03rk7x0c18zyazqf3vci9kjm6lrv4j2qwrvip"; depends=[]; }; extfunnel = derive2 { name="extfunnel"; version="1.3"; sha256="162w5b2wjs3yqy8jisamsapav6swa8sskf1b6x5hglnrv3i4qyyy"; depends=[rmeta]; }; extlasso = derive2 { name="extlasso"; version="0.2"; sha256="05774y0i01lrbyws6zx5ymhcglllv1wc7gzrnyx8i5d1lxdinsyd"; depends=[]; }; @@ -7623,7 +7643,7 @@ in with self; { fUnitRoots = derive2 { name="fUnitRoots"; version="3042.79"; sha256="1hsv47dm0hx3s04g9h0bjdgi79zbfihnfxxdc2jskqp94yl7azsy"; depends=[fBasics timeDate timeSeries urca]; }; fabCI = derive2 { name="fabCI"; version="0.1"; sha256="123bc56nnx6hcj257imsd8sc6d0pggw08lf4m0lr90631gcm1mkn"; depends=[]; }; fabMix = derive2 { name="fabMix"; version="5.0"; sha256="1gii3mdii9nw423xxn9mhv1pjbw967wdarn828w04zm9dkdcwm48"; depends=[coda corrplot doParallel foreach ggplot2 label_switching MASS mclust mvtnorm RColorBrewer Rcpp RcppArmadillo]; }; - fable = derive2 { name="fable"; version="0.1.2"; sha256="0v5nqxdjwvzanzzl0fcb04zlrah8irbz09grlhd04lz8mmj8n8ih"; depends=[dplyr fabletools Rcpp rlang tidyr tsibble]; }; + fable = derive2 { name="fable"; version="0.2.0"; sha256="1z3yaf61zyz92lykzwid4scmfrpy73r7kq4zv01pcj9573p5khy3"; depends=[dplyr fabletools Rcpp rlang tibble tidyr tsibble]; }; fabletools = derive2 { name="fabletools"; version="0.1.3"; sha256="16lkr26sl88vnww2fsqiqdv4ljk0y1fyha55g0sq4vsnypg9bhdz"; depends=[dplyr generics ggplot2 R6 rlang tibble tidyr tidyselect tsibble vctrs]; }; fabricatr = derive2 { name="fabricatr"; version="0.10.0"; sha256="0kh2mfgyqz3fpilc4wycxj3vihhbdnjzsjrsp88nmsk0p5mjmljj"; depends=[rlang]; }; face = derive2 { name="face"; version="0.1-5"; sha256="0n7vlq29krsdcp8r32irhvf7xbcxy5g7663qncmbhj5x45sviqh6"; depends=[Matrix matrixcalc mgcv]; }; @@ -7631,7 +7651,7 @@ in with self; { facilitation = derive2 { name="facilitation"; version="0.5.2"; sha256="0gyqa3njyynvdhfziq33xqc7cjhszii67mk8809ncvh6abkdx1hw"; depends=[animation Matrix Rcpp]; }; factoextra = derive2 { name="factoextra"; version="1.0.7"; sha256="1allvdjhd3pq8xz30b1cymwcik5iaahghrjrlnn54cwkfhfg0kv2"; depends=[abind cluster dendextend FactoMineR ggplot2 ggpubr ggrepel reshape2 tidyr]; }; factoptd = derive2 { name="factoptd"; version="1.0.3"; sha256="1ir50im3kr1xhqk4qwrm2h5fq9gqgrwshbamvjlf8n1wnn03mcb6"; depends=[MASS partitions]; }; - factor_switching = derive2 { name="factor.switching"; version="1.0"; sha256="14h8m73lmayvwgi2mnfggs2q1nr2apbsddr7m46ws22nyzz6q7am"; depends=[coda HDInterval lpSolve]; }; + factor_switching = derive2 { name="factor.switching"; version="1.1"; sha256="126f7939xq3g27yfalp85ivwfpk93fs8gcig037z42i0xsywh9kp"; depends=[coda HDInterval lpSolve]; }; factorEx = derive2 { name="factorEx"; version="1.0.0"; sha256="12ykf42x5fqddlsvv3556sawfakribj0pwm5vfcg3y2y99a26qxg"; depends=[arm doParallel estimatr foreach genlasso igraph mvtnorm pbapply pbmcapply prodlim sandwich stringr]; }; factorMerger = derive2 { name="factorMerger"; version="0.4.0"; sha256="127k5h1gbbnjr6gxgck2n9glvvwkd69xq7n6gzmrq8gszk8v1x5m"; depends=[agricolae colorRamps dplyr forcats formula_tools ggplot2 ggpubr knitr magrittr MASS mvtnorm proxy reshape2 scales survival]; }; factorQR = derive2 { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; }; @@ -7649,7 +7669,7 @@ in with self; { fairness = derive2 { name="fairness"; version="1.0.1"; sha256="1n17vrp0a3zii3444a2a7k33ffmyxmm15c8m7ln2fypya1z2pc5l"; depends=[caret devtools e1071 ggplot2 pROC]; }; faisalconjoint = derive2 { name="faisalconjoint"; version="1.15"; sha256="08sb4za8qyadvigq2z7b0r44qk2lpahpnz9nv16xfjb1zhdkz5w3"; depends=[]; }; fakeR = derive2 { name="fakeR"; version="1.0"; sha256="0f4ngnd8s34j1327zp3aqnsiw0gfxkp1i24ng20hrmfl13s1qmxp"; depends=[mvtnorm polycor pscl VGAM]; }; - fakemake = derive2 { name="fakemake"; version="1.7.0"; sha256="09z0pxpyk13m9bkw8b39axznrpa3l3ifrhfs3256il6kkq6sm749"; depends=[callr igraph MakefileR withr]; }; + fakemake = derive2 { name="fakemake"; version="1.7.1"; sha256="0mckcgc12yxmpsgkcnmaf1pa634rz8x1zc97h023pnsd1cdwsp4l"; depends=[callr igraph MakefileR withr]; }; falcon = derive2 { name="falcon"; version="0.2"; sha256="09hlvwwj3k3nhcsxijjvv8x74a9m200ayjjplrp4baxvczwyq341"; depends=[]; }; falconx = derive2 { name="falconx"; version="0.2"; sha256="0648mvbc7ga7vr2xqzyln3dgd11h5s4bqhv3p55mj7smr4qv7hv9"; depends=[]; }; fam_recrisk = derive2 { name="fam.recrisk"; version="0.1"; sha256="1lyrq7bq7p7ijc2vf545nazw4akncz08548ya1dv3lsc5jmkgfzj"; depends=[]; }; @@ -7707,7 +7727,7 @@ in with self; { fasttime = derive2 { name="fasttime"; version="1.0-2"; sha256="11i4c0zrkvvqsax0az1fvmc0jxfsjyx28434k1qgzhj9g2j9m9cf"; depends=[]; }; fat2Lpoly = derive2 { name="fat2Lpoly"; version="1.2.4"; sha256="01a9d6b2f6g858vg64kr0w0qmv2jqhk9kk3hb6jdr2rly4j8p14x"; depends=[kinship2 multgee]; }; fauxnaif = derive2 { name="fauxnaif"; version="0.5.6"; sha256="1fgaj3rl2aqdf2x8z9lp8p5g7bfii98g4h2mmlhic4g135r7bznp"; depends=[glue magrittr rlang]; }; - fauxpas = derive2 { name="fauxpas"; version="0.2.0"; sha256="0l77gxcf06p984z9vgaf1kag609h9qyrgav84lxkv97h6f3fflnc"; depends=[httpcode R6 whisker]; }; + fauxpas = derive2 { name="fauxpas"; version="0.5.0"; sha256="129fzqb7wsskbn50s8x0marr4wm8jrns6hiycqcsk166k3dnyyy8"; depends=[httpcode R6 whisker]; }; favnums = derive2 { name="favnums"; version="1.0.0"; sha256="0siax7gjr25lpf1li3hawx6nviggs68c0lap2d9i38azlhvj891w"; depends=[]; }; fbRads = derive2 { name="fbRads"; version="0.2"; sha256="1a65gfvizzm6psspcvlhkxligdf9j1whrgzkg7ww520lk3z8lnnd"; depends=[bit64 data_table digest futile_logger jsonlite plyr RCurl]; }; fbRanks = derive2 { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; }; @@ -7723,7 +7743,7 @@ in with self; { fcros = derive2 { name="fcros"; version="1.6.1"; sha256="04yr6lqs38lczsmdvdm78qn63836qj7xwspgh3h3n3gh8cssd83x"; depends=[]; }; fcuk = derive2 { name="fcuk"; version="0.1.21"; sha256="1sb7p1m5qb88028mrw95lhh8l7dxj696hjh88nfsdpnscryknfpv"; depends=[magrittr purrr stringdist tibble]; }; fdANOVA = derive2 { name="fdANOVA"; version="0.1.2"; sha256="1pycq5a4czqzi8wcfmlc9ncg827j7n0qxyj90wcv39nbcrnl3da1"; depends=[doBy doParallel fda foreach ggplot2 magic MASS]; }; - fda = derive2 { name="fda"; version="2.4.8.1"; sha256="0g50kj1dx7zarjv0lgwyzd2c7bv6di7nkndmywday5vjywgl8m7a"; depends=[Matrix]; }; + fda = derive2 { name="fda"; version="5.1.4"; sha256="0js4ggl3aiwsqk6npwz72yhcznkb63smddds24ngf6a0p8yp5p2x"; depends=[Matrix]; }; fda_usc = derive2 { name="fda.usc"; version="2.0.2"; sha256="0z44vkzjm2h6r5af0k1iic1szvw82rbwjrm541zlwn2jycj4q96a"; depends=[doParallel fda foreach iterators MASS mgcv nlme]; }; fdaACF = derive2 { name="fdaACF"; version="0.1.0"; sha256="19cnjs05cdln1jg568ybj1qsb8s848l8fzcw1p5i8rh92gm2x4w4"; depends=[CompQuadForm pracma]; }; fdaMixed = derive2 { name="fdaMixed"; version="0.6"; sha256="0hyhb67qvvhyq68k5h4ffvsl4lmw66nfy5l14kwxnn42h3b810sc"; depends=[Formula Rcpp RcppArmadillo]; }; @@ -7740,7 +7760,7 @@ in with self; { fdrci = derive2 { name="fdrci"; version="2.1"; sha256="1sgrsmlz7sbr1maw3qnpzqz3z75fh5nyiibpsq8j0y12xac8d0x3"; depends=[]; }; fdrtool = derive2 { name="fdrtool"; version="1.2.15"; sha256="1h46frlk7d9f4qx0bg6p55nrm9wwwz2sv6d1nz7061wdfsm69yb5"; depends=[]; }; fds = derive2 { name="fds"; version="1.8"; sha256="1284vncixrzrz9x6b52gslrbrbia07sd0xac7nwdqhp5f5v5wfi0"; depends=[rainbow RCurl]; }; - fdth = derive2 { name="fdth"; version="1.2-1"; sha256="0rr9p2rns5ws111iqcicrlpcv47fkbxf161yxkkzfs2l3f1kgw14"; depends=[]; }; + fdth = derive2 { name="fdth"; version="1.2-5"; sha256="01phrn8x245kplljjajqlsma7847j058spbxajnklamywf002qzr"; depends=[xtable]; }; feasts = derive2 { name="feasts"; version="0.1.3"; sha256="16fzwgyhb99cxn6ynq3qxdzf0gyqjh9q7sa9ma5rr23cr460rsab"; depends=[dplyr fabletools ggplot2 lubridate rlang scales slider tibble tidyr tsibble vctrs]; }; feather = derive2 { name="feather"; version="0.3.5"; sha256="1gxd0h2m56sjjlzn4dry6s13nddxc4l5i11gsvavaf2dwbahdzsh"; depends=[hms Rcpp tibble]; }; feature = derive2 { name="feature"; version="1.2.13"; sha256="07hkw0bv38naj2hdsx4xxrm2dngi6w3rbvgr7s50bjic8hlgy1ra"; depends=[ks misc3d rgl]; }; @@ -7753,14 +7773,14 @@ in with self; { federalregister = derive2 { name="federalregister"; version="0.2.0"; sha256="0qr8nd3ylnwcv1wxspw5i7ray5sh30zr648spg0lpqq8dp2b8p7b"; depends=[curl httr jsonlite]; }; fedregs = derive2 { name="fedregs"; version="1.0.0"; sha256="171j6r6qxnx9gk9x9gpdyh51ssrgmf7sczc4889qr3qqw15sm4bn"; depends=[dplyr httr magrittr purrr rvest stringi tidyr tidytext xml2]; }; fedreporter = derive2 { name="fedreporter"; version="0.2.1"; sha256="18hs358iyxmbh28jy9f65zvanpr6bk4gq75qbj255y1zzdsjr9x1"; depends=[httr jsonlite]; }; - feedeR = derive2 { name="feedeR"; version="0.0.7"; sha256="08mnfi96qkr1fj53ywqmya957swcwrfd3hqk0qaf2ni96sxxnp98"; depends=[digest dplyr lubridate RCurl XML]; }; + feedeR = derive2 { name="feedeR"; version="0.0.8"; sha256="15fl3xb7mp7as2hl97l2vvl2k8cp48dnzy17jgrw5g1hg4yk1wgh"; depends=[digest dplyr lubridate readr stringr tibble xml2]; }; feisr = derive2 { name="feisr"; version="1.0.1"; sha256="0pwaj509qz6z4rz54b10xmv2476qygmrm4bpc3szah6pf2pf0zmm"; depends=[aod Formula plm Rdpack]; }; fellov = derive2 { name="fellov"; version="0.1"; sha256="0z4b08ykajzwa5852dknqz5qqlmhklbwdq8x5zhyfmwba5zfbjav"; depends=[]; }; felp = derive2 { name="felp"; version="0.2.2"; sha256="1kd2619cj8697l1zpigz78vshc5gd8yvrg7zmw3mik7pjafz1k32"; depends=[prettycode]; }; fence = derive2 { name="fence"; version="1.0"; sha256="18l3fliww60d9n9hbfdny5vr9mi78krwpjj5sypdsb77d6332h9q"; depends=[fields ggplot2 lme4 MASS sae snow snowfall]; }; fergm = derive2 { name="fergm"; version="1.1.4"; sha256="1d979z2m5f13i1w9d8kh9rnaafavsap169w0nycpd5j2f3dfhyn7"; depends=[ergm extrafont ggplot2 matrixStats network reshape2 rstan]; }; fermicatsR = derive2 { name="fermicatsR"; version="1.4"; sha256="1587f67fypj22rdi1319zq765lcc9z518bzl1jr4lz6c8lrzfm9i"; depends=[]; }; - ff = derive2 { name="ff"; version="2.2-14"; sha256="1w724q4jpzbvzpilb2ifviaxkjgk9lzwxz9gksnvicbmfa20fqqw"; depends=[bit]; }; + ff = derive2 { name="ff"; version="2.2-14.2"; sha256="1r1pbrf5s4rdm3msxxr8fy1f2xjihqciclsnvxf59qzz6g1nmh7q"; depends=[bit]; }; ffbase = derive2 { name="ffbase"; version="0.12.8"; sha256="0mjk7dkq1ginqqfvngzny747ggf9a8fd7kblq96n5ys1jrwjyqhq"; depends=[bit fastmatch ff]; }; ffmanova = derive2 { name="ffmanova"; version="1.1.0"; sha256="0019m9vxnh5yxr5k7zflzyhd533a842cjjkcpqyannshnrbfndvy"; depends=[]; }; ffmetadata = derive2 { name="ffmetadata"; version="1.0.0"; sha256="0gjv5fl3p0kz28c91l4qf34a2685a24l5841ixdg7wivfs5v9npv"; depends=[httr jsonlite]; }; @@ -7792,17 +7812,18 @@ in with self; { filesstrings = derive2 { name="filesstrings"; version="3.1.5"; sha256="072alawp6j08mwlw1pz50g3lfi726kpsc744x5fvy71d7w4gqn6l"; depends=[checkmate magrittr matrixStats ore rlang strex stringi stringr tibble withr]; }; filling = derive2 { name="filling"; version="0.2.1"; sha256="17bhfzvzdyri8yx7b40yhdx3x2gb2vy2i8sz2cyjyw9idnd8svmr"; depends=[CVXR nabor Rcpp RcppArmadillo Rdpack ROptSpace RSpectra]; }; fillr = derive2 { name="fillr"; version="1.0.0"; sha256="1gx1ihp8j90ywmm6mmmfq4jd6apxawk9s5dfw3jq0wm1c290zqpv"; depends=[]; }; - finalfit = derive2 { name="finalfit"; version="1.0.0"; sha256="16bddxbj02yzlkvsn50r5qmqjbhlhpzi3q6mc8hp1afd1vydpmd3"; depends=[boot broom dplyr forcats GGally ggplot2 gridExtra lme4 magrittr mice pillar pROC purrr scales stringr survival tidyr]; }; - finbif = derive2 { name="finbif"; version="0.2.0"; sha256="1wb4hl5j2g3fgapd7x8jl2180s48p51nngyb8zvs7jacl32a04bh"; depends=[digest httr jsonlite lubridate lutz]; }; + finalfit = derive2 { name="finalfit"; version="1.0.1"; sha256="0ndnsllz8p96jj6in4ffqpfdawp45rh1fn2ralcrgdldhs6lg1xq"; depends=[boot broom dplyr forcats GGally ggplot2 gridExtra lme4 magrittr mice pillar pROC purrr scales stringr survival tidyr]; }; + finbif = derive2 { name="finbif"; version="0.3.0"; sha256="0f5mkwinnfqhv0kgywbzi1lhfdhnh5mhhh8kj5pyxfwncbg109z4"; depends=[digest httr jsonlite lubridate lutz]; }; finch = derive2 { name="finch"; version="0.3.0"; sha256="1cglyq3b0cvl05yrnpy6xn0nj0n817hgpcsxp3m07cvj8xidib02"; depends=[data_table digest EML hoardr plyr rappdirs xml2]; }; findR = derive2 { name="findR"; version="0.2.1"; sha256="1a7cf6kd7i2l4ffr2b17nb9xnpsjhf6fcwpjy06r0qgcapnfp54b"; depends=[pdftools stringr]; }; findpython = derive2 { name="findpython"; version="1.0.5"; sha256="0icifm4z6hhpmcjrg75a875iph0ci890ss02kdv3725pijc236iy"; depends=[]; }; findviews = derive2 { name="findviews"; version="0.1.3"; sha256="1l1yhw5hvrn0rpkdsch8m69d2q5284jwccvv7r4ia4m0iqjfipj7"; depends=[ggplot2 gridExtra scales shiny]; }; fingerPro = derive2 { name="fingerPro"; version="1.1"; sha256="1a1lj8gyrbgcg8hr03cj2bjzlaafddspri7abc83ys1raqwd4j68"; depends=[car GGally ggplot2 gridExtra klaR MASS plyr Rcmdr Rcpp RcppGSL RcppProgress reshape rgl scales]; }; fingerprint = derive2 { name="fingerprint"; version="3.5.7"; sha256="04jcwkydjrs31pia6kq8z2n9s54im950q08hs2ay15xjxxkmb8ic"; depends=[]; }; - fingertipsR = derive2 { name="fingertipsR"; version="1.0.2"; sha256="15zhvdxp2l48b69hwq9bzafp94v405k5cw6824pi8kyslh95ibp8"; depends=[curl dplyr DT httr jsonlite miniUI readr rlang shiny shinycssloaders]; }; + fingertipsR = derive2 { name="fingertipsR"; version="1.0.3"; sha256="0r67d47w4qvxh7n70600z0i1s9ykpp0jshay69clgbmavl0vg7hv"; depends=[curl dplyr DT httr jsonlite miniUI readr rlang shiny shinycssloaders]; }; fingertipscharts = derive2 { name="fingertipscharts"; version="0.0.10"; sha256="1l3mirspz28djlzma04lkkynfbz8qfq0asr662q102j31qx6vnm4"; depends=[curl dplyr geojsonio ggplot2 httr leaflet lemon mapproj purrr rlang scales sf stringr tibble tidyr]; }; finiteruinprob = derive2 { name="finiteruinprob"; version="0.6"; sha256="0z4l0crymh58chxniqq70fqmvi6f5jkgvz72vbc7s3l9lrrapgr3"; depends=[numDeriv sdprisk]; }; + finity = derive2 { name="finity"; version="0.1.4.1"; sha256="0xs3vx0vj165hj4dq8ivrdf6fcvj23zhp2ai79rgpyb5rr5ndkvc"; depends=[BH Rcpp RcppArmadillo stabledist]; }; finreportr = derive2 { name="finreportr"; version="1.0.1"; sha256="1mansiyl4p4zqc1h2aw9zgzb3fy4mppgmshdm8mcf4nbm340g4vk"; depends=[curl dplyr httr rvest XBRL xml2]; }; fipe = derive2 { name="fipe"; version="0.0.1"; sha256="055jav8h4wws76jahm2d5dj49wkvzchh3f2vk5d50pny4dc7smar"; depends=[dplyr forcats furrr future httr jsonlite lubridate magrittr purrr readr stringr tibble tidyr]; }; firebase = derive2 { name="firebase"; version="0.1.0"; sha256="154a386ga9bjgam9rxp0y9033hx55p7f3294z52r6dz2y87h3lz2"; depends=[cli R6 shiny]; }; @@ -7814,7 +7835,7 @@ in with self; { fishmethods = derive2 { name="fishmethods"; version="1.11-1"; sha256="049a25rwxqy6a8jfm0irjka3bl7vkask32f9h7fsr5ddlyzvg5pz"; depends=[boot bootstrap data_table lme4 MASS numDeriv]; }; fishmove = derive2 { name="fishmove"; version="0.3-3"; sha256="1knbv087cg0czjcgdbrlpg69pp1dxb57b7ak5j1mcy7ay3a41a9h"; depends=[boot ggplot2 MASS plyr]; }; fishtree = derive2 { name="fishtree"; version="0.3.2"; sha256="19kq38l4cm7g2frvf2zdlk1j636k2f5k0bf6v7wn2zcmivy0xzsw"; depends=[ape jsonlite memoise rlang]; }; - fishualize = derive2 { name="fishualize"; version="0.1.0"; sha256="17ywlnjq1digkc73r9bc0czdwh7f3sp8lzbh53rx99dad7bpm9kd"; depends=[ggplot2 gridExtra png]; }; + fishualize = derive2 { name="fishualize"; version="0.2.0"; sha256="13z6n62fpans1fxjxlpz2xqqpq0ng5via67vk4nkvp0nxmlrlhky"; depends=[downloader dplyr ggplot2 gridExtra httr magrittr png rlang scales stringr tidyr]; }; fit_models = derive2 { name="fit.models"; version="0.5-14"; sha256="0vjbzmx0ambm6yzidb4vbgmhclwzwv2iz2cwl54ccdkvx4cx3fck"; depends=[lattice]; }; fit4NM = derive2 { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 tkrplot]; }; fitDRC = derive2 { name="fitDRC"; version="1.1.1"; sha256="09z9l27iwl0fd3zy6rsdhmy8qbm5d9a4wcaj5rxp7ynlnpi102aa"; depends=[]; }; @@ -7832,17 +7853,17 @@ in with self; { fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.5.0"; sha256="00cc7kjs54wk2cxbkd14gldsrjmf4i35vwr6c2kfsassvjjhbmpm"; depends=[]; }; fixedTimeEvents = derive2 { name="fixedTimeEvents"; version="1.0"; sha256="0z7ji8yzp4pj76ad64l7ivknkbi82ijx6abd3a18wicqhrh433sj"; depends=[]; }; fixerapi = derive2 { name="fixerapi"; version="0.1.6"; sha256="0ikf8dn0l9c9gshp4bph3wasl0bh6lfybinc8n1rvb202231hmgb"; depends=[jsonlite tibble tidyr]; }; - fixest = derive2 { name="fixest"; version="0.4.0"; sha256="0sajxi2sxljmj4614iwvrd48xhwcnr9z9lr5dy5n68iyps05s509"; depends=[Formula MASS nlme numDeriv Rcpp]; }; + fixest = derive2 { name="fixest"; version="0.4.1"; sha256="1jdx6mhi2hibd8zbpbba324z6f76irhkvwaanw2840qq8pql5rjf"; depends=[Formula MASS nlme numDeriv Rcpp]; }; fizzbuzzR = derive2 { name="fizzbuzzR"; version="0.1.1"; sha256="119gbi9y4n8r52hk9vj7zf795dv9xnk7lnngljjcd7ydnhygwd4h"; depends=[]; }; flacco = derive2 { name="flacco"; version="1.8"; sha256="15h2q9xgddy7gw6r52c2nk618f3z1mjn4xz9pzdvhm1d3kqggwa4"; depends=[BBmisc checkmate mlr]; }; flagr = derive2 { name="flagr"; version="0.3.2"; sha256="195c78cml2pjzfvpkaxbzcg1dfdqxi76138p0v3x3zzva9d8nlji"; depends=[]; }; + flair = derive2 { name="flair"; version="0.0.2"; sha256="0hvg9k7l6vdhmbmql1viyn54f07r31ssyyhdv2v242i0npa2l25r"; depends=[dplyr evaluate ggplot2 glue knitr magrittr purrr rmarkdown stringr]; }; flam = derive2 { name="flam"; version="3.2"; sha256="0v6kcl4n7wq052p7jdgbzlh9fpk8bzlrqw12i6pib1wd3slj0asa"; depends=[MASS Rcpp]; }; flamingos = derive2 { name="flamingos"; version="0.1.0"; sha256="0gic6y8wpxffpyi3zy0wh7apy4z6argxbz284n80k2mzh6lh029k"; depends=[Rcpp RcppArmadillo]; }; - flan = derive2 { name="flan"; version="0.7"; sha256="1r1vkf207k0il7r314gq1lxz0ndhdbbvx338mn8zhrkrd2ln9hpq"; depends=[lbfgsb3 Rcpp RcppArmadillo RcppGSL]; }; flare = derive2 { name="flare"; version="1.6.0.2"; sha256="1ybrsx1djqldw0l5l1iz4pfh6xxb8ckkg1ric7wnsr51wm9ljlh5"; depends=[igraph lattice MASS Matrix]; }; flars = derive2 { name="flars"; version="1.0"; sha256="06qma1ar1nj7n6g9alk1qydm5bkj6lsjx0pqkikxpb41d91civqk"; depends=[fda MASS Matrix Rcpp RcppEigen]; }; flashClust = derive2 { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; }; - flashlight = derive2 { name="flashlight"; version="0.7.1"; sha256="0sbq4jklp5idh850wvkszw2cpcxsyfrcn8icdg0fn3bbn55gls6x"; depends=[dplyr ggplot2 ggpubr MetricsWeighted rlang rpart rpart_plot tidyr]; }; + flashlight = derive2 { name="flashlight"; version="0.7.2"; sha256="1d0mps51sxg9hc8fr4462m2jwr0hv7f8qk6sxlh3d3x3ci9zk6xq"; depends=[dplyr ggplot2 ggpubr MetricsWeighted rlang rpart rpart_plot tidyr]; }; flatr = derive2 { name="flatr"; version="0.1.1"; sha256="10l98a3f57wahfpdqxj70r25zfhk4vzzd014pdnriy458yrfd7rw"; depends=[dplyr magrittr tibble]; }; flatxml = derive2 { name="flatxml"; version="0.0.2"; sha256="1f7pc3chzimkg23490qvppy63sk4ds3aaahc36sa4dc4qmhabyms"; depends=[RCurl xml2]; }; flexCWM = derive2 { name="flexCWM"; version="1.92"; sha256="1fxwq12mki10ikf5lyh1pb58svfzs4llg68v4d9iznia8aa0grhq"; depends=[ContaminatedMixt mclust numDeriv statmod]; }; @@ -7853,14 +7874,14 @@ in with self; { flexmixNL = derive2 { name="flexmixNL"; version="0.0.1"; sha256="0bk5v0cnsn1qkd1b86vj0bnpr4l9d6523kpkgzb1l1sqyscawfmm"; depends=[flexmix gnm]; }; flexrsurv = derive2 { name="flexrsurv"; version="1.4.5"; sha256="1xwh6fj854hr5j1mdh4cbp3hbrbdl4nb2ili876rq08wb9wq5pkf"; depends=[Epi formula_tools matrixcalc orthogonalsplinebasis statmod survival]; }; flexsurv = derive2 { name="flexsurv"; version="1.1.1"; sha256="0x7p1rv51pplfyyzcg63ssb8z56mig7y0363hkr0219w3cvyq9nr"; depends=[deSolve mstate muhaz mvtnorm quadprog Rcpp survival tibble tidyr]; }; - flexsurvcure = derive2 { name="flexsurvcure"; version="1.0.0"; sha256="1blhwbkp0a3a7xnqyxp952wxkihdxb0xh68sk827h8rxis9zr4z4"; depends=[flexsurv gtools survival]; }; + flexsurvcure = derive2 { name="flexsurvcure"; version="1.1.0"; sha256="0q77cc2l4xa7jkmx5sl9qwsxsdaf688ckp7j6pprv0nkzv8js16r"; depends=[flexsurv gtools survival]; }; flextable = derive2 { name="flextable"; version="0.5.9"; sha256="1rkz0nhwjy1l8sb0kmna5v492n2ydnk7gydswnmf88r8vfyjczhw"; depends=[base64enc data_table gdtools htmltools knitr officer rlang rmarkdown xml2]; }; flifo = derive2 { name="flifo"; version="0.1.5"; sha256="03x66l3ryrjvwbxxd0ncjrb5w9kc7fswmp5psb1cb7r87f395gm3"; depends=[bazar pryr]; }; flightplanning = derive2 { name="flightplanning"; version="0.8.0"; sha256="0q5xdjgjj9j73djpvzc34ig2gk43xan5jg9pn195m1x8lz41yvk9"; depends=[rgdal rgeos sp]; }; flip = derive2 { name="flip"; version="2.5.0"; sha256="08x5hwxaxbgc745gblja7gcy0b5wbp7jf90lkha75zl5cc9iyksl"; depends=[cherry e1071 plyr someMTP]; }; flippant = derive2 { name="flippant"; version="1.1.0"; sha256="06aj90y7c33c1q0nw1c67vr1pfmp9fw78az6ivrbq110f2k1m12w"; depends=[assertive_files assertive_numbers assertive_properties assertive_strings assertive_types data_table ggplot2 magrittr minpack_lm plyr RcppRoll stringi withr wmtsa]; }; flipscores = derive2 { name="flipscores"; version="0.2"; sha256="0b55qxdrn6m0pbk4aj9zr1d9s7id6pclsaz939p48jmqx07zayjg"; depends=[]; }; - float = derive2 { name="float"; version="0.2-3"; sha256="1sf0pj5543alh25b96fw8jjsmiaky3r4nw9xhn349gv50rf0nhrj"; depends=[]; }; + float = derive2 { name="float"; version="0.2-4"; sha256="1wf1dfybgbhvh9sa5z41xkh8liwp5n9gyydfq2mpg6bag0r457z1"; depends=[]; }; flobr = derive2 { name="flobr"; version="0.2.0"; sha256="1pwk190bj1f8312bg95hj5y19ripm2jf6l1cbbsmfh2xw5x0xz0z"; depends=[blob checkr]; }; flock = derive2 { name="flock"; version="0.7"; sha256="1zg93p74icj4bhxnmnssj2xp6vw4yaksyavq03497v33xfpdxss7"; depends=[Rcpp]; }; flood = derive2 { name="flood"; version="0.1.1"; sha256="0nlmjh2l7dij1aqd70hhj0m550knlin3am14azqkx4pacs1kir3p"; depends=[copula evd magrittr TLMoments]; }; @@ -7878,14 +7899,14 @@ in with self; { flying = derive2 { name="flying"; version="0.1.3"; sha256="04wfcsbq8icvk1nnczvic5cp4nb40hxj3g6lasyb1dvhsh0svg0q"; depends=[kableExtra knitr Rcpp rmarkdown]; }; fma = derive2 { name="fma"; version="2.4"; sha256="1x175mhljvplm7b2iwcvkzalv3a79p8gqj9d4f06l5v4shxlrab9"; depends=[forecast]; }; fmbasics = derive2 { name="fmbasics"; version="0.3.0"; sha256="1dnf09rgwpc7n7ydlp7r5cwy2fa4vh1h9mbjqzfhk0208kz6jpl0"; depends=[assertthat fmdates lubridate tibble]; }; - fmcmc = derive2 { name="fmcmc"; version="0.2-0"; sha256="0hczf41pykxz8j9y8d2mqawzk5q9w44875jk4p4pf7jbkff5rzxf"; depends=[coda]; }; + fmcmc = derive2 { name="fmcmc"; version="0.3-0"; sha256="1r019pzk5h00s6ki897gbzsyhlnwljxklzqnfz87gbg1n5dvhqp4"; depends=[coda MASS]; }; fmdates = derive2 { name="fmdates"; version="0.1.4"; sha256="1bbcwkh65nf2gak9b81zgg32c5ihwhmai3nc43ayf6ivhqsxw8x0"; depends=[assertthat lubridate]; }; fmri = derive2 { name="fmri"; version="1.9.3"; sha256="0is9lgp27g8dv3rmxn4mlf9m53izx5j7h974cy3ls3lq0pdp99va"; depends=[aws metafor nlme]; }; fmriqa = derive2 { name="fmriqa"; version="0.3.0"; sha256="1z09nf1c305a78c129jvs21b9z91wyhazz41wrn4bimmhfhx7szv"; depends=[ggplot2 gridExtra imager optparse pracma RcppEigen reshape2 RNifti tidyr viridisLite]; }; fmsb = derive2 { name="fmsb"; version="0.7.0"; sha256="0x1wkzfdvv4s5xmr0whcwjz4aac71gacwymj2c3mzj2bbswwlw45"; depends=[]; }; foba = derive2 { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; }; focusedMDS = derive2 { name="focusedMDS"; version="1.3.3"; sha256="18s86dbbpyajscqr9frprf2vp1zif7vh4lw5m0cjskfc6gmsdp2p"; depends=[htmlwidgets]; }; - foghorn = derive2 { name="foghorn"; version="1.1.4"; sha256="1nxz41yhlg28jdihixy2w44nfvaliyfmxibxk58j7hfgyyvlm21s"; depends=[clisymbols crayon curl httr jsonlite rvest tibble xml2]; }; + foghorn = derive2 { name="foghorn"; version="1.1.5"; sha256="08lb3d7q7g0hvg68d9lbvssch0d4vxbfriy92pyx1vi57jaavnl6"; depends=[clisymbols crayon curl httr jsonlite rvest tibble xml2]; }; foieGras = derive2 { name="foieGras"; version="0.4.0"; sha256="0jrxdmsjxc8zjfgcv6n0kili0dzxppy0qdhqaji2ggklzynp4i33"; depends=[argosfilter dplyr furrr future ggplot2 gridExtra lubridate RcppEigen rworldmap sf stringr tibble tidyr TMB]; }; folderfun = derive2 { name="folderfun"; version="0.1.2"; sha256="08kfw7i5xqbk07ssp4j79p3x0gf0jq2fbcq99lb10r6ndcgp5rxp"; depends=[]; }; fontBitstreamVera = derive2 { name="fontBitstreamVera"; version="0.1.1"; sha256="0nipdlmhjv1wr3aidcl97nk6mppdkd65krgwqnhdsnv0jpfv761j"; depends=[]; }; @@ -7906,7 +7927,7 @@ in with self; { forecastHybrid = derive2 { name="forecastHybrid"; version="5.0.18"; sha256="0sgz50dl2939jl3azkxpv8kd00jcbkcgd5s6cng3kivrbrfslahp"; depends=[doParallel foreach forecast ggplot2 purrr thief zoo]; }; forecastML = derive2 { name="forecastML"; version="0.8.0"; sha256="18a05lp4v4gpplldwx3kwkblnhkplgjiis0jq529sjxk53plyfi1"; depends=[data_table dplyr dtplyr future_apply ggplot2 lubridate magrittr purrr rlang tibble tidyr]; }; forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.3-0"; sha256="0p47x7ic2ib7znqbp8br4b2ci75f5w8x413z9g4n30m002p7irp1"; depends=[Rcpp]; }; - foreign = derive2 { name="foreign"; version="0.8-76"; sha256="1z6x2x1z12wnv0z4p74d91r5wfaq30sdz4ynwx0lncz1q45mhbh5"; depends=[]; }; + foreign = derive2 { name="foreign"; version="0.8-78"; sha256="01anirfbfa3ip5pyqv72cg4x7p0jsppmbvxrllw7bm28fl1hgiyq"; depends=[]; }; forensic = derive2 { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[combinat genetics]; }; forensim = derive2 { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; }; forestChange = derive2 { name="forestChange"; version="1.0"; sha256="1d9qza1f16sz8pyafn3q7cyg9hw0ix4nqcgb9ipcnvmkyrc00f1a"; depends=[curl dplyr gdalUtils ggplot2 landscapemetrics raster rgdal rvest sp tibble xml2]; }; @@ -7916,10 +7937,10 @@ in with self; { forestRK = derive2 { name="forestRK"; version="0.0-5"; sha256="0zm0q7bckmjl1j3yh5pw4r6rq64rfmzjvmvqniza5691jagjz60m"; depends=[ggplot2 igraph knitr mlbench partykit pkgKitten rapportools]; }; forestSAS = derive2 { name="forestSAS"; version="1.0.1"; sha256="1jva2nivvcrczvqfhxa6vv1hsazp5m7djgfp7mfp1kpr136lyf2d"; depends=[spatstat]; }; forestinventory = derive2 { name="forestinventory"; version="0.3.1"; sha256="0brbg0q8j9ymvm527db7063kgs6i6flja7mxqk7yvaf3dh8wsi46"; depends=[ggplot2 plyr tidyr]; }; - forestmangr = derive2 { name="forestmangr"; version="0.9.1"; sha256="1b0yijc1yzgwkypyxb6v03sw32r3zz9rfjw63xiwzspq7hkbpinx"; depends=[broom car dplyr FinCal formattable ggdendro ggplot2 ggpmisc ggthemes gridExtra magrittr minpack_lm plyr purrr rlang scales systemfit tibble tidyr]; }; + forestmangr = derive2 { name="forestmangr"; version="0.9.2"; sha256="0f65yb4kixbvr8jp6063rgd8hxd5pycsx1dx9477222rmhp6f723"; depends=[broom car dplyr FinCal forcats formattable ggdendro ggplot2 ggpmisc ggthemes gridExtra magrittr minpack_lm plyr purrr rlang scales systemfit tibble tidyr tidyselect]; }; forestmodel = derive2 { name="forestmodel"; version="0.5.0"; sha256="09gwgsh42gkmhs8ijq5xfbbkb1hk6sjb0q32mw2ymc6x9ycr1a9j"; depends=[broom dplyr ggplot2 lazyeval tibble]; }; forestplot = derive2 { name="forestplot"; version="1.9"; sha256="1vcma7dvlvyhz6n25pj19h70i8xmz6vibkf945qkmj5hhrb7zxia"; depends=[checkmate magrittr]; }; - forestr = derive2 { name="forestr"; version="2.0.1"; sha256="1rxyp7d6np9qawrhc66fkdwylddnkha4d311c9w1x09pbnkwqzs8"; depends=[dplyr ggplot2 moments plyr viridis]; }; + forestr = derive2 { name="forestr"; version="2.0.2"; sha256="1kz8f3x2dmsprj2r23gz61fpwg7n14nbjxr16x4cpixvnk427p94"; depends=[dplyr ggplot2 moments plyr tibble tidyr viridis]; }; foretell = derive2 { name="foretell"; version="0.2.0"; sha256="18vi438n480gizfhnciw67gngvbjnmky19186b1wy75av7fgc1gp"; depends=[nloptr]; }; forge = derive2 { name="forge"; version="0.2.0"; sha256="0pjfzsc35agkh0zfw2czwajkbsyn6liys5irl5bhz5r1vim3jmwa"; depends=[magrittr rlang]; }; formatR = derive2 { name="formatR"; version="1.7"; sha256="1nsxbrx31k3y6yql30qkrvdfyznlia2qfvwv95mfiy7m7wdn4rm3"; depends=[]; }; @@ -7954,23 +7975,22 @@ in with self; { fracprolif = derive2 { name="fracprolif"; version="1.0.7"; sha256="124p5x59smqf8ba0xwhlq69w77zga2bv9plzwkadf700lzvaj2wx"; depends=[emg numDeriv]; }; fractal = derive2 { name="fractal"; version="2.0-4"; sha256="18lr9z0gslvfc3z8vyj3krqj3bfhg60zv1fzinrwwkc4cpk1w7mp"; depends=[ifultools MASS sapa scatterplot3d splus2R wmtsa]; }; fractaldim = derive2 { name="fractaldim"; version="0.8-4"; sha256="0fln4qn0d79agnnlzi8b9g9qn90zynq1cg9v5isiyi71345v45nr"; depends=[abind]; }; - fractalrock = derive2 { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8khgq269669ri16qxhar9646w40cw7wzh79r9gpf00"; depends=[futile_any futile_logger quantmod timeDate]; }; fractional = derive2 { name="fractional"; version="0.1.3"; sha256="1jz83y53s0xdphh1z3v3z7xhcmhx7rp0iiazw2vdsx2747r3rirn"; depends=[Rcpp]; }; + fragility = derive2 { name="fragility"; version="1.0"; sha256="13pb64i0mxcdvlpn71qs0vkv7rw1mxiy2cfnyw2ncnallw32ph5i"; depends=[metafor netmeta plotrix]; }; fragilityindex = derive2 { name="fragilityindex"; version="0.1.0"; sha256="06f7w0ff8mmydgylz5a0z29fc78spvmay3sjq0rz9k44w4bb9z3q"; depends=[pbapply stringr survival]; }; frailtyEM = derive2 { name="frailtyEM"; version="1.0.1"; sha256="0ajqmn8353va8k3idsl90xsrhpdqarfmvg84d4kwayxlqy6dmbb0"; depends=[expint ggplot2 magrittr Matrix msm numDeriv Rcpp survival tibble]; }; frailtyHL = derive2 { name="frailtyHL"; version="2.3"; sha256="115iv1d2c9mvviick8b24bn6kdbsvnf21nvfjm9a8dk0x07hrv5g"; depends=[cmprsk Matrix survival]; }; frailtySurv = derive2 { name="frailtySurv"; version="1.3.6"; sha256="0k41a5x7qzrajk2l59q5b8kjj084vids4ailr8r7r2lnf6r9xrav"; depends=[ggplot2 nleqslv numDeriv Rcpp reshape2 survival]; }; - frailtypack = derive2 { name="frailtypack"; version="3.1.0"; sha256="1x6i3kc8xl2dfmbljki94ivkh2hlkisq5hmxzk48i4288hrl2jcn"; depends=[boot doBy jsonlite MASS nlme rhandsontable shiny shinyBS shinydashboard shinyjs shinythemes statmod survC1 survival]; }; + frailtypack = derive2 { name="frailtypack"; version="3.2.0"; sha256="11159b60j6pk5vvvc8vlb606gjwbfc7d7aqb896aba2rciwddk6n"; depends=[boot doBy jsonlite MASS nlme rhandsontable shiny shinyBS shinydashboard shinyjs shinythemes statmod survC1 survival]; }; frair = derive2 { name="frair"; version="0.5.100"; sha256="1j557dqvc5xiz7xbl4h7vp55pc3hly8ci01qy36p02vlxhzf4hj3"; depends=[bbmle boot lamW]; }; frambgrowth = derive2 { name="frambgrowth"; version="0.1.0"; sha256="1xmy1zxp7aa2n8frlxhn1bl41zda1jldvvxb3q41yam3pslc8m1q"; depends=[]; }; franc = derive2 { name="franc"; version="1.1.2"; sha256="1bhszr0g0blx0jmdwxkicn1zz1fhfgyhzsncgy3181i987429gdg"; depends=[jsonlite]; }; frapplot = derive2 { name="frapplot"; version="0.1.3"; sha256="12924szk2p0582nv97gi8pxrbv41zqpjryc6jqgg4llhp7ydz7xf"; depends=[]; }; frbs = derive2 { name="frbs"; version="3.2-0"; sha256="0biv6j31qi0f4i063ygmbp6v6ws1nxijn5kyhg5sz1rnbr0msl28"; depends=[]; }; - fredr = derive2 { name="fredr"; version="1.0.0"; sha256="1hv51m0ihdpb73rp2gwj2q2xpjzlqpf9p3xzqdmy9nhwpfbj14nh"; depends=[httr jsonlite rlang tibble]; }; freealg = derive2 { name="freealg"; version="1.0-0"; sha256="0a3s89379lxr0dw068wfwzlqjq70zbaxil1vwwa4bf2i7s46mcgl"; depends=[Rcpp]; }; freegroup = derive2 { name="freegroup"; version="1.1-0"; sha256="0ssshs2d6l2ip1xx9x581w0cdnd2459a1mh360ybwajkjgak2ci6"; depends=[magic magrittr plyr]; }; freesurfer = derive2 { name="freesurfer"; version="1.6.7"; sha256="1wk0xjx0a99zm7gdn7i5z92wmqnlzng6n6g8w9whxvmy0rq6i19j"; depends=[neurobase R_utils reshape2]; }; - freesurferformats = derive2 { name="freesurferformats"; version="0.1.8"; sha256="13lqkw5bmbqviqsxb75ij8jicrgdxpahng5x5arazn38sksb9cg9"; depends=[pkgfilecache]; }; + freesurferformats = derive2 { name="freesurferformats"; version="0.1.9"; sha256="02qqp81b93dv84g3gbsl1705j5hj6ndv45npbbh35v5rsgswz9d9"; depends=[pkgfilecache]; }; freetypeharfbuzz = derive2 { name="freetypeharfbuzz"; version="0.2.5"; sha256="11agmqdp6sy32jk2840cj8wmgywq0yjar18zsnsn56qfvn4b1k1c"; depends=[fontquiver]; }; freqdist = derive2 { name="freqdist"; version="0.1"; sha256="1pb45jabv9s3qa7v1isd5wm9b0g9p04q5h18spcaax8397s0d2fv"; depends=[]; }; freqdom = derive2 { name="freqdom"; version="2.0.1"; sha256="0ig0ygnlcb5ndjjm5x8jpp37gvgwli9xv6zsvbbgfh72q418qswp"; depends=[matrixcalc mvtnorm]; }; @@ -7985,14 +8005,13 @@ in with self; { frmpd = derive2 { name="frmpd"; version="1.1.0"; sha256="0irgqdr0vr8k408lsxcrjkjbjvqvmy5mnjw9c1ghs86isrp5mciz"; depends=[]; }; frmqa = derive2 { name="frmqa"; version="0.1-5"; sha256="0vd5jnjzhkc0vd4cqn4cs6a3limd4fxwyb5i7845rwmkzk1944aj"; depends=[partitions Rmpfr]; }; fromo = derive2 { name="fromo"; version="0.2.1"; sha256="0srq13j0xqbyrmm8n93b5qwc25nz921z45yf467d7gfhxsbgy3hm"; depends=[Rcpp]; }; - frontier = derive2 { name="frontier"; version="1.1-6"; sha256="18qxzzhmxbwnflb90pls5d4kmijg0rhpsmnnysvmmppm8h6nf7nf"; depends=[Formula lmtest micEcon miscTools moments plm]; }; + frontier = derive2 { name="frontier"; version="1.1-8"; sha256="1qhasynm23yihmhb4d7w72msq2z1xf4xnzrkah3z8jv11yxhg1i2"; depends=[Formula lmtest micEcon miscTools moments plm]; }; frontiles = derive2 { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; }; frost = derive2 { name="frost"; version="0.0.4"; sha256="03snjlq4b9j84v0yimc3xzgjvryzzi76b9n53k0s2lvv1yzrri7x"; depends=[]; }; - frostr = derive2 { name="frostr"; version="0.1.0"; sha256="02ygg5dxpnv72gpwwsarhkl5hk6hldxjqpw875p7hb1ny7khgmfg"; depends=[httr jsonlite tibble tidyr]; }; frt = derive2 { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; }; fs = derive2 { name="fs"; version="1.4.1"; sha256="0kksig9pk8aid9l6r250na8z8j9919jvs20lj0s6m9bcybgh74df"; depends=[]; }; fsMTS = derive2 { name="fsMTS"; version="0.1.5"; sha256="1vxj9wkzpbk44hby4fdyhj72748c65by612kpphs6vmgzmw4y471"; depends=[freqdom glasso lars mpmi randomForestSRC]; }; - fsbrain = derive2 { name="fsbrain"; version="0.0.3"; sha256="1s7i9rpazp5s3vnm9y6ajpy06wbd7gjdzr9mbndjnsb9w985957a"; depends=[dplyr fields freesurferformats pkgfilecache reshape rgl squash]; }; + fsbrain = derive2 { name="fsbrain"; version="0.1.0"; sha256="0gwn8cnafcvkmzw7lf5q63xyfkhbj8wy1szcwmazkpkmg0zlwwcv"; depends=[data_table dplyr fields freesurferformats pkgfilecache reshape rgl squash]; }; fscaret = derive2 { name="fscaret"; version="0.9.4.4"; sha256="18fhyfl3f8syyc3g937qx87dmwbv7dray6b97p1s6lnssiv61gsw"; depends=[caret gsubfn hmeasure]; }; fsdaR = derive2 { name="fsdaR"; version="0.4-9"; sha256="1iaqqdwhh29fhq4r64adfrjmsyzq4v60bz9111vkazj4kr45wxxv"; depends=[ggplot2 rJava rrcov]; }; fsia = derive2 { name="fsia"; version="1.1.1"; sha256="0id7cnswrqylgpwjil1zfn89ryrdpl20fim8x1srl8s1hm5bg35r"; depends=[]; }; @@ -8005,7 +8024,7 @@ in with self; { ftExtra = derive2 { name="ftExtra"; version="0.0.1"; sha256="0zgz4sjxx6ls27afb9djmxvwq46pp5jwxxbb87wnjc9fn5vvnnxy"; depends=[dplyr flextable jsonlite magrittr purrr rlang rmarkdown stringr tidyr tidyselect]; }; ftnonpar = derive2 { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; }; fts = derive2 { name="fts"; version="0.9.9.2"; sha256="08pwhi19db173d4nsk5rl8xa8qmaddj4bn3cjxb8ql4kny59i57q"; depends=[BH zoo]; }; - ftsa = derive2 { name="ftsa"; version="5.5"; sha256="1c7b3b6zrm45y2110j0dqlgilfiiyx4wqhgdiq82q6kagng32cl1"; depends=[colorspace fda forecast MASS pcaPP pdfCluster rainbow sde]; }; + ftsa = derive2 { name="ftsa"; version="5.6"; sha256="1zg15jf65hi8gg5s6xmk70x6w9k2ay1b5nf7xnvllis4hi9n8s3j"; depends=[colorspace fda forecast MASS pcaPP pdfCluster rainbow sde]; }; ftsspec = derive2 { name="ftsspec"; version="1.0.0"; sha256="12f9yws1r26i240ijq0xqprl3pgbw50wv68jsm75ycplbs2jsyhs"; depends=[sna]; }; fuel = derive2 { name="fuel"; version="1.0.2"; sha256="0ziw370ch8g2hnlimxfgski4n28b83jnwrhlh7ibszk0lz593rkr"; depends=[]; }; fueleconomy = derive2 { name="fueleconomy"; version="1.0.0"; sha256="16a8wyliiidi6rw14ksimygfkl4a7yhxvss7l9bcvr1wfiplrn65"; depends=[]; }; @@ -8016,11 +8035,12 @@ in with self; { fun = derive2 { name="fun"; version="0.2"; sha256="0944m10nym4rsb6rhdwqn04c7l3bz43jcw3q8hv4vljdf5kyg9ar"; depends=[]; }; funData = derive2 { name="funData"; version="1.3-4"; sha256="14s86s8ap52qr50cwmiqhkfnnb5ckf9hnmzslfmz44k3ydp9d7hp"; depends=[abind fields foreach]; }; funFEM = derive2 { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[elasticnet fda MASS]; }; + funGp = derive2 { name="funGp"; version="0.1.0"; sha256="03khkwdq2kc7wxr7jr50kms4w63w6iz90431d960dg4s0gff29h8"; depends=[doFuture foreach future knitr microbenchmark progressr qdapRegex scales]; }; funHDDC = derive2 { name="funHDDC"; version="2.3.0"; sha256="1dym1bzywng5yjfzpppxx043pwcbvrxxq0bn1d6xqqkqcpzn2zhp"; depends=[fda MASS]; }; funLBM = derive2 { name="funLBM"; version="1.0"; sha256="0krx5v1lakrrxk0j249k7sr7c6r40yg1l8l10laf4444j2qn8rjp"; depends=[fda funFEM]; }; funModeling = derive2 { name="funModeling"; version="1.9.3"; sha256="0dqpb5igdpdnbwr6y8wr11hcn84clshnx0q913512jvcrx0h0pd9"; depends=[cli dplyr entropy ggplot2 gridExtra Hmisc lazyeval moments pander RColorBrewer reshape2 ROCR scales stringr]; }; funbarRF = derive2 { name="funbarRF"; version="1.0.2"; sha256="14xfhwp4vffl215fqdxdxpmjblyw75ylxqjzja794adywm06sz19"; depends=[BioSeqClass Biostrings randomForest]; }; - funchir = derive2 { name="funchir"; version="0.1.4"; sha256="1mbsy65628q117c2k01wvibpjd3ibigy4yc1c8m0rf9jwsc67qjb"; depends=[data_table]; }; + funchir = derive2 { name="funchir"; version="0.2.0"; sha256="1rj5khv1xcaaip5xh8kcsp2jgmbmnc9q5kwr46l4mxvxyndndi1k"; depends=[data_table]; }; functional = derive2 { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; }; functools = derive2 { name="functools"; version="0.2.0"; sha256="0g62jdia3n09vq8mx1m2r4nl3jfcadzpym0wkldzzzjcfs90vl6b"; depends=[]; }; funest = derive2 { name="funest"; version="0.0.1.3"; sha256="1pi556klfnbmrsx5c0f3v4hdn5m4dxxm71ijivanpwfqnfls8xh3"; depends=[funData MFPCA pec prodlim purrr ranger Rdpack survival tdROC]; }; @@ -8030,7 +8050,7 @@ in with self; { funneljoin = derive2 { name="funneljoin"; version="0.1.0"; sha256="17g1mvq9z5m29r0v2r2nn8980j515jamnpwvvnzj83vk84bz94rq"; depends=[broom dplyr glue magrittr purrr rlang tibble tidyr]; }; funprog = derive2 { name="funprog"; version="0.2.0"; sha256="1gs0mahvzgnv5pfvz32acq0jk3rnssg6bxqzlqpyqg0r3g4m80mf"; depends=[]; }; funr = derive2 { name="funr"; version="0.3.2"; sha256="11mjd1ba9kwawh7k5py54mkq4g1df79d7qivan8fj11qfwfzm679"; depends=[]; }; - funrar = derive2 { name="funrar"; version="1.4.0"; sha256="15pbc5v6ncs96hbka4nxxm33nbd7q0nign7wa136prziqnsyndwi"; depends=[cluster dplyr]; }; + funrar = derive2 { name="funrar"; version="1.4.1"; sha256="0xqccch59f8cz4a7ybjdr6k625bir5nsjrp4iyfirrb877d17m5z"; depends=[cluster]; }; funreg = derive2 { name="funreg"; version="1.2"; sha256="199zvqali0sb0z4yp20rm5da0kd7z3rgv47g1cb1apsbcw0cq51n"; depends=[MASS mgcv mvtnorm]; }; funtimes = derive2 { name="funtimes"; version="6.1"; sha256="1qr0z0nn3dv2yxq4sacsm0xs4pnda31zc10rz427rdyjrps85838"; depends=[dbscan Jmisc Kendall Rdpack]; }; furniture = derive2 { name="furniture"; version="1.9.7"; sha256="1czc1ayfpqf6h7n5fjzx1vwkzm9vg1dr62hl5k511b9kdc8lfsfh"; depends=[dplyr knitr magrittr]; }; @@ -8038,16 +8058,14 @@ in with self; { fusedest = derive2 { name="fusedest"; version="1.3.1"; sha256="1nz5bkvn8y9f8h0ya6wblryg7bwj1vnz1vyqmd1hfr85bxfgl83c"; depends=[igraph Matrix Rcpp RcppEigen]; }; fuser = derive2 { name="fuser"; version="1.0.1"; sha256="17lsfpd9hdichj3wflac896zyjbq7a8w2gmlgj8nbgg80f646fgr"; depends=[glmnet irlba Matrix Rcpp RcppEigen RSpectra]; }; fusionclust = derive2 { name="fusionclust"; version="1.0.0"; sha256="1h03nlk4gnz4j5h2h5bxazkka2qq983h7nglm1ghzqvbqjk6sv37"; depends=[bbmle]; }; - futile_any = derive2 { name="futile.any"; version="1.3.2"; sha256="09z12dlj7cnkfwnmgsjknsghirv1cry83w4a9k4d0w5a1jnlr5jg"; depends=[lambda_r]; }; futile_logger = derive2 { name="futile.logger"; version="1.4.3"; sha256="1r3nayk0z9n1svbf8640vw90dal5q07nkn0gv4bnva3pbzb352sy"; depends=[futile_options lambda_r]; }; - futile_matrix = derive2 { name="futile.matrix"; version="1.2.7"; sha256="0nbzcy5l3nllppwmdib1s11s7b4m7mfvqb90n6b2hgmd48jsw8wg"; depends=[futile_logger lambda_r lambda_tools RMTstat]; }; futile_options = derive2 { name="futile.options"; version="1.0.1"; sha256="0w15agpi88y3qkv6fl72zy2pzyplzgvnj41a4ixhg64mw1sck73s"; depends=[]; }; futile_paradigm = derive2 { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; }; futility = derive2 { name="futility"; version="0.4"; sha256="0zjb87brz7pkx3nq3q30y69cmcxpqqsra447p60qh7005kgr9vx4"; depends=[]; }; - future = derive2 { name="future"; version="1.16.0"; sha256="1xaqh0b2knf5bp23mc0kriq0iqhqna31q3b7d960piqjhzrb03dm"; depends=[digest globals listenv]; }; + future = derive2 { name="future"; version="1.17.0"; sha256="0d4y7gwcgqx2z0y6h5bh4lrz0m7b0inii5cjcq0kk8za762bi8rg"; depends=[digest globals listenv]; }; future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.16.2"; sha256="08lh1sp0v1vagi34s218a1ygj63whkf3s9w0kyf25v64gsdavkzc"; depends=[BatchJobs future R_utils]; }; - future_apply = derive2 { name="future.apply"; version="1.4.0"; sha256="1kgq6dv96hdy35kysqkn606nj7s9dp4ibgpm6n46gqhc5n75lzkk"; depends=[future globals]; }; - future_batchtools = derive2 { name="future.batchtools"; version="0.8.1"; sha256="034sgd5pcv6d4jbi21ishwz5r1ym82g1pvyv3s0sl1jsy5g55v0w"; depends=[batchtools future]; }; + future_apply = derive2 { name="future.apply"; version="1.5.0"; sha256="095a681ngbwbp7v53ladwya7ar8fgwnlgr3r1yklf3vdxwd54xll"; depends=[future globals]; }; + future_batchtools = derive2 { name="future.batchtools"; version="0.9.0"; sha256="1srcc4vv9nm49nq8llxik9ys4f45lz2shwlc4l9wp0zmxinzi3sr"; depends=[batchtools future]; }; future_callr = derive2 { name="future.callr"; version="0.5.0"; sha256="0rjvjmffc4m9kr4p40q1gyv1zf49m8q0fb04kmdi7a8q2jfflpna"; depends=[callr future]; }; future_tests = derive2 { name="future.tests"; version="0.2.1"; sha256="1f75y7s9yrsz8c3vbsvp55zllp6sbpjrxbxknm1rfhg4sc2ak33c"; depends=[cli crayon future prettyunits sessioninfo]; }; futureheatwaves = derive2 { name="futureheatwaves"; version="1.0.3"; sha256="122b2z86bzxfch67y6cpq8wj62mw0dgkzbmnpwi247kdx7w5mw1f"; depends=[data_table dplyr ggplot2 ggthemes leaflet Rcpp stringr tidyr]; }; @@ -8083,7 +8101,7 @@ in with self; { gRc = derive2 { name="gRc"; version="0.4-3.2"; sha256="0f8m83wqhmsn6p0v0msdzyy9vl900nc9ddr8y78181jxcd9mqd0d"; depends=[gRbase MASS]; }; gRim = derive2 { name="gRim"; version="0.2.1"; sha256="0j5r4pnjmyc9z0yfs8bgp0w8w4prlqwvnxmg5pm5gz09h8kkd2qq"; depends=[gRain graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; gSEM = derive2 { name="gSEM"; version="0.4.3.4"; sha256="18kh41ibvfflz59gykiq7j2c6a72i8b0w8c2mcprd1nzhnyhvmhy"; depends=[DiagrammeR htmlwidgets knitr MASS]; }; - gSeg = derive2 { name="gSeg"; version="0.6"; sha256="19njl093qidwjcwzxkzip78ahgq3zwhc0kscvhjpzb49qkg3srrj"; depends=[]; }; + gSeg = derive2 { name="gSeg"; version="0.7"; sha256="0np15vsnnksd59gzwk64fyjcawmrjq1n0rbjiw56zhsn19gkjx25"; depends=[]; }; gStream = derive2 { name="gStream"; version="0.2.0"; sha256="1f4xnbavm99yhjmaahazigps41mqlfvvl29kf4fs1yjqr531y36b"; depends=[]; }; gTests = derive2 { name="gTests"; version="0.2"; sha256="1h1sd8mrzcniq7rx7frdlxwpnsn8lifng1x99fqq703hs3znl1yq"; depends=[ade4]; }; gWQS = derive2 { name="gWQS"; version="2.0.1"; sha256="1yl8c9v66n5zbkdcxbrzmjdf24in3gkrxgnyr2lc7pi414zb2dbg"; depends=[broom dplyr future future_apply ggplot2 ggrepel kableExtra knitr MASS nnet plotROC reshape2 rlist Rsolnp]; }; @@ -8136,6 +8154,7 @@ in with self; { gap_datasets = derive2 { name="gap.datasets"; version="0.0.4"; sha256="1zlxm3nh1b1mqb94fq2b7sc7v99m9ywz7bz9lz5bhwblk5fzmjii"; depends=[]; }; gapfill = derive2 { name="gapfill"; version="0.9.6"; sha256="0384v7capab7dbyvz6b2jvnh840z6ab3857my0h3cgsys3lhn3c5"; depends=[fields foreach ggplot2 quantreg Rcpp]; }; gapminder = derive2 { name="gapminder"; version="0.3.0"; sha256="067cra1ca4ngwjx8d1y9pyzwcpsfi1wcal0glzyy6ghd1k6jflpv"; depends=[tibble]; }; + garchx = derive2 { name="garchx"; version="1.0"; sha256="1k8f6251hpj38rllw10w97r9j4asqg111kwcpnxh4rilbhjcra36"; depends=[zoo]; }; gargle = derive2 { name="gargle"; version="0.4.0"; sha256="08zhfk2sl342w35i5n2c93ayypg3z0kbl0020l3y9adqka1vazgx"; depends=[fs glue httr jsonlite rlang withr]; }; garray = derive2 { name="garray"; version="1.1.2"; sha256="0s2dgi556x9jnhafvzz4qkxdbq9dm12gsvsqd2g9iy3468fx9flq"; depends=[]; }; gaselect = derive2 { name="gaselect"; version="1.0.9"; sha256="089gyllcmq5rgf5yffclifc7rc8rmq4wk1dhznigxkij4zap67hx"; depends=[Rcpp RcppArmadillo]; }; @@ -8173,14 +8192,14 @@ in with self; { gdata = derive2 { name="gdata"; version="2.18.0"; sha256="0zwdj7lscgxr8r62ii8hbdh4mb7sa9w4f5nv32zzrxdvymcpya2b"; depends=[gtools]; }; gdimap = derive2 { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[abind colorspace geometry gridExtra gsl movMF oro_nifti rgl]; }; gdistance = derive2 { name="gdistance"; version="1.3-1"; sha256="04v86kdpag3dvp4zm4ia9y0g9nxa39ka0nmqyw7rkhkmzfs7m6hf"; depends=[igraph Matrix raster sp]; }; - gdm = derive2 { name="gdm"; version="1.4.1"; sha256="0nzjqc138fsd2fh4crblzhnvgcf9iaak9l866xvmzzimw3lrp7qw"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; }; + gdm = derive2 { name="gdm"; version="1.4.2"; sha256="1q2bmqrxlac72jdmaldf4m6cwv60aaxxqws518dcn83bs788mbcm"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; }; gdmp = derive2 { name="gdmp"; version="0.2.0"; sha256="0fy8x9l6swrb78apwq9d9msz2y8dkfd2fkyp1pkmzxwdb85lmcdm"; depends=[]; }; gdns = derive2 { name="gdns"; version="0.3.1"; sha256="1vydl7jacldidzx1hhqang9fw8zar8wy4cgdmr9pbw22ffw2qq7s"; depends=[httr jsonlite stringi]; }; gdpc = derive2 { name="gdpc"; version="1.1.1"; sha256="1wdfmsc8g7paj3rj75wcvqcjw92bkgc57nz1wc90y67gh1xvxs1i"; depends=[doParallel foreach Rcpp RcppArmadillo xts zoo]; }; gds = derive2 { name="gds"; version="0.1.0"; sha256="0kc3l93640x8d6g3pa9gbr7ci5hmryg9i1nqpasgnvb6ixv6azbm"; depends=[]; }; gdtools = derive2 { name="gdtools"; version="0.2.2"; sha256="08njzin0c6biw62j5w30r9j85vr1m2cg4hmv5d76nym860yrlqjf"; depends=[Rcpp systemfonts]; }; gdxdt = derive2 { name="gdxdt"; version="0.1.0"; sha256="1yrjixq4srmaiy5iaprix4096yhf3ldyklgjag4kxd3l5acwap4h"; depends=[data_table]; }; - gear = derive2 { name="gear"; version="0.2.0"; sha256="1mb2brw0gasmvfj5kajlyqfxiw1kg3fy56fqlldss5gbl29y67qr"; depends=[autoimage ggplot2 lattice optimx sp]; }; + gear = derive2 { name="gear"; version="0.3.4"; sha256="0ibn2kr0rjj546cbcqhr6x69s25xh7si5fri59055j42g62mdnxy"; depends=[autoimage optimx Rcpp]; }; gee = derive2 { name="gee"; version="4.13-20"; sha256="167pzgnmj4cjc41ykps1mfwi6s7y32zxyycn5z17vn4v0pp4q0ak"; depends=[]; }; gee4 = derive2 { name="gee4"; version="0.1.0.0"; sha256="1vvzb9sc69g292zmh9djd15jgc7falypd5p7mzw6ps7mirpbnicf"; depends=[Formula Rcpp RcppArmadillo]; }; geeM = derive2 { name="geeM"; version="0.10.1"; sha256="1r9zyjv7r7r7avdqi54dvczf971frz8pgrs1a04kan5mh4ls6xpy"; depends=[Matrix]; }; @@ -8197,7 +8216,6 @@ in with self; { gemtc = derive2 { name="gemtc"; version="0.8-4"; sha256="1vg71vskvpky84371vq9i2x1i8axd7dcsbbv4zac9h2xlf63l39j"; depends=[coda igraph meta plyr Rglpk rjags truncnorm]; }; gen2stage = derive2 { name="gen2stage"; version="1.0"; sha256="16xbzgkjskzm1wik3dznvwhqddrpmcgsgd372n4a67rbb46jgx6r"; depends=[clinfun]; }; gen5helper = derive2 { name="gen5helper"; version="1.0.1"; sha256="0z7hisn57md18vcfb6f44hy6zzp9dirrjyxi4x1id3mqa3mligb6"; depends=[dplyr ggplot2 minpack_lm naturalsort plyr pracma rlang tidyr]; }; - genBaRcode = derive2 { name="genBaRcode"; version="1.2.2"; sha256="0ls5xly4rrwjby04015yrs8f072fdg492bk4lj1zr2hy0z4m98jc"; depends=[ape Biostrings dplyr futile_logger future future_apply ggnetwork ggplot2 ggraph ggseqlogo ggtree igraph network phangorn RColorBrewer reshape2 S4Vectors shiny ShortRead stringdist VennDiagram visNetwork]; }; genBart = derive2 { name="genBart"; version="1.0.1"; sha256="12z5vj41npwawz954zqkjfmg9inh063ilh7m82pn73asrxif0ay3"; depends=[clValid data_table fastcluster ggplot2 gtools limma NMF pca3d psych qusage RColorBrewer reshape2 rmarkdown scales shiny shinydashboard shinyjs statmod stringr VennDiagram]; }; genSurv = derive2 { name="genSurv"; version="1.0.3"; sha256="0k5rfpq603szjb76gxffvsbqcav8182h8zwvg4kar68k72yfw1xs"; depends=[]; }; genTS = derive2 { name="genTS"; version="0.1.3"; sha256="1ky8h8yzqfkb91ny9z08gr7irzvjqr1b42k89ahcrmk458hjwgqr"; depends=[shiny]; }; @@ -8216,7 +8234,6 @@ in with self; { genepi = derive2 { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; }; genepop = derive2 { name="genepop"; version="1.1.7"; sha256="0b36nspq3kkad52k0viw1pdsf7h9h5ivi0ix7zg8i0z7vkhnm0cy"; depends=[Rcpp RcppProgress stringr]; }; generalCorr = derive2 { name="generalCorr"; version="1.1.5"; sha256="1kjmg9paxhpd6csia69k169qgm8s388iysrjnm4bqv9zxn21zwwg"; depends=[lattice meboot np psych xtable]; }; - generalKSStat = derive2 { name="generalKSStat"; version="1.0.3"; sha256="03jnklvji78xwfspz29jy2jmww893x9xxd25y9gbb73nqmjvgmmr"; depends=[Rcpp]; }; generalhoslem = derive2 { name="generalhoslem"; version="1.3.4"; sha256="0fmfhmdb16gf3v9h50vif4f3f6bm03qq7wplnmzyxa80jb60fcc0"; depends=[MASS reshape]; }; generator = derive2 { name="generator"; version="0.1.0"; sha256="0xjvnmnpdms8rrxxcz6pd8w4rnbv3ghzqv4m63zxia2l98x7z4rf"; depends=[]; }; generics = derive2 { name="generics"; version="0.0.2"; sha256="0xk1xhpy7gpv3pvaygzhpfdxj72zmb38pb4nscfyg2ff36vx3cvi"; depends=[]; }; @@ -8226,7 +8243,7 @@ in with self; { genie = derive2 { name="genie"; version="1.0.4"; sha256="0ymrn42ik0rfildmyq4z0gsd7injda0dsjgx69nqb6hq0x8s5hqa"; depends=[Rcpp]; }; genio = derive2 { name="genio"; version="1.0.12"; sha256="15v9hdnb1jknbvflvgyyhcx0cqjn3v9zl66mswk59j56qm58bkr9"; depends=[Rcpp readr tibble]; }; genius = derive2 { name="genius"; version="2.2.0"; sha256="0062g7wyclrbaljwib57s95x5wamc01fr3hgwjjzgv850vbbjqlv"; depends=[dplyr purrr readr reshape2 rvest stringr tibble tidyr tidytext]; }; - geniusr = derive2 { name="geniusr"; version="1.1.0"; sha256="1qnzqlgzq507g9iik00gh242nh3zcg38awrlaxl5zgnsp852kjnv"; depends=[attempt curl httr purrr rvest stringr tibble xml2]; }; + geniusr = derive2 { name="geniusr"; version="1.2.0"; sha256="04h0a61ngs0cmjf23imx76bm82dzkp4q4j31h3xlic05dx2lvyan"; depends=[curl dplyr httr purrr rvest stringr tibble xml2]; }; genlasso = derive2 { name="genlasso"; version="1.4"; sha256="01p1cs0h6gwr6f18aaqirgd8yxrhyamakc763y9dm6mndrba2x0g"; depends=[igraph MASS Matrix]; }; genlogis = derive2 { name="genlogis"; version="1.0.0"; sha256="01av5invhviii7adqihh10ib47rjzwfsqdgw3lfg1c72kzrqywgr"; depends=[distr doParallel foreach ggplot2 manipulate]; }; geno2proteo = derive2 { name="geno2proteo"; version="0.0.3"; sha256="1q054ai42f5gmrj791abj02f663zs7ymdh3pfs3b2lq6i4w9s2fb"; depends=[BiocGenerics GenomicRanges IRanges R_utils RUnit S4Vectors]; }; @@ -8238,7 +8255,7 @@ in with self; { genomicper = derive2 { name="genomicper"; version="1.6"; sha256="12msl6syw5a3dvxg9fr1yprcpb9qwn8v2dvkpxgagal11p9q1kx7"; depends=[DBI]; }; genotypeR = derive2 { name="genotypeR"; version="0.0.1.8"; sha256="1kwzjn6hrnfizs44cz4a8qa4mdhdzqssc4axx0s6vngmkmsrffig"; depends=[colorspace doBy plyr reshape2 zoo]; }; genpathmox = derive2 { name="genpathmox"; version="0.3"; sha256="0r1iqwm5jh93lbh87ks5qm4qqsp98928vg7qmv1pkahdlvl3ramw"; depends=[diagram mice plspm quantreg]; }; - genpwr = derive2 { name="genpwr"; version="1.0.1"; sha256="1vz4pq8rfvw0pbxhm83mbgsrj17ldcssq92b48p6vlpb403jsm91"; depends=[ggplot2 MASS nleqslv]; }; + genpwr = derive2 { name="genpwr"; version="1.0.2"; sha256="0k05l0d2qk2g3ic6f46xkhgy8ziwalrfx4nc0qi2k7i44kz720mg"; depends=[ggplot2 MASS nleqslv]; }; genridge = derive2 { name="genridge"; version="0.6.7"; sha256="07mdkkq4j8i5x8d4yfsp2rfpf7gkcgdcsw9b2ng5f7gdnblrw0dr"; depends=[car]; }; gensemble = derive2 { name="gensemble"; version="1.0.1"; sha256="03ql1qxrxixr70hs9mwiqw92qyrg9pj4046pb42g435yncw321ad"; depends=[]; }; gensphere = derive2 { name="gensphere"; version="1.1"; sha256="1xzli40fw94n89cv2qyb321csad1w9zidqc226wlifl2m44cw6f7"; depends=[geometry mvmesh rgl SimplicialCubature SphericalCubature]; }; @@ -8262,7 +8279,7 @@ in with self; { geohashTools = derive2 { name="geohashTools"; version="0.3.0"; sha256="0lc5ib6iylbxn02bl72sh3b6j51zm3b1rnjrj5jdyjj22hm7n7sa"; depends=[]; }; geojson = derive2 { name="geojson"; version="0.3.2"; sha256="0iqf8jkqgl97a07v8ixr2pbvamwyjswqckdwl3kkxgx7bycndprv"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; }; geojsonR = derive2 { name="geojsonR"; version="1.0.8"; sha256="015g1xpvbwgng5vh79q8gx6900skv3p7s2v3xbka08qllvsg5by1"; depends=[R6 Rcpp RcppArmadillo]; }; - geojsonio = derive2 { name="geojsonio"; version="0.9.0"; sha256="0w0qfag64js72qbm15gapgrh6xlh87dzwf0qs9gcrrlr69r5kvk1"; depends=[crul geojson jqr jsonlite magrittr maptools readr rgeos sf sp V8]; }; + geojsonio = derive2 { name="geojsonio"; version="0.9.2"; sha256="1m315vr0vw60g6j5i7x293szhji3d4p7f54hxmz1aqw4y7fkr8f6"; depends=[crul geojson jqr jsonlite magrittr maptools readr rgeos sf sp V8]; }; geojsonlint = derive2 { name="geojsonlint"; version="0.4.0"; sha256="0l6xlf6l9shyvdd2ghkhcgbkxpmycapfpxakzbvd92j1x8dmr9az"; depends=[crul jsonlite jsonvalidate V8]; }; geojsonsf = derive2 { name="geojsonsf"; version="1.3.3"; sha256="0a1ij0nq5d4cvrmqs0mpnc2a1c4h9ms29yln9iay9qi5c5pjdd1k"; depends=[curl jsonify rapidjsonr Rcpp sfheaders]; }; geoknife = derive2 { name="geoknife"; version="1.6.3"; sha256="092in9wihgijhbkawzjqwfyazz22n4sc06x2gj14yvmp63x5dj36"; depends=[curl httr progress sp whisker xml2]; }; @@ -8278,7 +8295,6 @@ in with self; { geoops = derive2 { name="geoops"; version="0.2.0"; sha256="0n9n0j849jbqv6y6lqhyhddr5zfz8i9yi03gpg9862nzkvxd3c4k"; depends=[Rcpp]; }; geophys = derive2 { name="geophys"; version="1.4-1"; sha256="1s64sbr0chv0z2vaw059khfkv8iga1kr6428kkglgafq5x2d6h3q"; depends=[cluster GEOmap RFOC RPMG RSEIS]; }; georob = derive2 { name="georob"; version="0.3-13"; sha256="1ddynk8ss5jslxrwz7rg650d05qa5sh5qc3rzkrq8s4hpvw1zqgw"; depends=[abind constrainedKriging fields lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; }; - geosample = derive2 { name="geosample"; version="0.2.1"; sha256="1gpzrsza8ys2jdazb2ixc70y1w5lrkahlmvws1i071zby1la01iy"; depends=[pdist sf sp splancs]; }; geosapi = derive2 { name="geosapi"; version="0.4-1"; sha256="00c2566r50v4vgqzjvghf4spyfqqxnwkhxj38ivym3l8b0d5fd2x"; depends=[httr openssl R6 XML]; }; geoscale = derive2 { name="geoscale"; version="2.0"; sha256="0gisds0in32xhw54fxfyxvwxgrfjs871wmqf6l915nr896rlx0bm"; depends=[]; }; geosed = derive2 { name="geosed"; version="0.1.1"; sha256="07j4q6sgrf83h2gi2j5qap5rifz8gimdacd3b7ld1p3b6ai6kv3r"; depends=[]; }; @@ -8313,7 +8329,7 @@ in with self; { getopt = derive2 { name="getopt"; version="1.20.3"; sha256="0zzmzgwl9a4y3s34600vmih22d6y32294f9bvxrnmffnvkgmy7sk"; depends=[]; }; gets = derive2 { name="gets"; version="0.22"; sha256="0k5lji4gglb1is3j2596yibr6cx4h82aslwcbm4hb6jjb76ajmcv"; depends=[zoo]; }; getspres = derive2 { name="getspres"; version="0.1.1"; sha256="1k69b7by1398pc9knp97r3k6pv8hixzianqal71ggdrwsb3n1gis"; depends=[colorRamps colorspace dplyr metafor plotrix RColorBrewer]; }; - gettz = derive2 { name="gettz"; version="0.0.3"; sha256="1i06nfm824131q8lwwhrbzg2g9lbnmyp8k57w2vag7v8jj5rdrda"; depends=[]; }; + gettz = derive2 { name="gettz"; version="0.0.4"; sha256="1j83pdny3phfflkdjwiflyfvighn73pysw5bac4hx079dda8k25g"; depends=[]; }; gexp = derive2 { name="gexp"; version="1.0-1"; sha256="1i3sarsawax1landjbm8gxrcrimwzdgrbybzipqwxdrmlgvxslqk"; depends=[jpeg mvtnorm png]; }; gfcanalysis = derive2 { name="gfcanalysis"; version="1.5.0"; sha256="1cg34c4hr8kwc23qlv2m6qw2k7ah4w8s70q0hf4hnvp66rw4kaqh"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl rgdal rgeos sp stringr]; }; gfer = derive2 { name="gfer"; version="0.1.10"; sha256="1y0ra8k7zka43ibiii16vbwnc3m1i77yc9zj8rhzhmvhajjwad3l"; depends=[circlize data_table ggplot2 ggrepel googlesheets gsheet httr jsonlite rvest scatterpie stringi tidyr V8 xml2]; }; @@ -8323,6 +8339,7 @@ in with self; { ggBubbles = derive2 { name="ggBubbles"; version="0.1.4"; sha256="116rl8j0s9xwhh9jl5yj9fspkhv2zrirbx9247hhns9ngrdn4i3x"; depends=[dplyr ggplot2]; }; ggChernoff = derive2 { name="ggChernoff"; version="0.2.0"; sha256="09bh9isvx3hwwvg72fv6z3fvp8dimpbhvbp328z8amq8jjhph4vf"; depends=[ggplot2 scales]; }; ggExtra = derive2 { name="ggExtra"; version="0.9"; sha256="18mbi6gblqmrsciad1d2c9ngllk6mayaqj43k40hjq9ydqnvjbgj"; depends=[colourpicker ggplot2 gtable miniUI R6 scales shiny shinyjs]; }; + ggPMX = derive2 { name="ggPMX"; version="1.1"; sha256="0magxjrm6za9g1hhmykv47gh6lyc1zz7bffcrchxnybsv5mih9p8"; depends=[assertthat checkmate data_table GGally ggplot2 gtable knitr magrittr R6 rmarkdown stringr yaml zoo]; }; ggQC = derive2 { name="ggQC"; version="0.0.31"; sha256="1j9cs97hcj5zmqvn5rjr3gl0b9748s3pv2nb7v66dsyjdwvj7wyy"; depends=[dplyr ggplot2 tidyr]; }; ggQQunif = derive2 { name="ggQQunif"; version="0.1.5"; sha256="0vrxmqxy946mwdq0mb2m1ch41r0chrw7hcn18dr3mp10bv7pl7wj"; depends=[dplyr ggplot2 scales]; }; ggROC = derive2 { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; }; @@ -8332,13 +8349,14 @@ in with self; { ggTimeSeries = derive2 { name="ggTimeSeries"; version="1.0.1"; sha256="12gi0zfl8g3x78skpkhska8b3z1pp636shrbx33rkq0iacsipqga"; depends=[data_table ggplot2]; }; ggVennDiagram = derive2 { name="ggVennDiagram"; version="0.3"; sha256="1jgxzb3iffhx6xyn14nldljkaangdvzrxzfkibsb6g787fgv8ng9"; depends=[dplyr ggplot2 sf VennDiagram]; }; ggallin = derive2 { name="ggallin"; version="0.1.1"; sha256="0hrxa7m07ppvnndivxcgxksdyblb6fw17aw46maqavlvcrz3fjgm"; depends=[ggplot2 scales]; }; - ggalluvial = derive2 { name="ggalluvial"; version="0.11.1"; sha256="05c59w9rmp59ajw8ybr155c9xfxzlgc76xcnxh3890nh7nn7h0m1"; depends=[dplyr ggplot2 lazyeval rlang tidyr tidyselect]; }; + ggalluvial = derive2 { name="ggalluvial"; version="0.11.3"; sha256="19kad21rysh9f6fifd9drw9q90c3chpq33pip10zl2k1zl2wlif0"; depends=[dplyr ggplot2 lazyeval rlang tidyr tidyselect]; }; ggalt = derive2 { name="ggalt"; version="0.4.0"; sha256="0ssa274d41vhd6crzjz7jqzbwgnjimxwxl23p2cx35aqs5wdfjpc"; depends=[ash dplyr extrafont ggplot2 gtable KernSmooth maps MASS plotly proj4 RColorBrewer scales tibble]; }; ggamma = derive2 { name="ggamma"; version="1.0.1"; sha256="1zc4p2bz4pxqycrzgb9wwl53lxqcikxsihna6ff8pmw1n623j85z"; depends=[]; }; gganimate = derive2 { name="gganimate"; version="1.0.5"; sha256="0kvz9gm56zz61bq7sky0m9mrlk8awjx0xm3yw9dawz1vw4a5fr3x"; depends=[ggplot2 glue plyr progress rlang scales stringi tweenr]; }; ggasym = derive2 { name="ggasym"; version="0.1.3"; sha256="1vfwzjwmh27ki0j7nadmnl28wddjs4nzmraak868hmph9a2bjdgj"; depends=[dplyr ggplot2 magrittr purrr rlang scales stringr tibble tidyr]; }; ggbeeswarm = derive2 { name="ggbeeswarm"; version="0.6.0"; sha256="0crk29p5vi1r3a988kms4y7r0iqwgwzsikgvh18r9wbzyr98bb5v"; depends=[beeswarm ggplot2 vipor]; }; ggbuildr = derive2 { name="ggbuildr"; version="0.1.0"; sha256="0pld635v6fv46ky7s4icwxlcnr7z6bp5ikf20adpkljwhy0wwxak"; depends=[ggplot2 purrr readr]; }; + ggbump = derive2 { name="ggbump"; version="0.1.0"; sha256="15cnzv2q3gylkmd1zj044cp14ldnkc4fzwmxaqpc8cagwf9i10zk"; depends=[dplyr ggplot2 purrr tidyr]; }; ggcharts = derive2 { name="ggcharts"; version="0.1.0"; sha256="0prv174ifhj4chp23r4wwmgkhw2g8q8chm2jixzbks2z08xqvahs"; depends=[dplyr ggplot2 magrittr patchwork rlang]; }; ggconf = derive2 { name="ggconf"; version="0.1.3"; sha256="0g4xasqhdiqfqahakv6p5npl56f2iakx4bnc9v9zcjr077kdda4n"; depends=[ggplot2 rly]; }; ggcorrplot = derive2 { name="ggcorrplot"; version="0.1.3"; sha256="0hi9lz121ya1l2lbm7rqlxg6fs6bvxck396dngnidrhl5fvqb41b"; depends=[ggplot2 reshape2]; }; @@ -8351,7 +8369,7 @@ in with self; { gge = derive2 { name="gge"; version="1.4"; sha256="0plwk5j2n0309ghgn8r4ws3azwn7n4jb7yfykiiwwalhs3k05lsa"; depends=[nipals reshape2 rgl]; }; ggeasy = derive2 { name="ggeasy"; version="0.1.2"; sha256="06rynzv6vqngay5cjrig550dfada66075qs69l4rpfqci0vh05km"; depends=[ggplot2 rlang]; }; ggedit = derive2 { name="ggedit"; version="0.3.0"; sha256="1v9apfkm47jcqyhjrvv8ig09gz6zsss5xj5mrckfjybd5ca08rzn"; depends=[colourpicker dplyr ggplot2 magrittr miniUI plyr purrr rlang rstudioapi scales shiny shinyAce shinyBS tidyr]; }; - ggeffects = derive2 { name="ggeffects"; version="0.14.2"; sha256="1y3yfb07jrr6vkc8hk6rp52l70dj7042jvqgjzllslzy7hx2jhyw"; depends=[insight MASS sjlabelled]; }; + ggeffects = derive2 { name="ggeffects"; version="0.14.3"; sha256="06p80bgjhjknzlb4vs4n41i9n9vv5agncakl9f92zkaahgyzd6sd"; depends=[insight MASS sjlabelled]; }; ggenealogy = derive2 { name="ggenealogy"; version="1.0.1"; sha256="19six9ln1yaqv268abm9qvb61nl8zdz3gghwr8hmwsa94xwhzhkq"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; }; ggetho = derive2 { name="ggetho"; version="0.3.5"; sha256="1gwd4mkja2xypzm2c1w61lq126cn1fdcw8l8gkzsl2ljn2xd2phi"; depends=[behavr data_table ggplot2 labeling rlang scales stringr]; }; ggfan = derive2 { name="ggfan"; version="0.1.3"; sha256="1p3hbznpsaznlk0lnjyazc130www0p5919qplg3kspng7qh8p22w"; depends=[colorspace dplyr ggplot2 rstan]; }; @@ -8401,13 +8419,13 @@ in with self; { ggplotgui = derive2 { name="ggplotgui"; version="1.0.0"; sha256="1yfglg5438mwyml845isimzma5q6824x19jka509ng49bzmf1za0"; depends=[ggplot2 haven plotly RColorBrewer readr readxl shiny stringr]; }; ggplotify = derive2 { name="ggplotify"; version="0.0.5"; sha256="0pfnp4lrissf21z7867kdm6slr979kchyva8iaf83i1302kscph3"; depends=[ggplot2 gridGraphics rvcheck]; }; ggplotlyExtra = derive2 { name="ggplotlyExtra"; version="0.0.1"; sha256="1m2rhylpzj934gb50lxjp47rxz0kwl9i1p3n7w1rz4qi96pr5p1c"; depends=[ggplot2 plotly rlang]; }; - ggpmisc = derive2 { name="ggpmisc"; version="0.3.3"; sha256="1m5ajcy6l8gb2h2ph32ij9dgn6fqpcsf9nf5dr5gas7a15ihpcas"; depends=[broom dplyr ggplot2 gridExtra lubridate magrittr MASS plyr polynom rlang scales splus2R stringr tibble xts zoo]; }; + ggpmisc = derive2 { name="ggpmisc"; version="0.3.4"; sha256="0xc1yp0kphipq23ri4ij93garx1x2nrf4i0lhs6m10pp9yz7fbmj"; depends=[broom dplyr ggplot2 gridExtra lubridate magrittr MASS plyr polynom rlang scales splus2R stringr tibble xts zoo]; }; ggpointdensity = derive2 { name="ggpointdensity"; version="0.1.0"; sha256="0c9a14j3b0hvamqylhzldw2hjdxmfbllwahjkf3gg2rw337ld9iy"; depends=[ggplot2]; }; ggpol = derive2 { name="ggpol"; version="0.0.6"; sha256="1316g0y0i4nm4nsa422pbrv4w3g0rv1jxy6m7qasarq2mml9lxjs"; depends=[dplyr ggplot2 glue gtable plyr rlang tibble]; }; ggpolypath = derive2 { name="ggpolypath"; version="0.1.0"; sha256="0g9zfal3vqcx16fi4abxm6l5sam475lk1f6bdik487wc2v0dkq83"; depends=[ggplot2]; }; ggpubr = derive2 { name="ggpubr"; version="0.2.5"; sha256="0kb3hpmnhj4mkbx1kx0kv5y22himr8dijqx7ra0h8hi0pf2l2ha7"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif glue gridExtra magrittr polynom purrr rlang scales tidyr]; }; ggpval = derive2 { name="ggpval"; version="0.2.3"; sha256="04s0pwi0pljdd8r6wnjyb3i3php6qgvpc1mdvhywcx2i2zqip2qx"; depends=[data_table ggplot2]; }; - ggquickeda = derive2 { name="ggquickeda"; version="0.1.5"; sha256="13kszfsxnpbkcn3lnlcmrw5a0c3ny8gv9dn4ciphl40rk7qpi26v"; depends=[colourpicker dplyr DT Formula GGally ggplot2 ggpmisc ggpubr ggrepel ggstance gridExtra Hmisc lazyeval markdown plotly quantreg rlang scales shiny shinyjs stringr survival survminer table1 tidyr]; }; + ggquickeda = derive2 { name="ggquickeda"; version="0.1.6"; sha256="1yj1gfl7hvshjp5gqm1jgrfvnnvrn32zkv5d2il41hmp8hp71y2d"; depends=[colourpicker dplyr DT Formula GGally ggplot2 ggpmisc ggpubr ggrepel ggstance gridExtra Hmisc lazyeval markdown plotly quantreg rlang scales shiny shinyjqui shinyjs stringr survival survminer table1 tidyr]; }; ggquiver = derive2 { name="ggquiver"; version="0.2.0"; sha256="1hsayqxf4brck1rx97yyprw1axc83lksgf7mn3rh8hqx4h1f5f0f"; depends=[dplyr ggplot2]; }; ggraph = derive2 { name="ggraph"; version="2.0.2"; sha256="1ckq82hg52vr2wydkqv2wrppgjyvddd6bwqzrngqlm7j71xapjl0"; depends=[digest dplyr ggforce ggplot2 ggrepel graphlayouts gtable igraph MASS Rcpp rlang scales tidygraph viridis]; }; ggraptR = derive2 { name="ggraptR"; version="1.2"; sha256="18r70pnz7x8728lg447ds7swgk539gga9shax7rs4x56a710pf3q"; depends=[dplyr ggplot2 pacman purrr shiny]; }; @@ -8428,9 +8446,9 @@ in with self; { ggspectra = derive2 { name="ggspectra"; version="0.3.5"; sha256="0pvkh4cr9nyhhv9ikjs7nhjagal63k8zfbik28cmw2c2x31m019v"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands scales tidyr]; }; ggstance = derive2 { name="ggstance"; version="0.3.4"; sha256="0aqz3dn02cgij018a4sglqwrwr9dzzj12l8xr1064q7hfd4f64m1"; depends=[ggplot2 plyr rlang withr]; }; ggstar = derive2 { name="ggstar"; version="0.0.4"; sha256="02mvbp3pdx90b36nwpm975h0c11vza9177h3pym9nqxyx2dp72qa"; depends=[ggplot2 gridExtra scales]; }; - ggstatsplot = derive2 { name="ggstatsplot"; version="0.3.1"; sha256="05ily9798akg53w1k0sr9paizmz121y6acc74pghi09x9xdv3lbm"; depends=[broomExtra cowplot dplyr ggcorrplot ggExtra ggplot2 ggrepel ggsignif groupedstats insight ipmisc pairwiseComparisons paletteer purrr rlang statsExpressions tidyr]; }; + ggstatsplot = derive2 { name="ggstatsplot"; version="0.4.0"; sha256="01hyrhpbz5ggpy7r26z9dgfc56972kzj8x8awvsr634l522lwa7g"; depends=[broomExtra correlation cowplot dplyr ggcorrplot ggExtra ggplot2 ggrepel ggsignif groupedstats insight ipmisc pairwiseComparisons paletteer purrr rlang statsExpressions tidyr]; }; ggswissmaps = derive2 { name="ggswissmaps"; version="0.1.1"; sha256="0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4"; depends=[ggplot2]; }; - ggtern = derive2 { name="ggtern"; version="3.1.0"; sha256="1fhs5s3sxhb46abzni7cyymyknk9z7ff8fanln41pkih76s5i18j"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; }; + ggtern = derive2 { name="ggtern"; version="3.3.0"; sha256="12lxmql9zspglp0baqp419l0vgilrf8lyxsza142bfyvmdbhh6d3"; depends=[compositions ggplot2 gridExtra gtable hexbin latex2exp lattice MASS plyr proto scales]; }; ggthemes = derive2 { name="ggthemes"; version="4.2.0"; sha256="0rrkzfggc1nlda1w1lbqdycx6nawxbkac1szhvkwrqlzh6agxcsv"; depends=[ggplot2 purrr scales stringr tibble]; }; ggupset = derive2 { name="ggupset"; version="0.2.1"; sha256="1hqd1csli8iifxdghkvbyrjal7h4dd92ya287llaa2v4wdsqa1hm"; depends=[ggplot2 gtable rlang scales tibble]; }; ggversa = derive2 { name="ggversa"; version="0.0.1"; sha256="0xqn8iznrm8q30pxwka88wi1z7lndi6lm12rq6ngcaxf294fbz01"; depends=[]; }; @@ -8438,9 +8456,9 @@ in with self; { ggvoronoi = derive2 { name="ggvoronoi"; version="0.8.3"; sha256="04dv33vnip0rrli1diq43v7vhr86bmxjdyxjbxz5x4371kbb312j"; depends=[deldir ggplot2 raster rgeos sp]; }; ggwordcloud = derive2 { name="ggwordcloud"; version="0.5.0"; sha256="0mr92738s3j9wm6mkr5hd2flqsqw3vfjifv3fajsygysbwrl8dn8"; depends=[colorspace ggplot2 png Rcpp scales]; }; gh = derive2 { name="gh"; version="1.1.0"; sha256="1bc9bn1078s664hc806dh0y1ncxif77q479rfmxfir9z7hwaz7yy"; depends=[cli httr ini jsonlite]; }; - ghibli = derive2 { name="ghibli"; version="0.3.1"; sha256="1wnz26n0a3pgzigb2vp08v7swk061whi2zvfm6bih0aniqv5n7ml"; depends=[]; }; + ghibli = derive2 { name="ghibli"; version="0.3.2"; sha256="0762dy3x7w0q1swag2lh33cpqdr9bbqw0963ymdpnchawdh5m50z"; depends=[prismatic]; }; ghql = derive2 { name="ghql"; version="0.1.0"; sha256="19awg98r2hwwwwrwh0166y8ij1clf58vrf02i8fhhfzddx3an6bz"; depends=[crul graphql jsonlite R6]; }; - ghyp = derive2 { name="ghyp"; version="1.5.9"; sha256="1lvx8jq0gjz9398nxkra0pq3q2cl4zbnggj4z4pqp3p6dahb0364"; depends=[MASS numDeriv]; }; + ghyp = derive2 { name="ghyp"; version="1.6.0"; sha256="10v35slafbnxhjbv30vi784zw3jp1zaz4pp65jb9nw4f0vch3anc"; depends=[MASS numDeriv]; }; gibble = derive2 { name="gibble"; version="0.3.0"; sha256="19sj32jbq12a8zf03a39yqj8jln53nhb4b2v3khbq60nr9bxlm1r"; depends=[dplyr rlang tibble]; }; gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; }; gifski = derive2 { name="gifski"; version="0.8.6"; sha256="00w4bzp0rrp4isy1rnxs6g1q07r3wndadk3mqdrxk2wxi7jmghna"; depends=[]; }; @@ -8489,7 +8507,6 @@ in with self; { glmglrt = derive2 { name="glmglrt"; version="0.1.0"; sha256="0y3bwf6lg6wh2kq5p4flmvnc15c87w4xgxb0qnbvwmdnabsjd7zh"; depends=[MASS parameters]; }; glmgraph = derive2 { name="glmgraph"; version="1.0.3"; sha256="16sq6i7kbw20nvwikpa02z3pb7wqw3270j6ss7f8sgf548skhmx0"; depends=[Rcpp RcppArmadillo]; }; glmlep = derive2 { name="glmlep"; version="0.2"; sha256="0rq2vxbr732r725pn8qdvppxcrhjhyvlr550svfgy1inq985c1w4"; depends=[]; }; - glmm = derive2 { name="glmm"; version="1.3.0"; sha256="088m626c2f75ij457mskdyi927y6g01m5rgfsjaxpm7xbywk51sw"; depends=[doParallel foreach itertools Matrix mvtnorm trust]; }; glmmEP = derive2 { name="glmmEP"; version="1.0-3.1"; sha256="0fql85m0mxn58jh3mgrcw56bb4dx7amrz39ngqrljwi5pv5i7aj4"; depends=[lme4 matrixcalc]; }; glmmLasso = derive2 { name="glmmLasso"; version="1.5.1"; sha256="1az9vdnyqyrfn1q7zrn6x4ywx77b0vg65cni45x37b0ybkwpis39"; depends=[Matrix minqa]; }; glmmML = derive2 { name="glmmML"; version="1.1.0"; sha256="121iclp86nfm9mybvfwascs937i0z2mbv982hn894q6g7jkqiw1l"; depends=[]; }; @@ -8557,7 +8574,7 @@ in with self; { googleCloudStorageR = derive2 { name="googleCloudStorageR"; version="0.5.1"; sha256="0sd6ca1ksv22avr5rcvkf5089f9igb8gqa83kidlc4xklaj6g92m"; depends=[assertthat curl googleAuthR httr jsonlite openssl yaml zip]; }; googleCloudVisionR = derive2 { name="googleCloudVisionR"; version="0.2.0"; sha256="1n4gkmnwp9wadxz1izggxnpcpm4bz3imhq5y3i2szr8zwafcqqjv"; depends=[data_table glue googleAuthR jsonlite purrr]; }; googleComputeEngineR = derive2 { name="googleComputeEngineR"; version="0.3.0"; sha256="1s0qvnijzkja645lim373swk815n3s1292q6sk3q36ss70q42cfg"; depends=[assertthat future googleAuthR httr jsonlite]; }; - googleLanguageR = derive2 { name="googleLanguageR"; version="0.2.0"; sha256="1l0gnynild95k9fw1d398zd4dkws97p13vvfv6jaklqj0xmh9ib8"; depends=[assertthat base64enc googleAuthR jsonlite magrittr purrr tibble]; }; + googleLanguageR = derive2 { name="googleLanguageR"; version="0.3.0"; sha256="0lm50g3gshp18nvygi6is2rayzhcx0rw2rvb4lvm0jlx5m96xgxb"; depends=[assertthat base64enc googleAuthR jsonlite magrittr purrr tibble]; }; googlePolylines = derive2 { name="googlePolylines"; version="0.7.2"; sha256="0czfsmf8gv38g950l9xkk67q9v53pk9xk9yr2flbdpm8nlrdpjz7"; depends=[BH Rcpp]; }; googlePrintr = derive2 { name="googlePrintr"; version="0.0.1"; sha256="19rm78x8qd61ilc6h1kn3dw63m6dfsckqkd3n76krvi0akgl72w5"; depends=[googleAuthR httr jsonlite]; }; googlePublicData = derive2 { name="googlePublicData"; version="0.16.1"; sha256="15hyslpqvncg21q581h061rfyg99y8lavqw1x8hzl7xzd49bn9r5"; depends=[readxl XML]; }; @@ -8571,11 +8588,11 @@ in with self; { googleway = derive2 { name="googleway"; version="2.7.1"; sha256="0axpr81p3gdp1nmfn000lk288sdn8z5qmzjvagdxqn5j44hq6sj1"; depends=[curl googlePolylines htmltools htmlwidgets jpeg jqr jsonlite magrittr scales shiny viridisLite]; }; goric = derive2 { name="goric"; version="1.1-0"; sha256="1smjq9vljszgngs5i6x55jwg0imzc5gsfdqxzcs4541fp3pvk999"; depends=[MASS Matrix mvtnorm nlme quadprog]; }; gorica = derive2 { name="gorica"; version="0.1.0"; sha256="09b5i6r2s449gvk0vagvf7kd6y0pgr4cz7hdwplq01x246bhjs6q"; depends=[bain lavaan lme4 MASS mvtnorm quadprog]; }; + gotop = derive2 { name="gotop"; version="0.1.0"; sha256="1gak2yqj82d8h34mksy8ii28n7ga0qfi3709gc1xpg7ax1bgp83h"; depends=[htmltools jsonlite rmarkdown]; }; govStatJPN = derive2 { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; }; govdown = derive2 { name="govdown"; version="0.8.0"; sha256="0sfjpbpzpay9jw5fys8dkkfilw9r8yfj2xhb20pvjk3l6hrsjwvk"; depends=[rmarkdown]; }; gower = derive2 { name="gower"; version="0.2.1"; sha256="007ivwn1nagpi26qq8iih1c2l61c53glvv60n90hi341ry8vwgxg"; depends=[]; }; - gpDDE = derive2 { name="gpDDE"; version="0.8.2"; sha256="100g2f8zlpbwxb46h62pgvidll8aflz1zl4inyh8dml6vhm9pilp"; depends=[CollocInfer deSolve fda forecast lars limSolve MASS nnls penalized trustOptim TSA]; }; - gpairs = derive2 { name="gpairs"; version="1.2"; sha256="09mkdbs9hklxnmqcsnf65s3dfsfcr7kppp6zxj08v5hxym1gpz3l"; depends=[barcode colorspace lattice MASS vcd]; }; + gpairs = derive2 { name="gpairs"; version="1.3.3"; sha256="08m1ydrr239vnhjbl47mng3i2w9bqmd8fijrwsraq5ysvn826n27"; depends=[barcode colorspace lattice MASS vcd]; }; gpclib = derive2 { name="gpclib"; version="1.5-6"; sha256="11jjgg74l8hy9jz4jylhriqnzv8jcf12y1bkx22v29z3fhgkwkps"; depends=[]; }; gpg = derive2 { name="gpg"; version="1.2.2"; sha256="1qc7w4d6frp0j4yk0q7slkj1mps80bv78lixcpw1shgx48rp41kh"; depends=[askpass curl]; }; gpk = derive2 { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; }; @@ -8583,7 +8600,7 @@ in with self; { gplots = derive2 { name="gplots"; version="3.0.3"; sha256="0hs6mk48i9yd43rg9wfjc2nxsjjwrnpifxqvxkv8ah18kvpd6xnp"; depends=[caTools gdata gtools KernSmooth]; }; gpmap = derive2 { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[foreach ggplot2 isotone plyr]; }; gppm = derive2 { name="gppm"; version="0.2.0"; sha256="1n9is3xj52lsck2fiy9j320p2ca6ib36s251i7g3iz99a77b0ahh"; depends=[ggplot2 ggthemes MASS mvtnorm Rcpp rstan]; }; - gprofiler2 = derive2 { name="gprofiler2"; version="0.1.8"; sha256="0xa2r40alsj9d1kgkchli7p9wcffbjqbz16f8crribgl47zwlvxc"; depends=[crosstalk dplyr ggplot2 gridExtra jsonlite plotly plyr RCurl tidyr viridisLite]; }; + gprofiler2 = derive2 { name="gprofiler2"; version="0.1.9"; sha256="112hmmvdwg8xz90w1bsbzc55y4xi9jj4dqy0q4bsgp49x58r92rb"; depends=[crosstalk dplyr ggplot2 gridExtra jsonlite plotly RCurl tidyr viridisLite]; }; gptk = derive2 { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[fields Matrix]; }; gpuR = derive2 { name="gpuR"; version="2.0.3"; sha256="1afbnrnk0hrsd3qa7gh269wxn1maq7dpi6wpjhhbp2gwr6100vqy"; depends=[assertive BH Rcpp RcppEigen RViennaCL]; }; gqlr = derive2 { name="gqlr"; version="0.0.2"; sha256="0gzhqyrbnz3qjzkr4slryrlfhlaxm474y9fahlj0sb0hvcx68pxj"; depends=[graphql jsonlite magrittr pryr R6]; }; @@ -8606,7 +8623,7 @@ in with self; { grapherator = derive2 { name="grapherator"; version="1.0.0"; sha256="071by9b8figbsf4g0f8a8mgcdksjksc57mnlgggilw7py1yjnjlh"; depends=[BBmisc checkmate deldir ggplot2 lhs reshape2 vegan]; }; graphframes = derive2 { name="graphframes"; version="0.1.2"; sha256="1bv7d0sggwab4rd486ayw9gkb5ja5p5fin5pn92xnrmz8cgwsfxq"; depends=[forge sparklyr tibble]; }; graphicalExtremes = derive2 { name="graphicalExtremes"; version="0.1.0"; sha256="1cc4xcb72yci2gq2zn3g1nh3ba802anpymm0hajdbz3kb0wz1gyn"; depends=[igraph matrixcalc mvtnorm Rdpack]; }; - graphicalVAR = derive2 { name="graphicalVAR"; version="0.2.2"; sha256="1jzhqbdylpzc8d28vz2k34i9dpxx5x34bgvx73z8wjglnn6j27b8"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; }; + graphicalVAR = derive2 { name="graphicalVAR"; version="0.2.3"; sha256="1xd98irbh67a7vbj6a4arl51dnkj5c0c1mcmh1c1hsac8mdj29w0"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; }; graphicsQC = derive2 { name="graphicsQC"; version="1.0-8"; sha256="12vg93xfmkv73i19vkb10q2qngmsxd3y42z3l6izdywbdc3cdfkg"; depends=[XML]; }; graphkernels = derive2 { name="graphkernels"; version="1.6"; sha256="1gn3ihqz7m0rdvvc2fp7hsgq583wh5cnz7200a2ff89xc04zs3dc"; depends=[igraph Rcpp RcppEigen]; }; graphlayouts = derive2 { name="graphlayouts"; version="0.6.0"; sha256="1la016m37kp79zk8p1yx9kaha8y6d4w52w39h0mzv1mfsi6d75w0"; depends=[igraph Rcpp RcppArmadillo]; }; @@ -8647,6 +8664,7 @@ in with self; { gromovlab = derive2 { name="gromovlab"; version="0.7-6"; sha256="02s7x23610dbpmrqh7pimspa10v3fnmj48fwmh0a6igd74rmj2mg"; depends=[ape cluster glpkAPI igraph quadprog]; }; groupICA = derive2 { name="groupICA"; version="0.1.1"; sha256="1wl828ligvvw55xic383gdn7aq4mbwsnkl4ym6f71jn5g3p36d0i"; depends=[MASS]; }; groupRemMap = derive2 { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; }; + groupWQS = derive2 { name="groupWQS"; version="0.0.1"; sha256="1009lw80knvspphvzz3jhclyflm9s300n2048gb7lrrnam657016"; depends=[glm2 Rsolnp]; }; groupdata2 = derive2 { name="groupdata2"; version="1.2.0"; sha256="119ianzcv5dwvdyfxmgm7qgv99zbanm1ikal0rxc70c5n5lagv83"; depends=[checkmate dplyr lifecycle numbers plyr rlang tibble]; }; grouped = derive2 { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; }; groupedSurv = derive2 { name="groupedSurv"; version="1.0.4.1"; sha256="1kapz07hswpcvm9mmgc06l71f7ymx7aq816mzwca6cvccvqnrl5n"; depends=[BH doParallel foreach qvalue Rcpp RcppEigen]; }; @@ -8660,7 +8678,7 @@ in with self; { growthmodels = derive2 { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; }; growthrate = derive2 { name="growthrate"; version="1.3"; sha256="1ak3yqlm7dnkdjlmikwa57qnf7yd9n1ixz36gv3shr252750x9cd"; depends=[clime Matrix mvtnorm]; }; growthrates = derive2 { name="growthrates"; version="0.8.1"; sha256="1ivids4qfyhi3k5l6mvi6bhajnbxhiqmm4qdcmmfrmzs8c59cvvm"; depends=[deSolve FME lattice]; }; - grpSLOPE = derive2 { name="grpSLOPE"; version="0.2.1"; sha256="1r9irf83f7szhkdqis2rakil8fsr3rqsfrj4dmbg3r3rnr8wl8nh"; depends=[SLOPE]; }; + grpSLOPE = derive2 { name="grpSLOPE"; version="0.3.0"; sha256="0v20v3rdjmz517rl86nkrsaa1dl2p49kdkgk7ynv92p2ib37wwga"; depends=[Rcpp]; }; grplasso = derive2 { name="grplasso"; version="0.4-6"; sha256="0xr6plgnc3lp93rd4jk4dqjix8kgl8s2b68fh41k6jwd5y8d7pks"; depends=[]; }; grplassocat = derive2 { name="grplassocat"; version="1.0"; sha256="0pi5vq7yqg0ha91y6296ckshxyq3135cg6zcs9x6xba5m5024k4p"; depends=[grplasso]; }; grpreg = derive2 { name="grpreg"; version="3.2.2"; sha256="12432rdyv6b837n3b6kwjrqsmx7bs6qdmyz02x4l956pwmp5g7z5"; depends=[Matrix]; }; @@ -8675,7 +8693,7 @@ in with self; { gscaLCA = derive2 { name="gscaLCA"; version="0.0.2"; sha256="0s6rnyd632xq04pnyq1j3571qv7j5bzxir2nhk5jk9i8myf9fc9k"; depends=[devtools doSNOW fastDummies fclust foreach ggplot2 gridExtra MASS progress psych stringr]; }; gscounts = derive2 { name="gscounts"; version="0.1-3"; sha256="1xcsvnam858l9am30mmqb6m0vcflijhli22ix8g56rcvfsh208q1"; depends=[Rcpp]; }; gset = derive2 { name="gset"; version="1.1.0"; sha256="1gingqw6la8n7mnl47wpz9sicxca4zi2m8p35n6cnihrniibhajc"; depends=[Hmisc MCMCpack mvtnorm]; }; - gsheet = derive2 { name="gsheet"; version="0.4.2"; sha256="1mfpg91855qg0bi6wk0wy58b58lm06jw9fqdl6psqdvnmaf7n2w5"; depends=[httr stringr]; }; + gsheet = derive2 { name="gsheet"; version="0.4.5"; sha256="0b8q44cqkjfy6vnffm94czq4ag8xfbxik52026ahq95kcf9v2j91"; depends=[httr stringr]; }; gskat = derive2 { name="gskat"; version="1.0"; sha256="19mbif7wr88vk5wlc7m2l4xghjmfj2qd3s8yvjlkawbnjk8x6ib0"; depends=[CompQuadForm e1071 gee geepack Matrix]; }; gsl = derive2 { name="gsl"; version="2.1-6"; sha256="0p4rh7npp6qbfc5sxjq86xjn7c9ivf3pd60qf1hldwckjqin7m7m"; depends=[]; }; gsloid = derive2 { name="gsloid"; version="0.1.0"; sha256="1ma5si86ynfsis0pnw8hyv6xc4frbkhy5ks03mr0z16gasffkycg"; depends=[]; }; @@ -8693,13 +8711,13 @@ in with self; { gtable = derive2 { name="gtable"; version="0.3.0"; sha256="1lyncxf2dqdjgw1071cn9c8zwzkz6sldnd5cgmicf70bc726qf7x"; depends=[]; }; gtcorr = derive2 { name="gtcorr"; version="0.2-1"; sha256="1n56zmyv58jwr95p453jb86j82pdnq57gfc8m15jndjc9p31zl0m"; depends=[]; }; gte = derive2 { name="gte"; version="1.2-2"; sha256="1x528iakyjhh4j92cgm6fr49a3rdi4cqy28qhsfr2dwvxzxchl6h"; depends=[survival]; }; - gtfs2gps = derive2 { name="gtfs2gps"; version="1.0-7"; sha256="1g0aswyp10d77agz62h2wa6s83bh255dv3ygbp1cplpa1r6szsp8"; depends=[data_table furrr future lwgeom magrittr pbapply Rcpp sf sfheaders units]; }; + gtfs2gps = derive2 { name="gtfs2gps"; version="1.1-0"; sha256="13y8nry300g0c98asmxpqbaz7vxwlqqfd9d12290i0fmnzl3kn2z"; depends=[data_table furrr future lwgeom magrittr pbapply raster Rcpp rgdal sf sfheaders sp units]; }; gtfsrouter = derive2 { name="gtfsrouter"; version="0.0.1"; sha256="0znr0hw6f8wxy3vj944lrlsb0a70w2p20gw50jr2ij9xikawh2ih"; depends=[data_table Rcpp]; }; gtheory = derive2 { name="gtheory"; version="0.1.2"; sha256="1xc1jl69z5csalqk3hx83s53awcl1fjq6p0x2pczhs7dsvwd6lks"; depends=[lme4]; }; gtools = derive2 { name="gtools"; version="3.8.2"; sha256="1pnwy412wvhhvnnx8qg6s9hrgcnsfhnfcpf2560ipipk845acfsh"; depends=[]; }; gtop = derive2 { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts lassoshooting quadprog]; }; gtrendsR = derive2 { name="gtrendsR"; version="1.4.4"; sha256="0b05m5jbgbhdjmwp89zaa276z1h2qib2h30msg69lhwbdcsva96q"; depends=[anytime curl ggplot2 jsonlite]; }; - gtsummary = derive2 { name="gtsummary"; version="1.2.6"; sha256="12ah610w1ry69rwlxdj3qq1hhcgsgmqq1wbh6bd6w48s389929y1"; depends=[broom broom_mixed crayon dplyr forcats glue knitr lifecycle magrittr purrr rlang stringr survival tibble tidyr tidyselect usethis]; }; + gtsummary = derive2 { name="gtsummary"; version="1.3.0"; sha256="0gwxpzvzdz0c7akidfgjbm44j4qx5yhh9009fl7qf2547380fsd7"; depends=[broom broom_mixed crayon dplyr forcats glue gt knitr lifecycle magrittr purrr rlang stringr survival tibble tidyr tidyselect usethis]; }; guardianapi = derive2 { name="guardianapi"; version="0.1.1"; sha256="17xmmr6pfzhdnmf45jzvk84gbfnmlw1qfv1gqjaw85vgm8b6jn6l"; depends=[dplyr httr jsonlite rlang tibble]; }; guess = derive2 { name="guess"; version="0.1"; sha256="198pxi0yipgm9wccpj3y4a0gkibhyxcmb7v5dz7ipzrk44ha5g6j"; depends=[Rsolnp]; }; guf = derive2 { name="guf"; version="1.0.2"; sha256="1dfmja2da211pcid4hr7x9q0sgz37756rpykm1ax862avdl8hsmc"; depends=[]; }; @@ -8708,7 +8726,7 @@ in with self; { gunsales = derive2 { name="gunsales"; version="0.1.2"; sha256="02vz16lhym72vvf48yai1g371wygdlmi63a6ylc147l0b69jgw31"; depends=[data_table dplyr ggplot2 seasonal x13binary zoo]; }; gustave = derive2 { name="gustave"; version="0.4.1"; sha256="1sdfx3zmnamdwgnyvs3rn38wmwiyww1a620jyfc984b9r2zqvd1w"; depends=[Matrix]; }; gutenbergr = derive2 { name="gutenbergr"; version="0.1.5"; sha256="1c6n2vj38srqmlcl0d2yp749rhn9n5mmz31x98fij4x55km53sci"; depends=[dplyr lazyeval purrr readr stringr urltools]; }; - gvc = derive2 { name="gvc"; version="0.5.2"; sha256="0cfvli6ap5kw3agv94d7g7rhmlxd66yyngc7c9pl4fsxf7sm6nx4"; depends=[decompr diagonals]; }; + gvc = derive2 { name="gvc"; version="5.2.0"; sha256="15z4r8xkz0alabh3z278hylz042f2r5cqdllc5n3hfx5q3ch19xx"; depends=[decompr diagonals]; }; gvcR = derive2 { name="gvcR"; version="0.1.0"; sha256="0r54924b9a65k11p8y3p7jxbvmpb7s7vs87v65hhl98gxacj5hk8"; depends=[dplyr eda4treeR lme4 magrittr]; }; gvcm_cat = derive2 { name="gvcm.cat"; version="1.9"; sha256="1kwfcmnl1ivv1lh3zxccwls2xfyx3l8v71ngc0bg6441i81d4xp5"; depends=[MASS Matrix mgcv]; }; gvlma = derive2 { name="gvlma"; version="1.0.0.3"; sha256="16dhd407bwjs91c3p9kk43646197s7n9vbyghxb4ckrpv3fsaxp0"; depends=[]; }; @@ -8720,7 +8738,7 @@ in with self; { gwrr = derive2 { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; }; gwsem = derive2 { name="gwsem"; version="0.1.17"; sha256="1f2hym3md1agq2ml7f2v1dkb308iy1rl68c12f7n3ycsw0ql70ix"; depends=[BH data_table lifecycle OpenMx qqman Rcpp]; }; gym = derive2 { name="gym"; version="0.1.0"; sha256="0vcwzgawqwjsf65hr1mbjkz3px8zsibfkn42jpsg39n13jpfjq8v"; depends=[httr jsonlite]; }; - h2o = derive2 { name="h2o"; version="3.28.0.4"; sha256="1nsbw4fbwizj30y0qvw8ln078ayaisl4zydjx9917hlsbc8wc3aq"; depends=[jsonlite RCurl]; }; + h2o = derive2 { name="h2o"; version="3.30.0.1"; sha256="1xdhd0h0hncg7s5nsrb97arqiyd9r3cxv1in36lx7pyplxcfy4fb"; depends=[jsonlite RCurl]; }; h2o4gpu = derive2 { name="h2o4gpu"; version="0.2.0"; sha256="06d2rrr27xvnsai6zjiaiw0jjfzdza1cc39c03d6pjkvnh0mqh2c"; depends=[magrittr reticulate]; }; hBayesDM = derive2 { name="hBayesDM"; version="1.0.2"; sha256="04p4d0hy2l6bmxyh2k5q0g19b7fbpsl9frmcvrf5rxkaasxyxwn6"; depends=[BH data_table ggplot2 loo Rcpp RcppEigen rstan StanHeaders]; }; hIRT = derive2 { name="hIRT"; version="0.3.0"; sha256="0s0i6p9iv0yv0l15dnwkpcmc91751jyjs1y1nz671lz6jpb8rz5c"; depends=[ltm Matrix pryr rms]; }; @@ -8801,7 +8819,7 @@ in with self; { heavy = derive2 { name="heavy"; version="0.38.196"; sha256="05k788ynw9fhhmjydzp8dbk1vhl44j2rz2shqwn02i40jmwdvwrk"; depends=[]; }; heddlr = derive2 { name="heddlr"; version="0.6.0"; sha256="0ixmcgvfbq4hi3wv1fyzpwacmxmixsw5yq6mq5xygk6ji03m1v23"; depends=[rlang utf8 yaml]; }; hedgehog = derive2 { name="hedgehog"; version="0.1"; sha256="1mvjnm2zlc4pvw9vnhxr0dj1g1sfqvlrnnhcipzfbvr147yan9l5"; depends=[rlang testthat]; }; - heemod = derive2 { name="heemod"; version="0.11.0"; sha256="0zzjq4cmyr25p4x91jw542jiqmds6qikbp8gyix34dcmk765drnk"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr rlang tibble]; }; + heemod = derive2 { name="heemod"; version="0.12.0"; sha256="14fa2bcmzxymnis6kj46phbcbxz2a9i9p8cqpq6s6c6hzj5g9fw6"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr purrr rlang tibble]; }; heims = derive2 { name="heims"; version="0.4.0"; sha256="0vnq31jwn09grni4gdhf1hzd87b62as4f65b2qw7ky6mi38ahr5d"; depends=[bit64 data_table fastmatch hutils lubridate magrittr]; }; helda = derive2 { name="helda"; version="1.0.1"; sha256="1qfnqa94csq7c67prpmyvnkkzbylv4cq4zsmici9c19s9yw4kf76"; depends=[dplyr ggplot2 rlang sqldf stringr]; }; helixvis = derive2 { name="helixvis"; version="1.0.1"; sha256="113rnpnrcnw18ks78fgq79zdrw3kmpzpimlc45gvj0za2fbyci3p"; depends=[ggforce ggplot2 rlang]; }; @@ -8811,7 +8829,7 @@ in with self; { helsinki = derive2 { name="helsinki"; version="0.9.29"; sha256="0bn5iyxjn9qs6f0dmhv51ssayywbx1rayh80zbzk0gsm94nhs0d9"; depends=[maptools RCurl rjson sp]; }; heplots = derive2 { name="heplots"; version="1.3-5"; sha256="1vyhfkp66gi17jni3gsbv9kn1s0n00qigr13q8xbzbgylz5jjiln"; depends=[car MASS]; }; here = derive2 { name="here"; version="0.1"; sha256="1vb5dxqdpimy51q1gjsypyq14p2hhvj7wsvh6g35pj1g03cyg9av"; depends=[rprojroot]; }; - hereR = derive2 { name="hereR"; version="0.3.2"; sha256="1kjz4g616i572n0kanwg1hbc5x9kmhwijpbm4jmyspvj4b2hlsxi"; depends=[curl data_table jsonlite lwgeom sf stringr]; }; + hereR = derive2 { name="hereR"; version="0.3.3"; sha256="0z8w50cjz2zivdlbxipn8av055ssgrv9077v4413xkjgv4c000f1"; depends=[curl data_table jsonlite lwgeom sf stringr]; }; heritability = derive2 { name="heritability"; version="1.3"; sha256="0a0pw8hppkgypl4jaa38hks9nxfwz2zbsd4w6w40j1hxlyy4km8m"; depends=[MASS]; }; hermite = derive2 { name="hermite"; version="1.1.2"; sha256="0j9s7ayvbvmgwybrvf703b72qbn8gskb105pis19ig2sslllzda3"; depends=[maxLik]; }; hero = derive2 { name="hero"; version="0.4.7"; sha256="129v2pjbxm5aalr5lfx0kh20rhwksnb80pc459pxg0xkwxvy1l3d"; depends=[fields Matrix optimx pbapply rgeos sp]; }; @@ -8849,9 +8867,9 @@ in with self; { highSCREEN = derive2 { name="highSCREEN"; version="0.3"; sha256="179l82n7l7dfn40k6zgigw56ggwqyi34gllc2wvcw3yvfnd3l7s4"; depends=[gplots]; }; highTtest = derive2 { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqmfcg4536lhyn5p6w88sq1vj74qr5wzydga1"; depends=[]; }; highcharter = derive2 { name="highcharter"; version="0.7.0"; sha256="0qfv25dqr7l54jq3vrnwphsj7wzk0an3vfx1zik36wi05yf2w8br"; depends=[assertthat broom crosstalk dplyr htmltools htmlwidgets igraph jsonlite lubridate magrittr purrr quantmod rlang rlist stringr tibble tidyr whisker xts yaml zoo]; }; - highfrequency = derive2 { name="highfrequency"; version="0.6.4"; sha256="0ikxrjzssqcv6r96d86apiwsizcycj49jlzv4i0kxwfyxvvchkvq"; depends=[cubature data_table lubridate mvtnorm Rcpp RcppArmadillo RcppRoll readr robustbase xts zoo]; }; + highfrequency = derive2 { name="highfrequency"; version="0.6.5"; sha256="1j7wn75xql6pw7inmvh9729l320wd3ss68jhz7y8cp4c60w2mkww"; depends=[cubature data_table lubridate mvtnorm Rcpp RcppArmadillo RcppRoll readr robustbase xts zoo]; }; highlight = derive2 { name="highlight"; version="0.5.0"; sha256="1shar4y07wyixg0ichdrn2xhgwkl3mv2pxkalqzisc69w605b3hf"; depends=[]; }; - highlightHTML = derive2 { name="highlightHTML"; version="0.2.4"; sha256="0mww4n8g8d3mmmic56wcchg2k09fhf1i4ndjk6q4ic7mvxbcpcc8"; depends=[]; }; + highlightHTML = derive2 { name="highlightHTML"; version="0.2.5"; sha256="0j3zrvil7k5wfsbgfj2b4nbx77qsj3b4makv5angcf8s59p7q80r"; depends=[]; }; highmean = derive2 { name="highmean"; version="3.0"; sha256="1lq7z0l1737j4wvsy7951405afylyywp7vf2i7girzh459fdfzpc"; depends=[MASS mnormt mvtnorm]; }; highr = derive2 { name="highr"; version="0.8"; sha256="0my6idnhmmgs4q1vs40y2lh56yij2p59mpwvm53wjs2zk6x1zl2b"; depends=[]; }; highriskzone = derive2 { name="highriskzone"; version="1.4.5"; sha256="09ad025ydpfsrkcfqsfm4cj6lk8shrdh6vyya7isqwrd5jfyf1qc"; depends=[deldir fields ks maps Matrix mvtnorm rgeos spatstat]; }; @@ -8881,6 +8899,7 @@ in with self; { hmi = derive2 { name="hmi"; version="0.9.17"; sha256="08cppa061xn13lyp7d9jsybn0cc6k2ffml79m5bp7fk11gzq18mb"; depends=[boot coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nlme nnet ordinal pbivnorm rlang tmvtnorm VGAM]; }; hmlasso = derive2 { name="hmlasso"; version="0.0.1"; sha256="0ydcyz9pw30ji8ghrvkgcbmp27d661vajl97b8cwis52605a3gfx"; depends=[BH MASS Matrix Rcpp RSpectra]; }; hmm_discnp = derive2 { name="hmm.discnp"; version="2.1-12"; sha256="1jxbwqh0cc0f07qza0kjbhh3zy7xlk5q7gb8078kprg37if1qd2p"; depends=[nnet]; }; + hmma = derive2 { name="hmma"; version="1.0.0"; sha256="1gpdq1pka9j0yvci791g74kgrvbz9x9gnw7irf0048msis0lqcv4"; depends=[bnlearn graph MCMCpack mhsmm Rgraphviz]; }; hmmm = derive2 { name="hmmm"; version="1.0-4"; sha256="1sbr85lcmcw3lv0ygqwfbarr91dp3br1xnlygy49145cvl93nfci"; depends=[MASS mvtnorm nleqslv quadprog]; }; hms = derive2 { name="hms"; version="0.5.3"; sha256="1baki0qw5ijgiflvsdvqj3apg4yanf12vx14kwbqdzk5rz46fasf"; depends=[pkgconfig rlang vctrs]; }; hmstimer = derive2 { name="hmstimer"; version="0.0.2"; sha256="0qv2pls6mplnv3mylbiwh83gnvq2qkdpnnjnxnhrgmwia9fapixs"; depends=[]; }; @@ -8914,10 +8933,10 @@ in with self; { hpoPlot = derive2 { name="hpoPlot"; version="2.4"; sha256="176bf93gjwbi2z7nz81w4aycwax6f7jxvs3236zrmf0f0f4m7bkc"; depends=[functional magrittr Rgraphviz]; }; hqmisc = derive2 { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; }; hqreg = derive2 { name="hqreg"; version="1.4"; sha256="1j6zp3rmpjx409vm7kq159mlawg87wsq0ypdkan34yxxv9py2jmi"; depends=[]; }; - hrIPW = derive2 { name="hrIPW"; version="0.1.2"; sha256="0bgcz4v9cj3aajcp25bv4g7magj54n86qy5nmgr6kqm8sspy260x"; depends=[survival]; }; + hrIPW = derive2 { name="hrIPW"; version="0.1.3"; sha256="1ns0mxkcfs2jva4wsbqkybgasgyxvxlcfxayky6lrfhic8jxvmg4"; depends=[survival]; }; hrbrthemes = derive2 { name="hrbrthemes"; version="0.8.0"; sha256="057h60b5p53dcyjyfwlgjc1ry968s9s64dw78p443w8717zk7zpc"; depends=[extrafont gdtools ggplot2 htmltools knitr magrittr rmarkdown scales]; }; hrcomprisk = derive2 { name="hrcomprisk"; version="0.1.1"; sha256="0w0ij2yqgg6gkn3pdaism1xqw3dfnm670j2pmsd85qk1ybxzq9l5"; depends=[survival]; }; - hscovar = derive2 { name="hscovar"; version="0.1.2"; sha256="1w6iz6z7zbk4wh5bjf6qhalngm30c7kdc1qkyjmnc1ajvzk1r992"; depends=[foreach Matrix rlist]; }; + hscovar = derive2 { name="hscovar"; version="0.2.1"; sha256="0cy3x96dmw6cbsrnl3h1npzhxqy8bqy2437kz06qi7d5hmi4q721"; depends=[foreach Matrix pwr rlist]; }; hsdar = derive2 { name="hsdar"; version="1.0.1"; sha256="1apcch51hagrbm7x3s7wl78bm2mpyxg4py7syz37b58r9dph1905"; depends=[caret raster rgdal signal]; }; hsicCCA = derive2 { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; }; hsm = derive2 { name="hsm"; version="0.2.0"; sha256="066shjikqrrkxpnra4zknax1a0sk5nx9ms1br58vwqqvqq479rym"; depends=[]; }; @@ -8937,7 +8956,7 @@ in with self; { httk = derive2 { name="httk"; version="2.0.1"; sha256="02msk6nb3sscww7pa68finfvpmrf8z4jsw08672q4qz50sjccjlp"; depends=[data_table deSolve magrittr msm mvtnorm purrr survey truncnorm]; }; httpRequest = derive2 { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; }; httpcache = derive2 { name="httpcache"; version="1.1.0"; sha256="11hdc1jj2jbgvsps1h55azq0cr2fl556k631ns9k0747sjfmy2k9"; depends=[digest httr]; }; - httpcode = derive2 { name="httpcode"; version="0.2.0"; sha256="06k853ihwzkcx4z3jzazpb03p91frqkwz18jy4fwr8j2nwyqbhgv"; depends=[]; }; + httpcode = derive2 { name="httpcode"; version="0.3.0"; sha256="0xig0rvc81hg7mw0iq9s0an1nw24fg0kfs2p2n6dzhwl9w506fjr"; depends=[]; }; httping = derive2 { name="httping"; version="0.2.0"; sha256="0hdcf51yak8yagy4xj9cyck934lgmvpkd08jvlql33ir5mqvvv3i"; depends=[httpcode httr jsonlite magrittr pryr]; }; httptest = derive2 { name="httptest"; version="3.3.0"; sha256="1xcq0siyjb17yggaycxgp3byi276vwfa71450zbbzcb8617wsapd"; depends=[curl digest httr jsonlite testthat]; }; httpuv = derive2 { name="httpuv"; version="1.5.2"; sha256="13ax0hs2lc39ilznh1zarwqdzahcbhb8adilrfik3xg0fkljpcwk"; depends=[BH later promises R6 Rcpp]; }; @@ -8956,11 +8975,12 @@ in with self; { hutilscpp = derive2 { name="hutilscpp"; version="0.3.0"; sha256="1x7h1fq6qyylda8k3a1v6s0cx7pf169k86akb6ccwgiikqqsp51h"; depends=[data_table hutils Rcpp]; }; huxtable = derive2 { name="huxtable"; version="4.7.1"; sha256="0nkx6kpvh4z0fby7cv9bvripkqdha4f4c893h53a543q0ap06pjh"; depends=[assertthat generics glue memoise rlang stringr tibble tidyselect]; }; hwde = derive2 { name="hwde"; version="0.67"; sha256="0wb2f9i5qi7w77ygh8bvydfpr7j5x8dyvnnhdkajaz0wdcpkyaqy"; depends=[]; }; + hwig = derive2 { name="hwig"; version="0.0.1"; sha256="0i9is1izwi82gcrngi1k6q6aq548rqpccvs3mp74jinqsw51czcf"; depends=[asnipe data_table spatsoc]; }; hwordcloud = derive2 { name="hwordcloud"; version="0.1.0"; sha256="0civbwv276lcwvfs4qzz14r8rk14kg1ml4zzhi3msnkkh29v70y2"; depends=[colourpicker htmlwidgets shiny wordcloud2]; }; hwriter = derive2 { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; }; hwwntest = derive2 { name="hwwntest"; version="1.3.1"; sha256="1mz5svx5vbisdl5wxdnwip13pq4slyigc7j52l526rr9n0l0pr5v"; depends=[polynom wavethresh]; }; hybridEnsemble = derive2 { name="hybridEnsemble"; version="1.0.0"; sha256="08y11cmlhnl456wxsvh3ll1f9ywkmgqjwlwr3v3qhm54nlanwvkr"; depends=[ada AUC e1071 FNN genalg GenSA glmnet kernelFactory NMOF nnet nnls pso quadprog randomForest reportr Rmalschains ROCR rotationForest rpart soma tabuSearch]; }; - hybridModels = derive2 { name="hybridModels"; version="0.3.5"; sha256="0bg065j3y3xwxlib9i78pa0ghlblyp4qq1kmh3j02w8xi00rnrs6"; depends=[doParallel foreach ggplot2 GillespieSSA reshape2 stringr]; }; + hybridModels = derive2 { name="hybridModels"; version="0.3.6"; sha256="15405qz4fnvid7ka1l694hcc7s6yv39ff62rsdl7jhzq468qkikj"; depends=[doParallel doRNG foreach ggplot2 GillespieSSA reshape2 stringr]; }; hydra = derive2 { name="hydra"; version="0.1.0"; sha256="0r3r8cds4h15narawxhzkrvgnf00vlgrgqdgnmbzjyyb1dmry8wn"; depends=[]; }; hydroApps = derive2 { name="hydroApps"; version="0.1-1"; sha256="1ycv7l2ywwnx2mgklg6rry7n24jyhi4spvp1xl345yvyn9kf15dz"; depends=[nsRFA]; }; hydroGOF = derive2 { name="hydroGOF"; version="0.4-0"; sha256="0fw8b66k7gdkdjxgmdpp3lk9d8p0wmlvhq2rkcvajjb5wd09f43a"; depends=[hydroTSM xts zoo]; }; @@ -8990,11 +9010,11 @@ in with self; { iAdapt = derive2 { name="iAdapt"; version="0.1.0"; sha256="0ykcvqm1aswc4iypapml22194nxi6mxvxipy6wj7l9g4cazfa8j8"; depends=[shiny shinydashboard]; }; iBATCGH = derive2 { name="iBATCGH"; version="1.3"; sha256="0pnkkabzi57czcwd9i15nwv8ggwvyxmvn1wam7yrrrbvmi17lmrm"; depends=[msm Rcpp RcppArmadillo]; }; iBST = derive2 { name="iBST"; version="1.0"; sha256="02p7lcr1wrf21v4568jc8hmjcijy3fnbv77s8nlhv2s4p0pgzh5x"; depends=[Rcpp rpart survival]; }; - iBreakDown = derive2 { name="iBreakDown"; version="1.0"; sha256="1pqw2hgxg96x3v9y7wf8m8n1czhlhyxcwpavj4vl0s95d1dzzpcj"; depends=[DALEX ggplot2]; }; + iBreakDown = derive2 { name="iBreakDown"; version="1.2.0"; sha256="0y4zjpyn8j76jrs5phjzs5lfq3lqjspmrwcksqv9wq0rbdgh14vk"; depends=[ggplot2]; }; iC10 = derive2 { name="iC10"; version="1.5"; sha256="1xq6xv582wxdb0nc2nia3q38155gx8z26idiqyx7h1rjb20hhwdl"; depends=[iC10TrainingData impute pamr]; }; iC10TrainingData = derive2 { name="iC10TrainingData"; version="1.3.1"; sha256="175ymib3h359296hk36psryksisipx63ybvacz8hys21irzx58j1"; depends=[]; }; iCARH = derive2 { name="iCARH"; version="2.0.1.1"; sha256="0722dfydq16vhdk7hrdwngkppq0g20ghak614jfnrfr6rnrn630s"; depends=[abind ggplot2 igraph KEGGgraph MASS Matrix mc2d RCurl reshape2 rstan]; }; - iCellR = derive2 { name="iCellR"; version="1.4.0"; sha256="1hrn6afhl4ggpz145l0wxnjy6jpfqjc09w0g0lws31l1hpzakrhs"; depends=[ape ggdendro ggplot2 ggpubr ggrepel gridExtra hdf5r Hmisc htmlwidgets knitr Matrix NbClust pheatmap plotly plyr progress RColorBrewer reshape Rtsne scatterplot3d shiny uwot]; }; + iCellR = derive2 { name="iCellR"; version="1.4.5"; sha256="1pw2pnpp2q2h8iipilbaw6mdm7dkgrw5p7ya1zap04m005jzvap0"; depends=[ape ggdendro ggplot2 ggpubr ggrepel gridExtra hdf5r Hmisc htmlwidgets igraph knitr Matrix NbClust pheatmap plotly plyr progress RColorBrewer reshape Rtsne scatterplot3d shiny uwot]; }; iCiteR = derive2 { name="iCiteR"; version="0.2.1"; sha256="0hbps2q5i7yj6zvqawlayhqqr5iv39yqc0xnk7fvra7rimzc1qid"; depends=[httr]; }; iClick = derive2 { name="iClick"; version="1.5"; sha256="0yq0r9nz1mf9ci6l30ylqxbgl8mf1ahyqzr7m6nks0ygxabipdnd"; depends=[boot car coefplot fBasics forecast lattice lmtest lubridate openair papeR rugarch sandwich timeDate timeSeries xts zoo]; }; iCluster = derive2 { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[caTools gdata gplots gtools lattice]; }; @@ -9021,7 +9041,7 @@ in with self; { iZID = derive2 { name="iZID"; version="0.0.1"; sha256="1jaqdh6i5xyfw4y2wd9qivzjklf4j2xxnya8ssn7rv5bz6misgcz"; depends=[doParallel extraDistr foreach rootSolve]; }; iadf = derive2 { name="iadf"; version="0.1.1"; sha256="0ys8rd05s0j6cs7snmp1car7lp7k4awvs8gnlqaw9zcd7w7k9r06"; depends=[dplR dplyr manipulate rlang tibble tidyr tidyselect]; }; iai = derive2 { name="iai"; version="1.2.0"; sha256="0v1xsnhx73ldpsbnki5g0q86dih1pcgb1f10mmq7dn47s2mm6zxg"; depends=[JuliaCall rlang stringr]; }; - iarm = derive2 { name="iarm"; version="0.3.0"; sha256="0v5zb2pgzqb9brmq0calmghq20i8w3wx147781v4f6ll0abkhvxx"; depends=[eRm PP psychotools vcdExtra]; }; + iarm = derive2 { name="iarm"; version="0.4.1"; sha256="1z0k970sk8qliknfsz88yij1aigf0dxk43h92iwg17xi64hvjs11"; depends=[eRm ggplot2 gridExtra Hmisc PP psychotools vcdExtra]; }; ibd = derive2 { name="ibd"; version="1.5"; sha256="0rxvy4hn4fpbv6y214ggkmgfvzwns5mkanp4h8201rjk3v84mk2r"; depends=[car emmeans lpSolve multcomp]; }; ibdreg = derive2 { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; }; ibeemd = derive2 { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[deldir fields rgeos sp spdep]; }; @@ -9037,11 +9057,9 @@ in with self; { icRSF = derive2 { name="icRSF"; version="1.2"; sha256="1a7046lspk70cvrvzwzhnqcmc3cqa5a9bmzlw012jvcn39m2ca3l"; depends=[icensmis Rcpp]; }; ica = derive2 { name="ica"; version="1.0-2"; sha256="0ya1nph1zwhad0bfz4yxs27kl45yk1dhnphdlrq34p8pqrpmj8g7"; depends=[]; }; ical = derive2 { name="ical"; version="0.1.6"; sha256="1raanaagas1c8w66d8s045z5ip1i97xca4233d55jk6cazv0mb1w"; depends=[V8]; }; - icamix = derive2 { name="icamix"; version="1.0.6"; sha256="0jys9r7wjxlwsq5rssih2lvsar1192w8vigdhhrcmf3d5z5ic1kp"; depends=[Rcpp RcppArmadillo]; }; icapca = derive2 { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; }; icarus = derive2 { name="icarus"; version="0.3.1"; sha256="0ipbhzvwdn1cnzgdw33cwv901768srxfi588bimjx2ssl80mqn3a"; depends=[]; }; iccbeta = derive2 { name="iccbeta"; version="1.2.0"; sha256="03ms1c8qpbgxabj3hh4n0gwcazw6cd0cvixck5rz8fkvj04xzjak"; depends=[lme4 Rcpp RcppArmadillo]; }; - icd = derive2 { name="icd"; version="4.0.6"; sha256="0zi56c6x2jy1yihrar6whhyb5csyhzwdxw0nr8c05xm28w1j6xwb"; depends=[rappdirs Rcpp RcppEigen]; }; icd_data = derive2 { name="icd.data"; version="1.0"; sha256="0cynr9327wfg88661w4hali48mb6ghyvlqgybsa38k9bbf57v8aa"; depends=[]; }; icdGLM = derive2 { name="icdGLM"; version="1.0.0"; sha256="1mh9kwn21n19v4lrmj33ghpna7dl66fx19gi6lcjanmrpzrkwdnz"; depends=[Matrix]; }; icemelt = derive2 { name="icemelt"; version="1.0"; sha256="13pjbyh2ggns36m8s43m2cb0kvisjlfxq75gqscldp75zjli2wi8"; depends=[survival]; }; @@ -9051,7 +9069,7 @@ in with self; { icesAdvice = derive2 { name="icesAdvice"; version="2.0-0"; sha256="0sx93fsx2srmynnvs3bjb525m9a5w70qr9lghmkqa07crd991vfr"; depends=[]; }; icesDatras = derive2 { name="icesDatras"; version="1.3-0"; sha256="0yaqlximxa3rcjxgrd0mii02mm9gpcxgw3i8pymp00bk8zixvj30"; depends=[]; }; icesSAG = derive2 { name="icesSAG"; version="1.3-6"; sha256="08nlsvs23j7ax03gwld3ycyvhfrhs70jdjif3562q1ysgvvkbf45"; depends=[httr icesVocab openssl png xml2]; }; - icesTAF = derive2 { name="icesTAF"; version="3.3-3"; sha256="1jah3f7hicw66rwa0jfpr489c81im3h4cjihmdmk4fgq2kjnrdyb"; depends=[bibtex lattice]; }; + icesTAF = derive2 { name="icesTAF"; version="3.4-0"; sha256="1gsqcwz547g04x7ixrf7yiy0xf9p61fw2j7dqyj3y4wmfwll9wgz"; depends=[bibtex lattice]; }; icesVocab = derive2 { name="icesVocab"; version="1.1-4"; sha256="0ydrxxmglgcsmjccamhfyw4cr2q583y4836v3wm2gxs5pcf9q86g"; depends=[XML]; }; icmm = derive2 { name="icmm"; version="1.1"; sha256="1w9f1rniz67rrvq0akc64s5433ddmr2cgbcljil4c58yyz8hinx8"; depends=[EbayesThresh]; }; icosa = derive2 { name="icosa"; version="0.10.0"; sha256="1vd1qn1070rml7mygj9k13b96zrc77bw90g8f44s7wmhabn6214q"; depends=[igraph Rcpp sp]; }; @@ -9063,6 +9081,7 @@ in with self; { idbg = derive2 { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; }; idbr = derive2 { name="idbr"; version="0.3"; sha256="02syk7fmif0xnddl8189vnl329r8mwl3iwv2rsf6cw7mwg30fhyw"; depends=[countrycode dplyr httr jsonlite]; }; ideamdb = derive2 { name="ideamdb"; version="0.0.9"; sha256="1f4dcv6c8ny7pik547f4840vhll26mzfcijnfsiqx31xhn0gsizd"; depends=[dplyr ggplot2 stringr tidyr]; }; + idefix = derive2 { name="idefix"; version="0.4.3"; sha256="1kpan1499n9paibrr5gc0n5s05ls64fx8raiwckc7hfzsnh1fb26"; depends=[dplyr MASS mlogit Rcpp RcppArmadillo Rdpack scales shiny tmvtnorm]; }; idem = derive2 { name="idem"; version="4.0"; sha256="0zgc6b5gzgm5dhjqk1vkm94khizc8sngn3igv23z1v18g73vdxhi"; depends=[BH Rcpp RcppEigen rstan rstantools sqldf StanHeaders survival]; }; idendr0 = derive2 { name="idendr0"; version="1.5.3"; sha256="11c12d166bp2i498d8y6ipg5jhz1xsdsrmnhjqnrqqzp9avvrsjp"; depends=[tkrplot]; }; identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; }; @@ -9075,7 +9094,6 @@ in with self; { idr = derive2 { name="idr"; version="1.2"; sha256="05nvgw1xdg670bsjjrxkgd1mrdkciccpw4krn0zcgdf2r21dzgwb"; depends=[]; }; ids = derive2 { name="ids"; version="1.0.1"; sha256="1s6ga94gds5ydr9f8qbjfgfpg2dvbnkcrlybqlb33hk3c0c2l8dn"; depends=[openssl uuid]; }; idx2r = derive2 { name="idx2r"; version="1.0.0"; sha256="14d3rasnf8mghwzpg6h4larybgy7drrv0jh71x28qwry49acsqyh"; depends=[]; }; - ie2misc = derive2 { name="ie2misc"; version="0.8.5"; sha256="1i59836a3kjsra5ibk66ic35yqk28p3biylall8gngjssiig92c1"; depends=[data_table gWidgets2 gWidgets2tcltk lubridate openxlsx qdap reader readxl stringi]; }; ieeeround = derive2 { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh"; depends=[]; }; iemisc = derive2 { name="iemisc"; version="0.9.8"; sha256="0xpgafv1zl3gxs3jydqni5icdz74n7f0bgbdvw8gykrr1a6rarln"; depends=[CHNOSZ data_table fpCompare gsubfn IAPWS95 iemiscdata pracma r_import rgdal sp stringi testit units zoo]; }; iemiscdata = derive2 { name="iemiscdata"; version="0.6.1"; sha256="0a9x90kisgmrka0frk9myb1qdq3nl092n78wrif31b42arifa8h9"; depends=[]; }; @@ -9104,7 +9122,7 @@ in with self; { imagerExtra = derive2 { name="imagerExtra"; version="1.3.2"; sha256="1f6mxfn7am4ph9acbbx53r4bk4vsm73p7arh8rvrsic9pgma3gqf"; depends=[fftwtools imager magrittr Rcpp]; }; imageviewer = derive2 { name="imageviewer"; version="0.1.0"; sha256="1rsrwy5v0gnsmbay1zqijhvll2l1bs844m52w65588j9nlx4fci9"; depends=[htmlwidgets]; }; imagine = derive2 { name="imagine"; version="1.5.3"; sha256="1ss0gm769s8cmma3hnah15vmc2c5wxn0l3s4vas7jbvkwi62am6h"; depends=[Rcpp]; }; - imbalance = derive2 { name="imbalance"; version="1.0.2"; sha256="1vkzxm8wb9g1mibnlp63gnky2gcgai5j09v63zki3jpxwxwli4nx"; depends=[bnlearn C50 FNN ggplot2 KernelKnn mvtnorm Rcpp RcppArmadillo smotefamily]; }; + imbalance = derive2 { name="imbalance"; version="1.0.2.1"; sha256="14f7p3x8818b1asfynp3w4sxdacsd14dzs7r166s1jdadwwfwi1s"; depends=[bnlearn C50 FNN ggplot2 KernelKnn mvtnorm Rcpp RcppArmadillo smotefamily]; }; imdbapi = derive2 { name="imdbapi"; version="0.1.0"; sha256="11v7c0s7qqf02b186md5lhgkgmywkn8lmmanlz3gfcxca26g047y"; depends=[dplyr httr stringr]; }; imfr = derive2 { name="imfr"; version="0.1.7"; sha256="1ch05d37gp0niml80k2apab1942aa05r77s52vgh2pfcx9kklv20"; depends=[dplyr httr jsonlite]; }; imgpalr = derive2 { name="imgpalr"; version="0.3.0"; sha256="1kb1ggrlkrh086nwq47sf2y20r7ydk4ww2j3gq0s4iz00aa34pxg"; depends=[downloader dplyr farver jpeg magrittr tibble]; }; @@ -9113,10 +9131,11 @@ in with self; { iml = derive2 { name="iml"; version="0.10.0"; sha256="0xm3q42qahq798ilgg050df0mahhbdfd3fx3i7cpx606h38si0x7"; depends=[checkmate data_table Formula future future_apply ggplot2 gridExtra Metrics prediction R6]; }; immer = derive2 { name="immer"; version="1.1-35"; sha256="1nmf9wxxyq3p8b5kikpsr8b0v4s84zjpahg1rxvcrhc8blg26hjq"; depends=[CDM coda MASS psychotools Rcpp RcppArmadillo sirt TAM]; }; immuneSIM = derive2 { name="immuneSIM"; version="0.8.7"; sha256="0brj12xnkzmn3n91vb39fq3q68wmzmwx9l38dl38yypp0l8pknjl"; depends=[Biostrings data_table ggplot2 ggthemes igraph Metrics plyr poweRlaw RColorBrewer repmis reshape2 stringdist stringr]; }; + imp4p = derive2 { name="imp4p"; version="0.9"; sha256="1z8q3h8smlnn3i7b0hpc360607ingqz4hblm93bmljri2k1amcvw"; depends=[Iso missForest missMDA norm Rcpp truncnorm]; }; impactflu = derive2 { name="impactflu"; version="0.1.0"; sha256="0wpaq2q61g6hl9fffs5cjbzdz1qc8dxsbknfs0iarwkn08460bn5"; depends=[dplyr glue lubridate magrittr Rcpp rlang tibble]; }; impimp = derive2 { name="impimp"; version="0.3.1"; sha256="0xkxph4f1rcpkryx9v339bfbsnq3xwdj1flb4j2dgh99apj126sq"; depends=[]; }; implicitMeasures = derive2 { name="implicitMeasures"; version="0.1.2"; sha256="0fss5rws8m53p3a26s2gb8bvg3ddiddnp25qj8jspa8f0iyzj48i"; depends=[ggplot2 stringr tidyr xtable]; }; - implied = derive2 { name="implied"; version="0.2.5"; sha256="0bw45vl19xvprh37rikmhh1dhykpgqy4pbq6l8pgdf7h118mvy2g"; depends=[]; }; + implied = derive2 { name="implied"; version="0.3.0"; sha256="08hjbw6fa9k71pfkbniwzbysnisl93bx3b7ik8dny029agp10nfx"; depends=[]; }; implyr = derive2 { name="implyr"; version="0.3.0"; sha256="1i0m95azyi46wnh59dcs52l78i1yqy677rlr4b6c0r945m67advn"; depends=[assertthat DBI dbplyr dplyr rlang tidyselect]; }; r_import = derive2 { name="r_import"; version="1.1.0"; sha256="0blf9539rbfwcmw8zsb4k58slb4pdnc075v34vmyjw752fznhcji"; depends=[]; }; importar = derive2 { name="importar"; version="0.1.1"; sha256="0xv445fmjhsbdlsq03k2rlycnggn3rcyq5a49zrg4jvjamzr0rgr"; depends=[]; }; @@ -9140,7 +9159,7 @@ in with self; { inbreedR = derive2 { name="inbreedR"; version="0.3.2"; sha256="09fr13ckyn2skiigkn4qdx5g080gcmyyrvzhcp0wrml9wpmy0h4z"; depends=[data_table]; }; incR = derive2 { name="incR"; version="1.1.0"; sha256="0q41bs7pf6hqyfwvcwc2sxq44jq95qq3qsddz53f8gphwjsyf1v7"; depends=[dplyr ggplot2 lubridate maptools rgeos]; }; inca = derive2 { name="inca"; version="0.0.4"; sha256="1r3niibd6pja59am8in9gpyvxi2g5bh8bqqhdixzwaj3xzyyipii"; depends=[Matrix Rcpp RcppArmadillo]; }; - incadata = derive2 { name="incadata"; version="0.8.2"; sha256="1ayr7krqcs25b5zg80m2s4g3pdasfaj2qfdnjp871im5i6bplai5"; depends=[backports decoder dplyr rvest sweidnumbr xml2]; }; + incadata = derive2 { name="incadata"; version="0.9.1"; sha256="0987zazkp3cxvk88i3yqb70s2i1cg108vc8wyhh2867s3rqdrpgh"; depends=[decoder rvest sweidnumbr xml2]; }; incgraph = derive2 { name="incgraph"; version="1.0.1"; sha256="0zjvxk2krdlm5bcr0m80nxy46f69a1xadfjw5sjw249b28wdclml"; depends=[BH dplyr orca purrr Rcpp testthat tibble]; }; incidence = derive2 { name="incidence"; version="1.7.1"; sha256="1d76d1pm4g8y0jalc18dcipi1fzwx843gcbrspcbk8nhdkjxlny4"; depends=[aweek ggplot2]; }; inctools = derive2 { name="inctools"; version="1.0.15"; sha256="0ikldiwgizs2p9vcalk5729dr6krysnyr4ni0ybg9gljw7iafdlf"; depends=[binom cubature doParallel dplyr foreach ggplot2 glm2 magrittr plyr pracma rlang tibble tmvtnorm]; }; @@ -9169,7 +9188,7 @@ in with self; { infra = derive2 { name="infra"; version="0.1.2"; sha256="0jycnnmrrjq37lv67xbvh6p63d6l4vbgf3i1z9y7r75d6asspzn1"; depends=[]; }; infraFDTD_assist = derive2 { name="infraFDTD.assist"; version="0.6"; sha256="04j5nl5vxk79iciz6s9bpiyn319c2dbh7fdahgwira2r30w2fxv9"; depends=[fields]; }; infutil = derive2 { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; }; - ingredients = derive2 { name="ingredients"; version="1.1"; sha256="0aim57f7b1pfb6cv28m8xlca40d84gickq32mzikqn20ini27xw7"; depends=[DALEX ggplot2 gridExtra scales]; }; + ingredients = derive2 { name="ingredients"; version="1.2.0"; sha256="1q196y9xzn4wk44fa1bvh0hcbizgm93rwir82nyk31k5pgixk967"; depends=[ggplot2 gridExtra scales]; }; ini = derive2 { name="ini"; version="0.3.1"; sha256="04yqij344dwm0xqgara8xia42mlmij3i8711qbb5534w05a1l6bv"; depends=[]; }; injectoR = derive2 { name="injectoR"; version="0.2.4"; sha256="0sa32cspp6y3m04yfmd02kxx55mk7l9jxf4r9pk1a6k3sqnj6fl8"; depends=[]; }; inlabru = derive2 { name="inlabru"; version="2.1.13"; sha256="1khsfhays6xna060f4h0rc7yjsq89xl42d36fy33ixgk0rh9vlnc"; depends=[ggplot2 Matrix rgdal rgeos sp]; }; @@ -9181,13 +9200,13 @@ in with self; { inplace = derive2 { name="inplace"; version="0.1.0"; sha256="1lmvfjxgficlzxbn953wvfa1n9lys9gqprix6zbqqr4d6vkm0srj"; depends=[Rcpp]; }; insect = derive2 { name="insect"; version="1.2.0"; sha256="0lbck8jbhymzkhm1iqd2y2xg8a26yjizw7x31b1l1kqc1l0p3kmv"; depends=[ape aphid kmer openssl phylogram RANN seqinr xml2]; }; insideRODE = derive2 { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve lattice nlme]; }; - insight = derive2 { name="insight"; version="0.8.2"; sha256="0fjf7dwpv1a7qfbzixppg348z1ksq19kdjm08vcb2am7w0k3plcj"; depends=[]; }; + insight = derive2 { name="insight"; version="0.8.3"; sha256="0lm5a4r368mq1pwmxjk2xnz25lb9j4v7mdkl1bahk2alklxgb8yj"; depends=[]; }; insol = derive2 { name="insol"; version="1.2.1"; sha256="1d2vqmbp94ff80mfkmq4a8y12r6ryym8hh1568ip9qbn7snc64v1"; depends=[raster]; }; inspectdf = derive2 { name="inspectdf"; version="0.0.7"; sha256="03yli2fiyb3kw189aga9hiyxm9f9b2lhpx1cjv9silfgm0xj54lh"; depends=[dplyr ggfittext ggplot2 magrittr progress Rcpp tibble tidyr]; }; instaR = derive2 { name="instaR"; version="0.2.4"; sha256="0c4m471ragkpksr0h21cdgnjxcknf01xqz543dahxgzjg9ncjwhg"; depends=[httr jsonlite]; }; install_load = derive2 { name="install.load"; version="1.2.1"; sha256="148q0rjal5hfcb8ilxzd1bz38mn8vxqrsfg5x4jy48psk00fk3d9"; depends=[]; }; insuranceData = derive2 { name="insuranceData"; version="1.0"; sha256="0wryh8i1v3bnpbqn6d6dpxr9bwwl6mnh5cb5igz0yanh4m1rx96w"; depends=[]; }; - insurancerating = derive2 { name="insurancerating"; version="0.5.2"; sha256="09zy2gdwqslv5jy46lnqr2w2j45n2ma0i2bgksi378mn21h9m14h"; depends=[classInt data_table dplyr evtree ggplot2 lubridate mgcv patchwork stringr]; }; + insurancerating = derive2 { name="insurancerating"; version="0.6.0"; sha256="16032rjs0xhyg60iwbnwmx7kq86aqhfdrz67cj892zb0iii9y131"; depends=[classInt data_table dplyr evtree ggplot2 lubridate magrittr mgcv patchwork stringr tidyr]; }; intRegGOF = derive2 { name="intRegGOF"; version="0.85-5"; sha256="0xjq8vdlgqlzrvp752gd4qfrpnpapx7k6xzfsvfril8ngvm9a162"; depends=[]; }; intRvals = derive2 { name="intRvals"; version="1.0.0"; sha256="0391raj5wq6issvzqm8bfnv1ap2hh5nfsqi9r1x5ss37fvcq5fjm"; depends=[lme4 plyr]; }; intamap = derive2 { name="intamap"; version="1.4-9"; sha256="060sghkqsdrxpa340rvjskh2wafdkffa5q8nlbg1msnsmk639lkn"; depends=[automap doParallel evd foreach gstat MASS mvtnorm rgdal sp]; }; @@ -9200,11 +9219,12 @@ in with self; { integr = derive2 { name="integr"; version="1.0.0"; sha256="172vj29bdk42ibgwj7dl06wslpg2dccp1i8iscbz1yd0j5kw36sq"; depends=[DiagrammeR DiagrammeRsvg dplyr gtools rsvg]; }; intensity_analysis = derive2 { name="intensity.analysis"; version="0.1.6"; sha256="1ydmn7njqk6i2667zaha8mvfndss4im39czadg1f3z6sndp2lsji"; depends=[diffeR ggplot2 raster reshape2 rgdal]; }; interAdapt = derive2 { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[knitcitations knitr mvtnorm RCurl shiny]; }; + interactionR = derive2 { name="interactionR"; version="0.1.0"; sha256="0iv631ws6y6gc3cyihiw4x90n0r4l8j8gxw2g8l6j8hccg4avsdh"; depends=[car flextable huxtable msm officer]; }; interactionTest = derive2 { name="interactionTest"; version="1.2"; sha256="0ycr839l07xahakr4r2jvlmd0fcxfm4qi3g8agnyh24c2kwl3ck2"; depends=[]; }; interactions = derive2 { name="interactions"; version="1.1.3"; sha256="11nn3w4qsnh0idf7cwnrclg9h8vdjfl9rbvfk1c4l65pm4f61xrv"; depends=[cli crayon generics ggplot2 jtools rlang tibble]; }; - interep = derive2 { name="interep"; version="0.3.0"; sha256="03a51vambjl7gwxk43k47iff65lc6xs66vmkiw3dhxjr3b3nxrh8"; depends=[MASS Rcpp RcppArmadillo]; }; + interep = derive2 { name="interep"; version="0.3.1"; sha256="0j5mpbx0h1p7si3n532fpzsq5d2ris77vmvqabz1vdzlv4dzlmk8"; depends=[MASS Rcpp RcppArmadillo]; }; interferenceCI = derive2 { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; }; - interflex = derive2 { name="interflex"; version="1.0.8"; sha256="117bq8cid36v6d2lrcywv5xqh6wm2z0fj9hwkjzwqhfkd8qhpq0a"; depends=[doParallel foreach ggplot2 lfe Lmoments lmtest mgcv pcse Rcpp RcppArmadillo sandwich]; }; + interflex = derive2 { name="interflex"; version="1.1.3"; sha256="1ga6m3f3dr70db5xkpbdx2vmv09cd2da8ky785dpl69chmxrcmhp"; depends=[caret doParallel foreach ggplot2 ggplotify gridExtra gtable lfe Lmoments lmtest mgcv pcse RColorBrewer Rcpp RcppArmadillo sandwich]; }; interfr = derive2 { name="interfr"; version="0.1.0"; sha256="1wn7i8dsll1qq3v39hgpbqnkjc8f4wlffy73453rw9lpq61y2fgj"; depends=[CircStats colorSpec plotrix]; }; intergraph = derive2 { name="intergraph"; version="2.0-2"; sha256="1ipxdrfxhcxhcbqvrzqh3impwk4xryqlqlgjl7f2mwrf365zs6ph"; depends=[igraph network]; }; interim = derive2 { name="interim"; version="0.8.0"; sha256="1hcq1cx6fv4ivvyd3ww3gsbw12g6rw83qqqbrcgzlnjl1q0jh3nf"; depends=[]; }; @@ -9258,8 +9278,9 @@ in with self; { ipfp = derive2 { name="ipfp"; version="1.0.1"; sha256="12aklhf9p70r9b2wi0qgbl835b4lil805c31n1ka4kdix4b4cpr4"; depends=[]; }; ipfr = derive2 { name="ipfr"; version="1.0.2"; sha256="0q44zw5g76qfqrqv6w2a8p905n4ljxab9jmyqk6fv9vs8j2kyivg"; depends=[dplyr ggplot2 magrittr mlr tidyr]; }; ipft = derive2 { name="ipft"; version="0.7.2"; sha256="0jifmkwac5yfl110200ljm3pas3321j068af9xqzqs0av20m8hps"; depends=[apcluster cluster dplyr ggplot2 Rcpp]; }; + ipify = derive2 { name="ipify"; version="0.2.0"; sha256="05mi8i839iadpz4apkxpxx86zphkgv748mwvdgjxnz82c7s10q9k"; depends=[httr]; }; iplots = derive2 { name="iplots"; version="1.1-7.1"; sha256="1bz8n9cnx6zy3wsr49h55r0l5ikfl0xjg4r76fi4giid2a3ba4lf"; depends=[png rJava]; }; - ipmisc = derive2 { name="ipmisc"; version="1.2.0"; sha256="0ga92xpq3inc1anwn4qr3xzrnlp79szb46ybvgyvxmg682wphlnf"; depends=[broomExtra crayon dplyr forcats rlang rstudioapi tibble tidyr zeallot]; }; + ipmisc = derive2 { name="ipmisc"; version="2.0.0"; sha256="0yjbxqi89nv7ksvxihfpbm4fn22y7jgj5ngpn5gd7rmg9bq68g0d"; depends=[crayon dplyr forcats magrittr rlang rstudioapi tibble tidyr zeallot]; }; ipptoolbox = derive2 { name="ipptoolbox"; version="1.2"; sha256="0scbny4crgr23qcp0vgsxhwmj5g5q5c1c4mb5mmb5njyvc34s01l"; depends=[AlgDesign copula evd kolmim triangle]; }; ipr = derive2 { name="ipr"; version="0.1.0"; sha256="1db06r784c6jga0anp6p5b3k47yfhr84nzxyjn52pc9zkg3yifjm"; depends=[]; }; ipred = derive2 { name="ipred"; version="0.9-9"; sha256="0vs1hqfx7yd0xdbmfsf2gim7spkni0845cj6gswn0nhdfdq7ma0d"; depends=[class MASS nnet prodlim rpart survival]; }; @@ -9285,7 +9306,7 @@ in with self; { irtDemo = derive2 { name="irtDemo"; version="0.1.4"; sha256="0rpwryybnj7b4bxn0mn1m496y85s2fpqdd78lmdl6jg1ck4j4pb3"; depends=[fGarch shiny]; }; irtProb = derive2 { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; }; irtoys = derive2 { name="irtoys"; version="0.2.1"; sha256="0h6iiaxikhbxhbyksbjnb09qdxinlkwr2v9yzs5wslbni14paq5q"; depends=[ltm sm]; }; - irtplay = derive2 { name="irtplay"; version="1.4.1"; sha256="0blc1jlj44rk9jgpffdwlx3pw1n72xkfi6mxb5mhd8qyc5ri1a8m"; depends=[dplyr ggplot2 gridExtra pbapply purrr reshape2 rlang statmod tidyr]; }; + irtplay = derive2 { name="irtplay"; version="1.5.0"; sha256="0jj3ac2vc1wkkwdaw8gw08y6y178n5lm468jymb6xrp1s22j22lm"; depends=[dplyr ggplot2 gridExtra Matrix pbapply purrr reshape2 rlang statmod tidyr]; }; irtrees = derive2 { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fmmcdz70wnm8c7z5z30rwzd1cs11dijjwv"; depends=[]; }; irtreliability = derive2 { name="irtreliability"; version="0.1-1"; sha256="15qs8bvgrwajj5kfd57rd34l1p2805ilyd7w60ngrqc14d6az9d2"; depends=[fastGHQuad ltm mirt]; }; isa2 = derive2 { name="isa2"; version="0.3.5"; sha256="17vm0906szhrh2k5x694vwcfijbzmd1v3axpszfybc0lgds437cv"; depends=[lattice]; }; @@ -9298,7 +9319,7 @@ in with self; { isni = derive2 { name="isni"; version="1.2"; sha256="1nw7i20fli3sg1g1dl17g8rz5bpx49gcmlyw4nvfyhdxqr38nb0r"; depends=[Formula lme4 matrixcalc mixor mvtnorm nlme nnet]; }; isnullptr = derive2 { name="isnullptr"; version="1.0.1"; sha256="0kwjxq59n3qncdw63vsdvz7v5mzbl5lmckdfgiiw35pzmahnxzh9"; depends=[]; }; isoSurv = derive2 { name="isoSurv"; version="0.1.0"; sha256="00dbrblqdylh2z636hwxr79lk2f8sa15wqcm7m6vd5m2jdhw4xay"; depends=[Iso survival]; }; - isoband = derive2 { name="isoband"; version="0.2.0"; sha256="1r023s73qypnvpx18znr9ymylr022m90v65mz2jasn0a1kjrfcbq"; depends=[Rcpp testthat]; }; + isoband = derive2 { name="isoband"; version="0.2.1"; sha256="1ndlnv4g9pbd02y50sx4ffg2ccwqbi7fm2v1lh22wdd8pq33d20q"; depends=[Rcpp testthat]; }; isoboost = derive2 { name="isoboost"; version="1.0.0"; sha256="0arah62y2gyjhrwjyf4hbzlzyvnx3594436pvk8jjcjyfk7bzr6c"; depends=[Iso isotone rpart]; }; isocat = derive2 { name="isocat"; version="0.2.5"; sha256="15y1pjyf1lcwxybrsr1n7z8w2dx1cpldcshc3fprqgy0zm2d9ij7"; depends=[foreach magrittr plyr raster sp]; }; isocir = derive2 { name="isocir"; version="2.0-6"; sha256="0dkxdx2g1c579q97r45shws2gylkwqlvrhmc14ddmzi45xhxlql6"; depends=[circular combinat TSP]; }; @@ -9328,7 +9349,7 @@ in with self; { ivdesc = derive2 { name="ivdesc"; version="1.0.0"; sha256="134dia4wwg7pazc92ccsb3pmsp9kpszr3j5ziyh0ld53qdmcsmz3"; depends=[knitr purrr rsample]; }; ivfixed = derive2 { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; }; ivmodel = derive2 { name="ivmodel"; version="1.8.1"; sha256="0c0lzjvp9dzj92p65v5lqmr701ksklx06lf6fcylj2w9hczf5klw"; depends=[Formula ggplot2 Matrix reshape2]; }; - ivmte = derive2 { name="ivmte"; version="1.1.0"; sha256="0a7m04n7lyqykfix0shjhbgnl502zlyigxb997v8wbmx9sx2vk56"; depends=[Formula]; }; + ivmte = derive2 { name="ivmte"; version="1.2.0"; sha256="19jcydb5n950av2c9j89sakjkq1jbwnarrl0hwmdy573jqh4d8a5"; depends=[Formula]; }; ivpack = derive2 { name="ivpack"; version="1.2"; sha256="0cr5acjrn41d3q0b77hlg2jmsbf1msvys9gcavm1blsryg2bc03c"; depends=[AER lmtest sandwich]; }; ivpanel = derive2 { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; }; ivprobit = derive2 { name="ivprobit"; version="1.1"; sha256="05b5gf5gmi2yrkg61n7w12qlgpnjakd1z8hhqxy6py8hahsf84gm"; depends=[Formula]; }; @@ -9349,7 +9370,7 @@ in with self; { jagsUI = derive2 { name="jagsUI"; version="1.5.1"; sha256="1samj54hyarx9j6k652jl988y3fhxsqg50hfzxdwairg0m2mlgmq"; depends=[coda lattice rjags]; }; james_analysis = derive2 { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; }; janeaustenr = derive2 { name="janeaustenr"; version="0.1.5"; sha256="1wyn4qc28a3sval8shmyi2d7s4nl3jh96s8pzq871brxcmrncbwr"; depends=[]; }; - janitor = derive2 { name="janitor"; version="1.2.1"; sha256="1sgak2zdwy9kwz24q88dpjjvnc8pmw9iansy5ci2hphh3wiykali"; depends=[dplyr magrittr purrr rlang snakecase tidyr]; }; + janitor = derive2 { name="janitor"; version="2.0.1"; sha256="1dy8dlvnxg057qxpd5lk30wcxa15vw95888ccd99sqra789llm3n"; depends=[dplyr lifecycle lubridate magrittr purrr rlang snakecase stringi stringr tidyr tidyselect]; }; jaod = derive2 { name="jaod"; version="0.2.0"; sha256="0cphwfmv5pbkf9hvz9w25gncldycgdfxmg6ajbvj9mdl46z3jddw"; depends=[crul jsonlite tibble]; }; jarbes = derive2 { name="jarbes"; version="1.7.2"; sha256="0qjnx0m65f6a8r6y5mwplaq518lrsf73k8zbf728v857nbjlhf2l"; depends=[ggExtra ggplot2 gridExtra MASS mcmcplots R2jags rjags]; }; jcext = derive2 { name="jcext"; version="0.1.1"; sha256="02zppiyq3gy551zi1g00gam1w4y1wgzn5zi9wrcz8yw915dla0ix"; depends=[ggplot2 maps RColorBrewer rworldmap sp stringr]; }; @@ -9357,7 +9378,6 @@ in with self; { jcp = derive2 { name="jcp"; version="1.0"; sha256="1p3bjn3m7mw8rxcmd79ss23v9sb1ad28qcirj5czpj274glnj26k"; depends=[]; }; jdx = derive2 { name="jdx"; version="0.1.3"; sha256="0d9m0sbdrlh8jfijn5mrfw8y2bpj5vxm0bcjlcc42ipxj47962l9"; depends=[rJava]; }; jeek = derive2 { name="jeek"; version="1.1.1"; sha256="15n0k0i1wwp72g8zqrjmglnckab3p65q3rnpg6d6h8hjcpv82i7g"; depends=[igraph lpSolve pcaPP]; }; - jenkins = derive2 { name="jenkins"; version="1.0"; sha256="02yqadbwnpbscnyjf6xqdfz9j7dqyz3741nrwz4cn9d4j4c3sjdi"; depends=[curl jsonlite]; }; jetpack = derive2 { name="jetpack"; version="0.4.3"; sha256="16l4wkrkf4ihhhpwzd62gvz30n8lxyvail70vmcg41gzdyw76hbl"; depends=[crayon desc docopt packrat remotes]; }; jetset = derive2 { name="jetset"; version="3.4.0"; sha256="0c99h5npsv2gf5d59s4qhkaqmjhbwa3prcykk24wzhnpfq6y6xhp"; depends=[AnnotationDbi org_Hs_eg_db]; }; jfa = derive2 { name="jfa"; version="0.1.0"; sha256="13fhxzhaq29z1kbaf4y9gb1m3706gvd2wsann9kz2mbpa2p9jk3a"; depends=[]; }; @@ -9378,7 +9398,7 @@ in with self; { jocre = derive2 { name="jocre"; version="0.3.3"; sha256="1i9n3r16pq6r4sy3fc1rxpil5ws8v2is0xdxafinvwr1hzkv1gz6"; depends=[boot KernSmooth plyr TSP]; }; joinXL = derive2 { name="joinXL"; version="1.0.1"; sha256="1l76bckjz5r1kdsh0s10i0gpca12rkfkp14346fn7avdcw73v23i"; depends=[data_table openxlsx R_utils rChoiceDialogs Rcpp readxl rJava timeDate timeSeries]; }; joineR = derive2 { name="joineR"; version="1.2.5"; sha256="07rsxqvy62w2z48fkgbhfk5b3q9qwkmz11n8j8qkhipqs0h1zwwq"; depends=[lattice MASS nlme statmod survival]; }; - joineRML = derive2 { name="joineRML"; version="0.4.3"; sha256="0pry2kr53svv2jpzycmm0z9nirxmxxid8p332n6pn5j3bydh7jb4"; depends=[cobs doParallel foreach ggplot2 lme4 MASS Matrix mvtnorm nlme randtoolbox Rcpp RcppArmadillo survival]; }; + joineRML = derive2 { name="joineRML"; version="0.4.4"; sha256="1h4js01zp627b5z5c5daz2a2cz38f3m2a1bijcpmbg17qskv6wp0"; depends=[cobs doParallel foreach generics ggplot2 lme4 MASS Matrix mvtnorm nlme randtoolbox Rcpp RcppArmadillo survival tibble]; }; joineRmeta = derive2 { name="joineRmeta"; version="0.1.2"; sha256="0lkj3rry8kvdcl3dxrkvnql8rl3fsgc4lk5qdifhl41aws2q7ccs"; depends=[ggplot2 gridExtra gtools JM joineR lme4 MASS Matrix meta msm statmod survival]; }; joinet = derive2 { name="joinet"; version="0.0.3"; sha256="01rql7nidmzhrz6agy5kphsln5nl4lpyrqdrfmf5w98zjr8yqkpr"; depends=[cornet glmnet palasso]; }; joint_Cox = derive2 { name="joint.Cox"; version="3.7"; sha256="1h9cqmly5rrrqvxzkx5fxjaqzks9hpvb2ggaw8b5rn67wbyblrl9"; depends=[survival]; }; @@ -9392,7 +9412,7 @@ in with self; { jose = derive2 { name="jose"; version="1.0"; sha256="1yna3x4hi0vn23dqi605nn1y313brwh2wcv527bm3mdbscgsi2jf"; depends=[jsonlite openssl]; }; jpeg = derive2 { name="jpeg"; version="0.1-8.1"; sha256="1a8mi70x79a691r40yiw684jkg1mr9n8agkxlcksxcnrdybs9c0x"; depends=[]; }; jpmesh = derive2 { name="jpmesh"; version="1.2.0"; sha256="0n2il3y9fix0hrva08hk6hdqqqw5y0vwh5m89vqssr4pccyd1syd"; depends=[leaflet magrittr miniUI purrr rlang sf shiny tibble units]; }; - jpndistrict = derive2 { name="jpndistrict"; version="0.3.5"; sha256="0khhxk7s2kj2icms38vysbq031axq9kiia7873g2vxcn5d8aa6mf"; depends=[dplyr googlePolylines jpmesh leaflet lwgeom magrittr miniUI purrr rlang sf shiny tibble tidyr tidyselect]; }; + jpndistrict = derive2 { name="jpndistrict"; version="0.3.6"; sha256="0wwkj1m22mwzpagg2plzpwn51sjvnhzhz5q3y8wwza72zhd9sx3h"; depends=[dplyr googlePolylines jpmesh leaflet magrittr miniUI purrr rlang sf shiny tibble tidyr tidyselect]; }; jqr = derive2 { name="jqr"; version="1.1.0"; sha256="00x5a61bsn2ywzc2haz19f6h0sqhlx7z3k1n9y0729dwm4id89ms"; depends=[lazyeval magrittr]; }; jquerylib = derive2 { name="jquerylib"; version="0.1"; sha256="0spq9x6fmnw9nnxanwrm17pwsc29mfw7v7v91ypzwb79wkyx3lys"; depends=[htmltools]; }; jrc = derive2 { name="jrc"; version="0.3.1"; sha256="0vzmmzblwx055jvd90bz6s5iy901kqanbrs64c3wpaxvjigwf87z"; depends=[httpuv jsonlite mime R6 stringi stringr]; }; @@ -9410,10 +9430,10 @@ in with self; { jsonstat = derive2 { name="jsonstat"; version="0.0.2"; sha256="0p0d3snl1971p5ikrkmwqrjjh4fy0b89qk3rnd1dayfb0r80xnnj"; depends=[cli dplyr jsonlite rlang]; }; jsonvalidate = derive2 { name="jsonvalidate"; version="1.1.0"; sha256="1vxklvkva547mzbgi7hll46sfx274c6j4m70algygphz783x3dsx"; depends=[V8]; }; jsr223 = derive2 { name="jsr223"; version="0.3.3"; sha256="0i00nbsj6b4mx9pgp5rana1kj57hi4lz3lsiniv7baz5avmhp65n"; depends=[curl jdx R6 rJava]; }; - jstable = derive2 { name="jstable"; version="0.9.2"; sha256="0vp6bb2yqnh81avy085y6ylb3qll671xmjddi6gilzmbxpks9xl6"; depends=[car coxme data_table dplyr geepack labelled lme4 magrittr purrr survey survival tableone tibble]; }; + jstable = derive2 { name="jstable"; version="0.9.3"; sha256="0dac786q715syizmncg5ql3w6ahswsp15f8f61m3gxhnimn6f6la"; depends=[car coxme data_table dplyr geepack labelled lme4 magrittr purrr survey survival tableone tibble]; }; jstor = derive2 { name="jstor"; version="0.3.8"; sha256="034n9x4skn7l0d9c4qfa01vlrqpkvk0dgplmc6cz07qm0hl35xcw"; depends=[cli crayon dplyr furrr magrittr pryr purrr readr rlang stringr tibble tidyr xml2]; }; jtGWAS = derive2 { name="jtGWAS"; version="1.5.1"; sha256="06cgsncgrqslxcc7s0lb3zwa85bhzkmjzz3f04716xpzwa186vxq"; depends=[Rcpp]; }; - jtools = derive2 { name="jtools"; version="2.0.3"; sha256="1xnifd77ygvkq73wyfw2ic6x3m00k7jj1rw0q8jf0q29qbpda6an"; depends=[crayon generics ggplot2 magrittr pander pkgconfig rlang tibble]; }; + jtools = derive2 { name="jtools"; version="2.0.5"; sha256="1mlnspb75cwzqqjlskq21a19jlxljxqj8bnan3w782h1nnp52y6g"; depends=[crayon generics ggplot2 magrittr pander pkgconfig rlang tibble]; }; jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; }; jubilee = derive2 { name="jubilee"; version="0.3.3"; sha256="1j2y44pfx9z2k169lh42b4dnfrrnk8jqsjn3wz4l9iscr6r91lx7"; depends=[data_table dplyr readxl xts yaml zoo]; }; junctions = derive2 { name="junctions"; version="1.1"; sha256="1v5jx4mw6x4q3fivsvidd49b8czzbvv5icj39h6jrpmqvrnc8w32"; depends=[Rcpp]; }; @@ -9436,6 +9456,7 @@ in with self; { kayadata = derive2 { name="kayadata"; version="0.4.3"; sha256="116bcjfsq9k4x6dy92xbs18rlc09wcwylqyni0dw4c8pww64n937"; depends=[dplyr forcats ggplot2 magrittr scales stringr tidyr]; }; kazaam = derive2 { name="kazaam"; version="0.1-0"; sha256="0j7vysnmiv9sggcxdn3nrgfvyl52pza4kkjnsa0xlb3fzq9qpwlz"; depends=[pbdMPI]; }; kcirt = derive2 { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[corpcor mvtnorm snowfall]; }; + kcopula = derive2 { name="kcopula"; version="0.1.0"; sha256="07ddrq4lxp8i6n7c7ac7x9mdg9gfmlh7bv3n34qalwv0a6fa061w"; depends=[pracma]; }; kcpRS = derive2 { name="kcpRS"; version="1.0.0"; sha256="067j91rhw56kf15h7hxpm9qr6i59fvy5fh9ycfdqcps83wjgx62x"; depends=[doParallel foreach RColorBrewer Rcpp roll]; }; kde1d = derive2 { name="kde1d"; version="1.0.2"; sha256="0m6y1anzl5agb8xpywn2pv6hx4l7k0352bxnzxcs23iksbimxx13"; depends=[BH randtoolbox Rcpp RcppEigen]; }; kdecopula = derive2 { name="kdecopula"; version="0.9.2"; sha256="0g5c12wm3byd4chd8i9mxv599gsf4ip4qghx83j3mmhsmn05zf4y"; depends=[lattice locfit qrng quadprog Rcpp RcppArmadillo]; }; @@ -9459,12 +9480,13 @@ in with self; { kerndwd = derive2 { name="kerndwd"; version="2.0.2"; sha256="0nf5hyb274gn02n4lygwryv1jaqff77i040bd8gs1xykgvy6jxny"; depends=[]; }; kernelFactory = derive2 { name="kernelFactory"; version="0.3.0"; sha256="001kw9k3ivd4drd4mwqapkkk3f4jgljiaprhg2630hmll064s89j"; depends=[AUC genalg kernlab randomForest]; }; kernelPSI = derive2 { name="kernelPSI"; version="1.1.1"; sha256="1gnp3ixqmijy6xanlc4l8255biwxmlfyhd3y68arry9rzfjkmxpz"; depends=[CompQuadForm kernlab lmtest pracma Rcpp RcppArmadillo]; }; - kernelTDA = derive2 { name="kernelTDA"; version="0.1.1"; sha256="0rghj0yx32r6565mb06k83qfmnf7lajdhdg2zf8kjd9jyzidqdrn"; depends=[BH mvtnorm Rcpp RcppEigen Rdpack]; }; + kernelTDA = derive2 { name="kernelTDA"; version="1.0.0"; sha256="0nzb2z10c3pqj8p47w663mrnmk3g8x61zz99ka8fwcspw1wq3g8m"; depends=[BH mvtnorm Rcpp RcppEigen Rdpack]; }; kernelboot = derive2 { name="kernelboot"; version="0.1.7"; sha256="1465n9fasyxwm4xx9vajaf5n355z2qdkfzhpp3a6mkv58pydbjss"; depends=[future future_apply Rcpp]; }; kernhaz = derive2 { name="kernhaz"; version="0.1.0"; sha256="1cxwjnfyhxfjdbhs21airycs704jic21pdpsbxsx37wkl11cxpai"; depends=[doParallel foreach GA rgl]; }; kernlab = derive2 { name="kernlab"; version="0.9-29"; sha256="0vqhndl4zm7pvkfvq0f6i9cbrm7pij6kmdp7d7w39pa100x6knn3"; depends=[]; }; kernplus = derive2 { name="kernplus"; version="0.1.2"; sha256="0z5zpj89nw7cdphg6frmjwqjxsl6g95xsa8zgsxmw2q75wwj1saz"; depends=[circular KernSmooth mixtools]; }; kernscr = derive2 { name="kernscr"; version="1.0.5"; sha256="1kcj710q8jbc34g6fcv2nk07hpsb81mfx8hvivgxq8x58028gjzs"; depends=[MASS mvtnorm]; }; + keyATM = derive2 { name="keyATM"; version="0.1.0"; sha256="0jska1nzwbb7lmm18wpa99jdgvv7mgl1cm47k7qspg1jmx5alj5d"; depends=[dplyr fastmap ggplot2 ggrepel magrittr Matrix purrr quanteda Rcpp RcppEigen RcppProgress rlang stringr tibble tidyr]; }; keyholder = derive2 { name="keyholder"; version="0.1.4"; sha256="1k648a16015qq29msls2s5y5ql9myi1908klih5gj09pf2fr93wq"; depends=[dplyr rlang tibble]; }; keyplayer = derive2 { name="keyplayer"; version="1.0.3"; sha256="0j4n46r9ivkbzqz8g22dq2bpmx7bs05yb5qp27p9jnfh5x19v2ds"; depends=[igraph matpow sna]; }; keypress = derive2 { name="keypress"; version="1.2.0"; sha256="19l33519f726i3q20y34v1aavrn4fpj3zn5caij3l9q2asw2kqk2"; depends=[]; }; @@ -9517,7 +9539,7 @@ in with self; { knockoff = derive2 { name="knockoff"; version="0.3.2"; sha256="1ky69f3hwwgy2il097mx0z7aakxsq692g9ink8z8cb4wnrp4bk07"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; }; knor = derive2 { name="knor"; version="0.0-7"; sha256="1xxv210sjj9w06pf36q7haz9fkqdc17jyqdsiqsxj3q8zj585qfc"; depends=[Rcpp]; }; knotR = derive2 { name="knotR"; version="1.0-2"; sha256="0kd1b9wibpwyaanz9ny61qgfvcg4d3rzpy05sfshlpp0b1y8d3xj"; depends=[]; }; - kntnr = derive2 { name="kntnr"; version="0.4.3"; sha256="1hr4c6yr2ddi69fpnmppmwn2hyc593gk8hc0p7qky5cdlllvqgbd"; depends=[base64enc dplyr httr jsonlite lubridate purrr rlang rstudioapi stringr tibble tidyr]; }; + kntnr = derive2 { name="kntnr"; version="0.4.4"; sha256="1af5qhj82dixf1qcbz3sfj52pzgy8gnafzifwxnhrp7vpn4rnv6m"; depends=[base64enc dplyr httr jsonlite lubridate purrr rlang rstudioapi stringr tibble tidyr]; }; koRpus = derive2 { name="koRpus"; version="0.11-5"; sha256="053882fnz6c7yjiz72jg6sawd9q57h110nd4yjay65piadi9mci5"; depends=[data_table sylly]; }; koRpus_lang_en = derive2 { name="koRpus.lang.en"; version="0.1-3"; sha256="013zxm5x5hwdx1hqgb7mh3zmn8dri3fhq1brmzg936gddhxap6is"; depends=[koRpus sylly_en]; }; kofdata = derive2 { name="kofdata"; version="0.1.3.4"; sha256="036d3mvhdlpaisms3vg6v35lvy48w8yld7mz3rdd3dw6bszzrg5k"; depends=[httr jsonlite xts zoo]; }; @@ -9583,7 +9605,6 @@ in with self; { laketemps = derive2 { name="laketemps"; version="0.5.1"; sha256="04742r379bzgbfr4243wwkb26cvfmnw50jzgygq7vblq00grzska"; depends=[dplyr reshape2]; }; lamW = derive2 { name="lamW"; version="1.3.0"; sha256="00qa1sxyqb2r7f9yidg43cq2v1285f45xpm3z928jpi424mpg0fc"; depends=[Rcpp RcppParallel]; }; lambda_r = derive2 { name="lambda.r"; version="1.2.4"; sha256="1mh1g0gsd58gng0hb29vww2yqb2jfs07kba5kxnnqck5j3izwlnj"; depends=[formatR]; }; - lambda_tools = derive2 { name="lambda.tools"; version="1.0.9"; sha256="1wslxxh6rxny3n06y16dqwpczi3k42vrq4pbwwshl6kzhl56r45b"; depends=[lambda_r]; }; lamme = derive2 { name="lamme"; version="0.0.1"; sha256="1x9jl79iqikpjixajly1k8w2nkzskns2m0v242giknl0ikw298h1"; depends=[]; }; landest = derive2 { name="landest"; version="1.0"; sha256="1lp5sfqk0n7i23fmwjgzsabml1fsji1h9xq5khxzaz1bzqv1s08g"; depends=[survival]; }; landpred = derive2 { name="landpred"; version="1.0"; sha256="1bl17xkx18i8i7arccnjmxvhjn4yiy7w64hg4n0xmhk8pg0l3mrg"; depends=[survival]; }; @@ -9596,7 +9617,7 @@ in with self; { languageR = derive2 { name="languageR"; version="1.5.0"; sha256="1iipnr2b4hd2w718prbh075j56m5xnchlcb2vg26m16qpydp6afn"; depends=[]; }; languagelayeR = derive2 { name="languagelayeR"; version="1.2.4"; sha256="1q82shdcdd84nr6bnfwgyyb81z8dycvj1i3vhwvdg710s15rgiyk"; depends=[attempt curl httr jsonlite]; }; languageserver = derive2 { name="languageserver"; version="0.3.5"; sha256="04i7pasvj2varq3khk6w0z1liwnwfr648gwvqz9qs7gkyknydp4y"; depends=[callr collections desc fs jsonlite lintr R6 repr stringi styler xml2 xmlparsedata]; }; - languageserversetup = derive2 { name="languageserversetup"; version="0.1.1"; sha256="07vwfgdw79zcr8wlmzs4b5mqmd7fa2ja76vpyjvlf07ifg7x82jw"; depends=[]; }; + languageserversetup = derive2 { name="languageserversetup"; version="0.1.2"; sha256="05i8kcp1zpbkrqpq5vxxvxk9p7phyngxl0q6v76va0i7qnmy1v7a"; depends=[]; }; lans2r = derive2 { name="lans2r"; version="1.0.5"; sha256="1m3hz85gl9m4vafdy7mj3z560d11mdwlwvnzy8n7d1cjqryn7a2b"; depends=[dplyr ggplot2 lazyeval R_matlab reshape2 tidyr]; }; lar = derive2 { name="lar"; version="0.1-2"; sha256="0qda0y4ag10kg83wxs3z754kc8c1dg2rwciy64klk7an4ln43i5b"; depends=[data_table treemap xlsx]; }; largeList = derive2 { name="largeList"; version="0.3.1"; sha256="0csijzlxajj0rh24w5n7fs6ss301zr6zfv5khyq4a9g437bwhc2i"; depends=[]; }; @@ -9634,7 +9655,6 @@ in with self; { lazytrade = derive2 { name="lazytrade"; version="0.3.10"; sha256="1m8wv5ii4inqw45nzqfqyrhzajr37mk9v4h8vxvy0ya00cibs9hb"; depends=[dplyr ggplot2 h2o lubridate magrittr openssl readr ReinforcementLearning stringr]; }; lba = derive2 { name="lba"; version="2.4.4"; sha256="0izqndm992zv3sg8v5lpnxbdbxhpxl6hq3bf6xgq3pnw8vl3f6nb"; depends=[alabama MASS plotrix rgl scatterplot3d]; }; lbfgs = derive2 { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp]; }; - lbfgsb3 = derive2 { name="lbfgsb3"; version="2015-2.13.1"; sha256="15g465dy4izybmgmbgzmiyaxdfa6l1mcvyh6rc3hgapnlmnvb66m"; depends=[numDeriv]; }; lbfgsb3c = derive2 { name="lbfgsb3c"; version="2020-3.2"; sha256="07mhiaxhjjma5c65z3pz7wchgsqn4b19labzyq25ncnmj319fxrg"; depends=[numDeriv Rcpp RcppArmadillo]; }; lbiassurv = derive2 { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; }; lbreg = derive2 { name="lbreg"; version="1.3"; sha256="1z9vixf6sl0k9lizngc3859lk32srkk1d8y133sl6s37ppmqb4s2"; depends=[MASS]; }; @@ -9654,7 +9674,7 @@ in with self; { ldaPrototype = derive2 { name="ldaPrototype"; version="0.1.1"; sha256="0r78x7sn6mg4hgwydk1lgvfzkmgwkzqq0kvn8pqawx9pg8d8h4jb"; depends=[checkmate colorspace data_table dendextend fs lda progress]; }; ldamatch = derive2 { name="ldamatch"; version="1.0.1"; sha256="1dmmjw7h0rrgwga7235bryzzvmx68gmkpy5v1pwvnkk4rxp8xamh"; depends=[car data_table entropy foreach gmp iterators iterpc kSamples MASS RUnit]; }; ldat = derive2 { name="ldat"; version="0.3.3"; sha256="1n8v4nzfv3ayr46ahrz60vasam8mx1phb4vss05d9xh7sxlkx7gv"; depends=[BH lvec Rcpp]; }; - ldatuning = derive2 { name="ldatuning"; version="1.0.0"; sha256="021k91a76yxjpda2850jcnxvawlrisvw35rw2p6ylfwkylaf4sz9"; depends=[ggplot2 reshape2 Rmpfr scales slam topicmodels]; }; + ldatuning = derive2 { name="ldatuning"; version="1.0.2"; sha256="0367y6k5i4sccwfcm89xyc62qblrlwnm6hsa2jf346rnrfz9hkkc"; depends=[ggplot2 reshape2 Rmpfr scales slam topicmodels]; }; ldbod = derive2 { name="ldbod"; version="0.1.2"; sha256="1ylzkswnhf4jnjx2ijasy49pj78ffx333za0bx2fnf3g85kicqiv"; depends=[mnormt RANN]; }; ldbounds = derive2 { name="ldbounds"; version="1.1-1.1"; sha256="10rmkidvvhwnrkc62c5ld44xhbvx1k8mch28h1yryakn8gznp3p8"; depends=[lattice]; }; ldhmm = derive2 { name="ldhmm"; version="0.5.1"; sha256="1jwgxwzz56n6hhpp1qks1x0jsfbrjgfsl6h5sp7498l4d2f279ij"; depends=[ecd ggplot2 moments optimx scales xts zoo]; }; @@ -9689,6 +9709,7 @@ in with self; { ledger = derive2 { name="ledger"; version="2.0.6"; sha256="11j4mzkkgphpwda5g9wl0ppxh5kslx7gqip5b7frmq1vk08fxf1p"; depends=[dplyr rio rlang stringr tibble tidyr tidyselect]; }; leerSIECyL = derive2 { name="leerSIECyL"; version="1.0.2"; sha256="1zx28gpnys9mmhq7wwljfnq92wj1h1vxgqiirnfmn36z942nvmxl"; depends=[RCurl]; }; legco = derive2 { name="legco"; version="0.1.3"; sha256="1615whdqihpzfhp5ll3x3jg4py04l52dc87kbdmgln4ygxyy5sqh"; depends=[httr jsonlite]; }; + legislatoR = derive2 { name="legislatoR"; version="1.0"; sha256="1553hpb2cmv3hw6v4c7qwgg8n18jwx101yaqnmaaiv8gfyh6j43m"; depends=[curl dplyr]; }; legocolors = derive2 { name="legocolors"; version="0.2.0"; sha256="06jbq12jzga1p5jajhnnkk11s9gjw5ngmnrvhmbvirhsbafp0fjv"; depends=[]; }; leiden = derive2 { name="leiden"; version="0.3.3"; sha256="1hh6bmbz6cpqwl4i94gxylgv9x92zbqdg81r8r4ymfy8c70f3df2"; depends=[igraph Matrix reticulate]; }; leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; }; @@ -9699,6 +9720,7 @@ in with self; { lessR = derive2 { name="lessR"; version="3.9.3"; sha256="1r4hsznvrsy6cb1qwy5vnc9b8wbjsya87161z3w9crgxrw1dbls8"; depends=[colorspace ellipse foreign lattice latticeExtra leaps openxlsx png rmarkdown robustbase sas7bdat triangle viridisLite wesanderson]; }; lest = derive2 { name="lest"; version="1.1.0"; sha256="1d69kvdl31crv4ik8bwylq3s3f4skzrjc4x49c79w443g64n2jp9"; depends=[]; }; lestat = derive2 { name="lestat"; version="1.9"; sha256="1skxymdf3ncmdbskh7711xxgwsmwxfxnl52gcgw06jscx6s6wrsd"; depends=[MASS]; }; + letsR = derive2 { name="letsR"; version="3.2"; sha256="1ahmm290vgmdqnm7wz1fif1g31nsvqszkf921dpddv291xqmbksp"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; }; lexRankr = derive2 { name="lexRankr"; version="0.5.2"; sha256="0vb4m4g88k05yhjla1gwp8ck08356r9dzwal6cq7lb6xm6pl5gvi"; depends=[igraph Rcpp SnowballC]; }; lexicon = derive2 { name="lexicon"; version="1.2.1"; sha256="0x7rscsh6par2lj11sby7bmz41cxn63iiw51lgh29z09cg8j606c"; depends=[data_table syuzhet]; }; lexiconPT = derive2 { name="lexiconPT"; version="0.1.0"; sha256="0w53gnr29nzc1ib54rnxdycs0c5f7vpv586qmvxxzy4ar16kisaq"; depends=[]; }; @@ -9714,14 +9736,13 @@ in with self; { lgrdata = derive2 { name="lgrdata"; version="0.1.1"; sha256="0h1crdhqfp6hzx30lp0w015scf2566hhrl2i7mkxy868rkl3aig9"; depends=[]; }; lgtdl = derive2 { name="lgtdl"; version="1.1.5"; sha256="1sixq56d2px36q0xq3kl0zwj2yzm3q8fhgqjvmajcdd5jl8l7130"; depends=[]; }; lhmixr = derive2 { name="lhmixr"; version="0.1.0"; sha256="1c4ydgq1z2y0xk8xqdsim6xvgxdbl3gglfk5kcr9k4m01arvv0rf"; depends=[]; }; - lhs = derive2 { name="lhs"; version="1.0.1"; sha256="0lzaqr7xi3ckln5nglv5xf5njm359slpz1jc6s02hpsqdw6armd4"; depends=[Rcpp]; }; - liayson = derive2 { name="liayson"; version="1.0.2"; sha256="1kz7svfjd8wr826kwqkisiyhszb5df7inf77w2yb2rahkza50m49"; depends=[ape arules biomaRt distances e1071 gplots matlab phangorn plyr proxy RColorBrewer]; }; + lhs = derive2 { name="lhs"; version="1.0.2"; sha256="0n0i1hr9gmc0hfcs2cvpjvdfgm6k26rhcq3q22r8ic0gfj953572"; depends=[Rcpp]; }; libcoin = derive2 { name="libcoin"; version="1.0-5"; sha256="1cm9x1dlg9f7fh7n5nw3x4a7rl88c7ylrlc8x3rx4mq5w1j42x0a"; depends=[mvtnorm]; }; librarian = derive2 { name="librarian"; version="1.7.0"; sha256="0n3q2ppa3p0w8ypgx9s738pmprfbqi9qg8n58xzplp809p903dj9"; depends=[BiocManager remotes]; }; librarysnapshot = derive2 { name="librarysnapshot"; version="0.1.2"; sha256="0v4x564zpm58kxs5n84bi6mcjhbzjg6a2lc30vsc8kbm3qy0nq38"; depends=[]; }; libsoc = derive2 { name="libsoc"; version="0.7"; sha256="1r548rvj98wl0yp6jx5d2qhvy1y4883qp0w3jjk97vp07a1cywn8"; depends=[]; }; libstableR = derive2 { name="libstableR"; version="1.0.2"; sha256="1gkcgbc8a7ks9x8mqmlz98hk55q3qy62izam7csz1s0r5dzsyqcr"; depends=[Rcpp RcppGSL]; }; - lidR = derive2 { name="lidR"; version="2.2.3"; sha256="05xz64c1f362gjsdhqjz3za444fjkssijhadn2f1qqqbb1bdd664"; depends=[BH data_table future gdalUtils glue lazyeval raster Rcpp RcppArmadillo RCSF rgdal rgeos rgl rlas sf sp]; }; + lidR = derive2 { name="lidR"; version="2.2.4"; sha256="1p0swwwwmfnyzq9k3zf68cl1b4l2vg2d5xy0s4vs5xqjfprbffwd"; depends=[BH data_table future gdalUtils glue lazyeval raster Rcpp RcppArmadillo RCSF rgdal rgeos rgl rlas sf sp]; }; lifecontingencies = derive2 { name="lifecontingencies"; version="1.3.6"; sha256="0v8xrnmviq938x779f3h55iq8bhvbkwgz35v1dxgzbxwclj7jycl"; depends=[markovchain Rcpp]; }; lifecourse = derive2 { name="lifecourse"; version="2.0"; sha256="1m8ihqvzhzpq2m2pdvh37bpq9pdbj23r3y0jkl3q8farh3qj473d"; depends=[TraMineR]; }; lifecycle = derive2 { name="lifecycle"; version="0.2.0"; sha256="0912865c6675fsblrfdk6s568krsj1x8qbk1kipy7m05xs6nwx19"; depends=[glue rlang]; }; @@ -9737,7 +9758,6 @@ in with self; { likelihoodAsy = derive2 { name="likelihoodAsy"; version="0.50"; sha256="009alsxsv9fjpihp3zl0a94y6cvr49nh21skba64lzz9fypm9j8l"; depends=[alabama cond digest nleqslv pracma Rsolnp]; }; likelihoodExplore = derive2 { name="likelihoodExplore"; version="0.1.0"; sha256="13cnql7pbx8qq1j3cfb3lkzzf2k55shpfa0jd00z30ys6imxzcfn"; depends=[lazyeval plyr]; }; likert = derive2 { name="likert"; version="1.3.5"; sha256="0c4irxs7pp1z8nj4s8cq23daw4h94n3h7x4f6q1d85614qcl9l3p"; depends=[ggplot2 gridExtra plyr psych reshape2 xtable]; }; - lilikoi = derive2 { name="lilikoi"; version="0.1.0"; sha256="1v7xrkv8xxmq6cdww4z1p9vlvy71cqgd3yb5mal4v9w2wrfaps6z"; depends=[caret corrplot devtools dplyr e1071 gbm ggplot2 glmnet hash Hmisc infotheo Matrix pamr princurve pROC R_oo randomForest reshape2 RWeka stringr]; }; lillies = derive2 { name="lillies"; version="0.2.7"; sha256="167hlqj9ivsjxhlfv3z1c017iqbj08aig86ncrk9inpqj3zvkyxy"; depends=[ddpcr dplyr knitr pracma progress rlang survival tidyr]; }; limSolve = derive2 { name="limSolve"; version="1.5.6"; sha256="1829rd2cnd8qj80z9a7sgc7gx4sf3kvl5g6d2a0lqqw30f9sjzmr"; depends=[lpSolve MASS quadprog]; }; lime = derive2 { name="lime"; version="0.5.1"; sha256="021wz43dfc3f2k275c98hcnnx7dyyjj18dm2zf8vh7rbk9bnf0sj"; depends=[assertthat ggplot2 glmnet gower htmlwidgets Matrix Rcpp RcppEigen shiny shinythemes stringi]; }; @@ -9786,7 +9806,6 @@ in with self; { live = derive2 { name="live"; version="1.5.13"; sha256="1s6yrbwlc4wqszl2yvy1x6d93my18ba8sm8pwfy547cd1x055vig"; depends=[breakDown data_table dplyr e1071 forestmodel ggplot2 gower MASS mlr shiny]; }; livechatR = derive2 { name="livechatR"; version="0.1.0"; sha256="1k0z6q3s9iw962m1lwlx45p95flzl5jg1xh6ng426v9jh1yyrbb2"; depends=[data_table dplyr jsonlite magrittr purrr]; }; ljr = derive2 { name="ljr"; version="1.4-0"; sha256="0jby94ml8w6pwnxbmv6qfjww2myvvnn9vrmlqpdh71dhgp3z35py"; depends=[]; }; - llama = derive2 { name="llama"; version="0.9.2"; sha256="0knlmfddp70ddhjb9slyibbb9qj7pfybqccv3i4f545qxmmykj2n"; depends=[BBmisc checkmate ggplot2 mlr parallelMap plyr rJava]; }; llbayesireg = derive2 { name="llbayesireg"; version="1.0.0"; sha256="0jhkmrjkqfm1flwsbpv6060j6g7cj4ngm0drvrlvsiqpni0k96mh"; depends=[coda ggplot2 llogistic MASS MCMCpack Rcpp rstan StanHeaders]; }; lle = derive2 { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[MASS scatterplot3d snowfall]; }; lllcrc = derive2 { name="lllcrc"; version="1.2"; sha256="06n1fcd3g3z5rl2cyx8jhyscq9fb52mmh0cxg81cnbmai3sliccb"; depends=[combinat data_table plyr VGAM]; }; @@ -9799,14 +9818,14 @@ in with self; { lmSupport = derive2 { name="lmSupport"; version="2.9.13"; sha256="0ln5c91mbxkymgnv2nw5m3nrm5bwckpikgb9x1qhmjc55m98wkb8"; depends=[AICcmodavg car gplots gvlma lme4 pbkrtest psych pwr]; }; lmboot = derive2 { name="lmboot"; version="0.0.1"; sha256="1v7a3vlv0187mpg3y3pj7f3pbk1v5n6amw732chy10vdw5nmfkwd"; depends=[evd]; }; lmds = derive2 { name="lmds"; version="0.1.0"; sha256="130azb0nc2wwxv0qi8v5s4rd02p9lc92zwn634pv7b8awbw81i65"; depends=[assertthat dynutils irlba Matrix]; }; - lme4 = derive2 { name="lme4"; version="1.1-21"; sha256="035j2hqkwv939xl07pm2vykvf3wlx8qj317846n9pkpqkyv58mbz"; depends=[boot lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; }; + lme4 = derive2 { name="lme4"; version="1.1-23"; sha256="0qh29kqli0l3naylgb6jha6jllx4nwryr3hv9yk37blgyyql5mcr"; depends=[boot lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen statmod]; }; lmeNB = derive2 { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[lmeNBBayes numDeriv statmod]; }; lmeNBBayes = derive2 { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; }; lmeSplines = derive2 { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; }; lmeVarComp = derive2 { name="lmeVarComp"; version="1.1"; sha256="0m6syydy89c52hhi0w503l5vkgya2d5ps70z5wmdd39nm4jna68w"; depends=[]; }; lmec = derive2 { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; }; lmem_qtler = derive2 { name="lmem.qtler"; version="0.1.1"; sha256="0qbllj66y294n1m8dsyrnwyvzscbzg8mb2dmjyghcrfaz925vkin"; depends=[lattice lme4 pastecs qtl stringr]; }; - lmerTest = derive2 { name="lmerTest"; version="3.1-1"; sha256="0r2vvs3nl6p8xla3gd943khb4ixp0alvspqpnz2y6n3wk8zgh3jj"; depends=[ggplot2 lme4 MASS numDeriv]; }; + lmerTest = derive2 { name="lmerTest"; version="3.1-2"; sha256="1qkdxx5sri65zgpb9gw4nkfkdam51kgy4hxclk5c40yk7y3p0n1q"; depends=[ggplot2 lme4 MASS numDeriv]; }; lmeresampler = derive2 { name="lmeresampler"; version="0.1.1"; sha256="13i0crk6agw5pcj3znvxj60jfsmncnir7ahwdczgm7kh08hk0f6l"; depends=[boot dplyr Matrix nlmeU plyr RLRsim]; }; lmf = derive2 { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; }; lmfor = derive2 { name="lmfor"; version="1.4"; sha256="012bk6r6gf6y9skfch2pqr2irv70108sz1x6hakl1bifb4lgnbjp"; depends=[magic nlme spatstat]; }; @@ -9843,6 +9862,7 @@ in with self; { lodGWAS = derive2 { name="lodGWAS"; version="1.0-7"; sha256="0g5b44d3wb5hnx5l2n76myb1pc9ml3a052n1a4gvgqapa5as35s2"; depends=[rms survival]; }; loder = derive2 { name="loder"; version="0.2.0"; sha256="0m6g8c25dmq0wgpy8y6cbggymxdvqwb6lp2yzs5bgpq183512spb"; depends=[]; }; lodi = derive2 { name="lodi"; version="0.9.2"; sha256="16xqcza87gsqi6kzx0bdv3w9zyvvppjd20rq08lc8vb75nlkx1yb"; depends=[rlang]; }; + lodr = derive2 { name="lodr"; version="1.0"; sha256="0bmdw489dv1069krnx9yi0bcgx1vx4ymc6s4pix4shha5c5fbiz4"; depends=[Rcpp RcppArmadillo Rdpack]; }; loe = derive2 { name="loe"; version="1.1"; sha256="1n16pgfxg9vcn729xxjbbvavg2ywbdcch9v2ph8nv3z7psc0q46c"; depends=[MASS]; }; loewesadditivity = derive2 { name="loewesadditivity"; version="0.1.0"; sha256="0j9vvh2ys09hy2k3mbrlf0p493ymrxvfsdcjw0p6rlls54z9lqqc"; depends=[dplyr ggplot2 gridExtra magrittr metR rlang rootSolve tidyr viridis]; }; log4r = derive2 { name="log4r"; version="0.3.2"; sha256="18r5g0817wfn0kmqwv6vf7r2vavi0xh6mqmxrh59y9w3c84npfhl"; depends=[]; }; @@ -9879,12 +9899,12 @@ in with self; { longitudinalData = derive2 { name="longitudinalData"; version="2.4.1"; sha256="0lnvcfgj721bawl1ciz0jw83mfsnzkhg6jn824vr3qdm4rbib2vd"; depends=[class clv misc3d rgl]; }; longitudinalcascade = derive2 { name="longitudinalcascade"; version="0.3.2.1"; sha256="03nqglxyz6qfalxdnyh2aarxv3agn0b3r4nhsji4v9703h4m1fvg"; depends=[dplyr ggplot2 lubridate rlang scales survival tidyr zoo]; }; longmemo = derive2 { name="longmemo"; version="1.1-2"; sha256="01rj5x9cgscsrakbx9155mbvs35fd3j484cfz5cds9vl521fjr3r"; depends=[]; }; - longpower = derive2 { name="longpower"; version="1.0-19"; sha256="0m5c544d6vl2zhbyi0spy7ylvr366m7vrmk3xfghcvd5anbzpjk6"; depends=[lme4 nlme]; }; + longpower = derive2 { name="longpower"; version="1.0-21"; sha256="0095jml46lchyp17gsqpjabq80xjddlvd4ir8y2jsg8sgd3pc8vs"; depends=[lme4 nlme]; }; longurl = derive2 { name="longurl"; version="0.3.0"; sha256="0ysa70zlkk3ybddj3yd3vbhjnkjbrisiz5a2hgbjx10p33m1r3am"; depends=[dplyr httr purrr]; }; loo = derive2 { name="loo"; version="2.2.0"; sha256="1hq1zcj76x55z9kic6cwf7mfq9pzqfbr341jbc9wp7x8ac4zcva6"; depends=[checkmate matrixStats]; }; lookupTable = derive2 { name="lookupTable"; version="0.1"; sha256="0ipy0glrad2gfr75kd8p3999xnfw4pgpbg6p064qa8ljqg0n1s49"; depends=[data_table dplyr]; }; loon = derive2 { name="loon"; version="1.2.3"; sha256="0h6vbsdp7m9wawjswzzpx7sq8q06xj9l1ln11vfwsyfnp4c66bfs"; depends=[gridExtra]; }; - loon_data = derive2 { name="loon.data"; version="0.0.6"; sha256="01bd3w5xfr7lnbdhi9al5svlg7x3xs4l0jbqsrlamzc96izkm952"; depends=[]; }; + loon_data = derive2 { name="loon.data"; version="0.0.8"; sha256="164i9dbx8a2mwydrzr9bsbx1fqwhg3avl373jk6mpn51m290f8vc"; depends=[]; }; loop = derive2 { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; }; loopr = derive2 { name="loopr"; version="1.0.1"; sha256="1qzfjv15ymk8mnvb556g2bfk64jpl0qcvh4bm3wihplr1whrwq6y"; depends=[dplyr lazyeval magrittr plyr R6]; }; loose_rock = derive2 { name="loose.rock"; version="1.0.16"; sha256="0vk9zmiy730c1d397v5p7v8ywjv1wv9vabmhdjyrfdx7bijfy57m"; depends=[digest dplyr futile_options ggplot2 MASS reshape2]; }; @@ -9951,7 +9971,7 @@ in with self; { lvmcomp = derive2 { name="lvmcomp"; version="1.2"; sha256="08hs97bdz4n0bdhvqqq5xywfy140s69c750rn38criq4cw4gm3z7"; depends=[coda Rcpp RcppArmadillo]; }; lvnet = derive2 { name="lvnet"; version="0.3.5"; sha256="1wqqxavs2s0hmlifyaa1jrlc8hj4z72fkgjckkmh9m2r4jp9zy0g"; depends=[corpcor dplyr glasso lavaan Matrix mvtnorm OpenMx psych qgraph semPlot]; }; lvplot = derive2 { name="lvplot"; version="0.2.0"; sha256="01sisj2vbx2yb5w9cjzyaf9j46vh4kkw05xccq1f7wmsg69zmj6b"; depends=[ggplot2 RColorBrewer]; }; - lwgeom = derive2 { name="lwgeom"; version="0.2-1"; sha256="00vm7dvy3s2vkggry9knmr3f39nbiacmwiwd0nvrd21yg47k2qi2"; depends=[Rcpp sf units]; }; + lwgeom = derive2 { name="lwgeom"; version="0.2-3"; sha256="0zq85lgmqhxa0f8kgq616lbnh9ads3cwjrfyf9hf1h85wfg0fa6n"; depends=[Rcpp sf units]; }; lxb = derive2 { name="lxb"; version="1.5"; sha256="16x1mvhxqhvibzmv6mlqcmkgic2sha1xagf7r2azmn4z8x1m9w6n"; depends=[]; }; lymphclon = derive2 { name="lymphclon"; version="1.3.0"; sha256="1jns41sk2rx1j3mg06dzy434k30gpfhbkn6s47fmyv1y8701vfl0"; depends=[corpcor expm MASS]; }; m2b = derive2 { name="m2b"; version="1.0"; sha256="0agzw67mmwrw1f61yn24z5w1pgjssdapg3li0a53i3ylnij45mzr"; depends=[caret caTools e1071 geosphere ggplot2 randomForest]; }; @@ -9968,7 +9988,7 @@ in with self; { mMPA = derive2 { name="mMPA"; version="1.2.0"; sha256="0g4zjknz52fpk7f436j95aw93aa8q2jwcrb1pqkm294kr276nnd9"; depends=[]; }; mQTL = derive2 { name="mQTL"; version="1.0"; sha256="0k80xvkr0b0mp3bj2s558fjxi2zf4k7ggnw6hsjm8lr84i108dks"; depends=[MASS outliers qtl]; }; mRMRe = derive2 { name="mRMRe"; version="2.1.0"; sha256="1m41859sa0nd4hdnsq3ir337834cpmgg564f6ph57dmmwz0wa8zy"; depends=[igraph survival]; }; - mRpostman = derive2 { name="mRpostman"; version="0.3.0"; sha256="18ky3xpgb4rns65574jr9fy8jwi6nrz6py9ai8nqf2r1s0bdmww3"; depends=[assertthat base64enc curl magrittr stringr]; }; + mRpostman = derive2 { name="mRpostman"; version="0.3.1"; sha256="0jghbqszf56xp3kvx9rcf11bj0j46hh3xgzvaihbpb67lcj8mvyw"; depends=[assertthat base64enc curl magrittr stringr]; }; mSTEM = derive2 { name="mSTEM"; version="1.0-1"; sha256="0mh09mqqpq9k8jrxs9d39009idld3b4y98ik75czdy580jmdg7mm"; depends=[doParallel foreach latex2exp]; }; mSimCC = derive2 { name="mSimCC"; version="0.0.1"; sha256="1f15r214srcdb4yacmy4hq890a674iqd2s7bry5dk20k46qdl026"; depends=[doParallel foreach]; }; mStats = derive2 { name="mStats"; version="3.2.2"; sha256="0bvv2133813qfqbqx45x7g3h82jkz8b322ldjj89x2wxc7alwmhs"; depends=[]; }; @@ -10012,10 +10032,11 @@ in with self; { mangoTraining = derive2 { name="mangoTraining"; version="1.0-7"; sha256="0lw46j44jhdcyh079a7zjmxcnv5c6qsfachinlwv3ild1gwggr3p"; depends=[]; }; manhattanly = derive2 { name="manhattanly"; version="0.2.0"; sha256="185fkakx4v35n4gmlpk2kfm2bm8p320q4khkw936m09zx3aqz398"; depends=[ggplot2 magrittr plotly]; }; manhplot = derive2 { name="manhplot"; version="1.1"; sha256="17yw10gpfp6bqmilb09v61jd2amz6cv1z38si4nqnhbvmac065qd"; depends=[ggplot2 ggrepel gridExtra reshape2]; }; + manifestoR = derive2 { name="manifestoR"; version="1.4.0"; sha256="1rnqm9s91q6kff951402zxl3cmnl8j19ybg9vmcmcm7bjbv5w2l0"; depends=[base64enc dplyr DT functional htmltools htmlwidgets httr jsonlite magrittr NLP psych tibble tm zoo]; }; manipulate = derive2 { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; }; manipulateWidget = derive2 { name="manipulateWidget"; version="0.10.1"; sha256="1vi71sjh7z1a880wffk8qqw7iysvk42q78giqxmm2sqz2a912qlx"; depends=[base64enc codetools htmltools htmlwidgets knitr miniUI shiny webshot]; }; manymodelr = derive2 { name="manymodelr"; version="0.2.4"; sha256="13d1lgz22wpvbn56m32w5m1w2gk2jz0p3m2130lmwain4nb9rsmk"; depends=[caret dplyr e1071 ggplot2 magrittr Metrics plyr purrr reshape2 tibble]; }; - maotai = derive2 { name="maotai"; version="0.1.4"; sha256="1kzhizprdq5fmvhm0s1qyn0kcrm5qkc6wjggvngr1bjpnh9kkds9"; depends=[cluster Matrix mclust Rcpp RcppArmadillo Rdpack RSpectra shapes]; }; + maotai = derive2 { name="maotai"; version="0.1.5"; sha256="08cww0hh3ry3sjxx9wwnddjgqyzfxpikif3wyhfpqdwlrbsrnk4j"; depends=[cluster labdsv Matrix Rcpp RcppArmadillo RcppDist Rdpack RSpectra Rtsne shapes]; }; mapReasy = derive2 { name="mapReasy"; version="1.0"; sha256="13va0z967ckwxnnianki5aj66km0x6r37nj4mz9qd3b0bps4g2kj"; depends=[Hmisc rgdal sp]; }; mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; }; mapcan = derive2 { name="mapcan"; version="0.0.1"; sha256="1a4135wc1h4nzcv6xq0bg75i744wyq8p7q0ix7y2x2gb6s35w46k"; depends=[dplyr ggplot2 magrittr]; }; @@ -10031,10 +10052,10 @@ in with self; { maps = derive2 { name="maps"; version="3.3.0"; sha256="05i2ppl5z4p8rawgqmy3z4ia05fcblpq1vvrmrkgkkpdlhczx6hr"; depends=[]; }; mapsFinland = derive2 { name="mapsFinland"; version="0.1.1"; sha256="0kx9r28lvc6bbl478i9gyy58kbp5hi7akysyld87fxk5x0601j19"; depends=[]; }; mapsRinteractive = derive2 { name="mapsRinteractive"; version="1.0.0"; sha256="0lpmizhaan7zp201wjaq544wadizwpswch7sn6m3sjwn8rswg6av"; depends=[gstat raster rgdal rgeos sp]; }; - mapsapi = derive2 { name="mapsapi"; version="0.4.2"; sha256="1l7sp65ghdcli6ajkvlnhfizjq16mw2cmlf8jbif3al1vhbv4dvw"; depends=[bitops magrittr plyr sf xml2]; }; + mapsapi = derive2 { name="mapsapi"; version="0.4.5"; sha256="0qgdlwgc3rmkpdam4mk7jbs79l5mnzjxz5a763icvr1clgna6xn2"; depends=[bitops magrittr RgoogleMaps sf stars xml2]; }; maptools = derive2 { name="maptools"; version="0.9-9"; sha256="0v4llkxk8qs61vq4ykvaim4k23aagdaz0p62ns7zfq02sln3pfk9"; depends=[foreign lattice sp]; }; maptree = derive2 { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; }; - mapview = derive2 { name="mapview"; version="2.7.0"; sha256="1cqa7hw7h0n6ing87bq903ax2m4iw82xb2jdgl55z9v9rdhxp0xh"; depends=[base64enc brew htmltools htmlwidgets lattice leafem leaflet leafpop png raster Rcpp satellite scales sf sp svglite uuid viridisLite webshot]; }; + mapview = derive2 { name="mapview"; version="2.7.8"; sha256="1hj9yx85jskmh6qm5ljzjlkxcwjffvswlgi453kn2rp7xzxbyv9b"; depends=[base64enc htmltools htmlwidgets lattice leafem leaflet leafpop png raster satellite scales sf sp viridisLite webshot]; }; mar1s = derive2 { name="mar1s"; version="2.1.1"; sha256="1ljkvgxrramfx1rnp2rg6516mjxaa6s96amrnmqymnyjz7wlf37l"; depends=[cmrutils fda zoo]; }; march = derive2 { name="march"; version="3.1"; sha256="1y3ndnkxrqxavp7b5dwhn1mijhhn06k5b6iickzjr4bfmpfnk340"; depends=[]; }; marcher = derive2 { name="marcher"; version="0.0-2"; sha256="0hcxbfrwniih4kvx5sxhlffz1pc87kf52v8hvaf193rhhdykis5q"; depends=[magrittr Matrix minpack_lm mvtnorm numDeriv plyr RColorBrewer scales zoo]; }; @@ -10081,7 +10102,7 @@ in with self; { matrixcalc = derive2 { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; }; matrixpls = derive2 { name="matrixpls"; version="1.0.9"; sha256="13wsd0kbn77mjd5rkfdv9di8pxg898adrgdpqcyridvikjhqlh0j"; depends=[assertive lavaan MASS matrixcalc psych]; }; matrixsampling = derive2 { name="matrixsampling"; version="2.0.0"; sha256="05dbn7rj07jx1hj7i6k3akf11hysxg6v32kav9fvsqmiy2zkippa"; depends=[keep]; }; - matsbyname = derive2 { name="matsbyname"; version="0.4.12"; sha256="0pryr18xz06w9jlnq2wcy0nddlr456zqwcc4d8bfj1mm3mr9q9j7"; depends=[dplyr Hmisc magrittr purrr rlang tibble]; }; + matsbyname = derive2 { name="matsbyname"; version="0.4.13"; sha256="1sx6nqqndfs39dkim9c5gqxl4afacq2wkcnrj95byl5a24s3sw5d"; depends=[dplyr Hmisc magrittr purrr rlang tibble]; }; matsindf = derive2 { name="matsindf"; version="0.3.4"; sha256="0r8hs53c4xv7lldz8mzh3hy5jq64c3cza9yifjjzpwvlw42y631l"; depends=[dplyr magrittr matsbyname purrr rlang rlist tibble tidyr]; }; mau = derive2 { name="mau"; version="0.1.2"; sha256="1wgiai8f1kbjh9hfwv4m0kavd44ib5xb33p8m16zpawnw14m7sj5"; depends=[data_table ggplot2 gtools igraph RColorBrewer Rdpack stringr]; }; mauricer = derive2 { name="mauricer"; version="2.0.5"; sha256="01x1cigwr95hzyz1pm9w5xi2j9z4zf54p6bwhn0y865gln80wvnz"; depends=[beastier stringr]; }; @@ -10130,7 +10151,7 @@ in with self; { mclcar = derive2 { name="mclcar"; version="0.1-9"; sha256="0bwnivmajsrvmwskhk44qhz4nnc0irxq83g0kzbj4wshhivnwryp"; depends=[fields maxLik nleqslv rsm spam spdep]; }; mcll = derive2 { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; }; mclogit = derive2 { name="mclogit"; version="0.6.1"; sha256="1flq3g5jbp8nnx066wz35bg8wzlnnp9jp731w87vba483amakcds"; depends=[Matrix memisc]; }; - mclust = derive2 { name="mclust"; version="5.4.5"; sha256="0whandnda1fnjn5k3hgxdbp3b0xr7nlzy1j37saqb536h8q9dwkm"; depends=[]; }; + mclust = derive2 { name="mclust"; version="5.4.6"; sha256="1z46qask09x3xpv0wzvhn09218vwyrip4f5jrhnx96khpwvczzyl"; depends=[]; }; mclustcomp = derive2 { name="mclustcomp"; version="0.3.1"; sha256="0jdfdmgd46w7b38nbpd0lj9vqzi2nnf8fv0crj08lfin5ng7jvaa"; depends=[Rcpp RcppArmadillo Rdpack]; }; mcmc = derive2 { name="mcmc"; version="0.9-7"; sha256="0q42m8ab7b6bxhns494ksjdss5f3c5m2jjfdlfj6fk1nz7ax7i5p"; depends=[]; }; mcmcabn = derive2 { name="mcmcabn"; version="0.3"; sha256="0p4g7bnaq87kgfhsc3a8wdifngs4lb5il5wy9im81gz30ji9gbn7"; depends=[abn coda cowplot ggplot2 ggpubr gRbase]; }; @@ -10174,7 +10195,6 @@ in with self; { measurements = derive2 { name="measurements"; version="1.4.0"; sha256="1kihavs9vgxwqjm9z1zjjngkmcwfsv8dg7nn9nrv5r06k5hv8bz6"; depends=[]; }; measures = derive2 { name="measures"; version="0.2"; sha256="1pp6nz30fbsqsvznim9j4vvz3z57sq5r234807flxfy0w7knydbd"; depends=[]; }; meboot = derive2 { name="meboot"; version="1.4-7"; sha256="1i0h71aj49hyj889447s611gz668ys7xlr1i82b5nvaf6chfbfin"; depends=[dynlm nlme]; }; - mechkar = derive2 { name="mechkar"; version="1.14.6"; sha256="1yrxp0qkfr96sf8lprn33cjfjmpkhpw0wpbz7w2600a923zdhwqc"; depends=[car coxphw dplyr ggplot2 givitiR gmodels Hmisc InformationValue MASS pROC ResourceSelection rlang ROSE tibble writexl]; }; medExtractR = derive2 { name="medExtractR"; version="0.1"; sha256="08hzl5kk3jqs8vc53zrd1qj5g24dkpvwwvswqp57719c4ybi3ia3"; depends=[stringr]; }; mederrRank = derive2 { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; }; medfate = derive2 { name="medfate"; version="0.9.0"; sha256="0vxrj9x9f975vxfjsv83riyazlvbpn5q9z49ywnayiikn1snbrnh"; depends=[ggplot2 meteoland Rcpp sp spdep]; }; @@ -10212,7 +10232,7 @@ in with self; { merlin = derive2 { name="merlin"; version="0.0.2"; sha256="0r1hxbpqhih0nyya26hphymz4jrw88zfd3bypf1hwj5dsk60341f"; depends=[MASS randtoolbox statmod survival]; }; merror = derive2 { name="merror"; version="2.0.2"; sha256="13d9r5r83zai8jnzxaz1ak40876aw20zbpr244gs55rvj5j7f87q"; depends=[]; }; messaging = derive2 { name="messaging"; version="0.1.0"; sha256="0q19cqp1zgh0yhk1ql0jqf414bhx6jwhkairq6wx2cmkli2g7k1y"; depends=[dplyr glue magrittr rlang stringr]; }; - metR = derive2 { name="metR"; version="0.6.0"; sha256="0z2s84i953l5wa0pa9zkspk4hjjgrd9j2ssn5ahgqriqg65w29q2"; depends=[checkmate data_table digest fields Formula formula_tools ggplot2 gtable lubridate memoise plyr purrr scales sp stringr]; }; + metR = derive2 { name="metR"; version="0.7.0"; sha256="0zdnsggvmkyxq0a6n7rhzp82n4hciayzajs4svw504i30ij5q5db"; depends=[checkmate data_table digest fields Formula formula_tools ggplot2 gtable lubridate memoise plyr purrr RCurl scales sp stringr]; }; metRology = derive2 { name="metRology"; version="0.9-28-1"; sha256="1syjwblyd18myxrs0hx4m91fgb6zs3r4g7w701j2f2pw6j9mvz0y"; depends=[MASS numDeriv robustbase]; }; metScanR = derive2 { name="metScanR"; version="1.2.3"; sha256="1v7zrxj3wspx6f5n5s75skcygbf3r85rn4p0z9iwbrbrgxwi4qgs"; depends=[geosphere leaflet matlab plyr RCurl]; }; meta = derive2 { name="meta"; version="4.11-0"; sha256="06miv0yjxqxabi9iff08hydzb6qjdahy3dswxgkdp5zybma6dva6"; depends=[CompQuadForm lme4 metafor]; }; @@ -10240,27 +10260,27 @@ in with self; { metaforest = derive2 { name="metaforest"; version="0.1.3"; sha256="1q6m60cd7gl7y0gdjd10ky25hwv5jc4x5g5sr5w61xc3j2hnw8in"; depends=[data_table ggplot2 gtable metafor ranger]; }; metafuse = derive2 { name="metafuse"; version="2.0-1"; sha256="1zdw22f5kzvy2xr3c2csy873hcags60as567brc2sw17d0apfy8j"; depends=[evd glmnet MASS Matrix]; }; metagam = derive2 { name="metagam"; version="0.1.0"; sha256="1mya00bvbxz3fg506s4km1193yamgzqqq8v6v286jcp19w4jr07s"; depends=[dplyr furrr ggplot2 knitr metafor metap purrr rlang stringr tibble tidyr viridis]; }; - metagear = derive2 { name="metagear"; version="0.5"; sha256="12q8g8dwz3xb31kqlj9d2k8czmkibcr3ll9s0xdl756pf5408l6y"; depends=[EBImage hexView MASS Matrix metafor RCurl stringr]; }; + metagear = derive2 { name="metagear"; version="0.6"; sha256="1xfpjqawnwsg2djnygzyg6ak7gylj60wlhfkkipnrpy8bbpvc8j2"; depends=[EBImage hexView MASS Matrix metafor RCurl stringr]; }; metagen = derive2 { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[BatchExperiments BatchJobs BBmisc ggplot2 lhs MASS metafor ParamHelpers plyr]; }; metaheuristicOpt = derive2 { name="metaheuristicOpt"; version="2.0.0"; sha256="0ra4hl9l1jlzymj218m2i6xrxfacyx4aaln5pk7q4di2ks0nq11m"; depends=[]; }; metamedian = derive2 { name="metamedian"; version="0.1.5"; sha256="1v2nha2qc9vs2s9nfvbia033ppprkwxj5fadlrpy20fj2lr8z7z6"; depends=[estmeansd Hmisc metafor]; }; metamer = derive2 { name="metamer"; version="0.2.0"; sha256="0wdhr83mph9v7vb9mfhf7lcwmp0smz72sniass7kxcbj6j9hga4g"; depends=[FNN progress]; }; metamicrobiomeR = derive2 { name="metamicrobiomeR"; version="1.1"; sha256="16ymdhhr7h2785gfgrw7qi1fjvawiz599h42qi7l0v6djinbxlw2"; depends=[caret compositions dplyr foreign gamlss gdata ggplot2 gplots gridExtra httr jsonlite knitr lme4 lmerTest magrittr matrixStats meta mgcv plyr randomForest RColorBrewer RCurl repmis reshape2 rmarkdown tidyr zCompositions]; }; metamisc = derive2 { name="metamisc"; version="0.2.2"; sha256="0ll245a3f442n7jyjshcn87l725mgk132ri73kynrwh0z8g2r7i5"; depends=[ggplot2 lme4 metafor mvtnorm plyr pROC]; }; - metan = derive2 { name="metan"; version="1.4.0"; sha256="0wzq2r22yzi7cr2algxq4fgmz58hv8zhk03r3qzhdvvxrm66rd9q"; depends=[ade4 cowplot dendextend dplyr FWDselect GGally ggforce ggplot2 ggrepel lme4 lmerTest magrittr progress purrr rlang tibble tidyr tidyselect]; }; - metansue = derive2 { name="metansue"; version="2.3"; sha256="18vy294862lfgxiw9cikai9svy3wpwk2bvz3vp20fcslg90mn3xp"; depends=[]; }; + metansue = derive2 { name="metansue"; version="2.4"; sha256="1ja7a3z4d764a1rcf256kmzf8xc6d8x7mqq12vzznw5ks8r2p9hk"; depends=[]; }; metap = derive2 { name="metap"; version="1.3"; sha256="1jmmmmjiklaxfl604hwqil193ydaghvd5jv8xsr4bx3pzn5i9kvz"; depends=[lattice mutoss Rdpack TFisher]; }; metaplot = derive2 { name="metaplot"; version="0.8.3"; sha256="1zw8bq2fy9m15dfc92ag0dz2k9dqrf5jbvfaycizcgsgaqd79s1c"; depends=[dplyr encode ggplot2 gridExtra gtable lattice magrittr rlang scales tidyr]; }; metaplotr = derive2 { name="metaplotr"; version="0.0.3"; sha256="01iala6cxsxv30fnlh80md5mpy3ksd2piw90zcls8f68g1c6v1jy"; depends=[ggplot2 gridExtra]; }; metaplus = derive2 { name="metaplus"; version="0.7-11"; sha256="05pkgw0zlq3q9mvdw2yxz9mxzqwq3c8q6cwvh87cigw1pf8y9an7"; depends=[bbmle boot fastGHQuad lme4 MASS metafor numDeriv]; }; metapost = derive2 { name="metapost"; version="1.0-6"; sha256="098f7sifg814mc4sb1nb4d6dlr1xms5hwyp08ksxg0i4ayf9jf3c"; depends=[gridBezier]; }; + metapower = derive2 { name="metapower"; version="0.1.0"; sha256="0y1s7szljpx763dm38nnm5q54x7paq0hn7l47c3vyjha99fpzzjw"; depends=[cowplot dplyr ggplot2 knitr magrittr rlang rmarkdown testthat tidyr]; }; metapro = derive2 { name="metapro"; version="1.5.8"; sha256="0ymbqzm317fiywzxaizddhvjzwp2wyx9y7zgbg4nrz11l3r2bp2n"; depends=[metap rSymPy]; }; metarep = derive2 { name="metarep"; version="1.0.1"; sha256="0jnxx11jxj63ry0bkjlh9g2x2pr2qi24nql99iibz2ckbx8344p3"; depends=[meta]; }; metasens = derive2 { name="metasens"; version="0.4-0"; sha256="1rgb2b48lwvrg1f39dzg6d9jr1ya2p7la2jrc3zs3jks28arjr2x"; depends=[meta]; }; metatest = derive2 { name="metatest"; version="1.0-5"; sha256="1h3dcs1m7606b3a41yw2lak3lrqmsbpnx67qv24wvq003apz1sfd"; depends=[]; }; metathis = derive2 { name="metathis"; version="1.0.2"; sha256="07aha4j401zlm6abfmq70vqc215bpsi5hqi50npz33rpb1m3r9rq"; depends=[htmltools knitr magrittr purrr]; }; metavcov = derive2 { name="metavcov"; version="1.1"; sha256="1x87knvypkfg0x223aiak7fy7zdlfn74crmvnqzhxf2vmxljnvnh"; depends=[corpcor]; }; - metaviz = derive2 { name="metaviz"; version="0.3.0"; sha256="1ayz9za3zwmyna1hanzm83gb7vw3dclj3z4g35rk5dz6s4zgqsvm"; depends=[dplyr ggplot2 ggpubr gridExtra metafor nullabor RColorBrewer]; }; + metaviz = derive2 { name="metaviz"; version="0.3.1"; sha256="0jvv49rw66v7saj2y1q88rp6fyzq7473af5d3k77ymvjbpqyrbyz"; depends=[dplyr ggplot2 ggpubr gridExtra metafor nullabor RColorBrewer]; }; metawho = derive2 { name="metawho"; version="0.2.0"; sha256="1mflkrlnb1wk9vbbj621cy64s78q677d8fcnsi1ybh49k7sqmw20"; depends=[dplyr forestmodel magrittr metafor purrr rlang]; }; meteR = derive2 { name="meteR"; version="1.2"; sha256="02637d3dnfq0jv9d74y99x7ms89y3jcmkpazc44g44sa7jx4i510"; depends=[distr nleqslv]; }; meteo = derive2 { name="meteo"; version="0.1-5"; sha256="0n37plka9vsxwd03lca3h6m8dcz3f1bi46jn3bz7vyilnkq9hcdk"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; }; @@ -10279,14 +10299,14 @@ in with self; { mexhaz = derive2 { name="mexhaz"; version="1.7"; sha256="1z0516i7asyn3248xzvvc377slcy2zv6f9qalkd33r3dlc0js4s8"; depends=[lamW MASS numDeriv statmod survival]; }; mfGARCH = derive2 { name="mfGARCH"; version="0.1.9"; sha256="0vmxyjg2jj39dd1307d5jwz3033j8ldfqhysmmzl3i1b5ypfd5q5"; depends=[maxLik numDeriv Rcpp zoo]; }; mfbvar = derive2 { name="mfbvar"; version="0.5.3"; sha256="065bpwlzqmvgrdm9jp8030jcs4sqnckyxvrgdn0jcnmmgiq88vgx"; depends=[dplyr ggplot2 GIGrvg lubridate magrittr Rcpp RcppArmadillo RcppParallel RcppProgress stochvol tibble]; }; - mfe = derive2 { name="mfe"; version="0.1.4"; sha256="1lif39zr6x1ysv8s90b1wgshp5pa175fxcjvx0hz6g15d29gwgy6"; depends=[cluster clusterCrit e1071 ECoL infotheo MASS rpart rrcov]; }; + mfdb = derive2 { name="mfdb"; version="6.2-0"; sha256="11xi915plc90awasmny9ynwmz0yw18frfp1q2xv7bqk4v96fcxgp"; depends=[DBI getPass logging RPostgreSQL]; }; mfp = derive2 { name="mfp"; version="1.5.2"; sha256="1i90ggbyk2p1ym7xvbf4rhyl51kmfp6ibc1dnmphgw15wy56y97a"; depends=[survival]; }; mfx = derive2 { name="mfx"; version="1.2-2"; sha256="04pwp67i4sn4rf497pgy6qifwvrcmwyxn8x5sn96fy8qyrdzjfhj"; depends=[betareg lmtest MASS sandwich]; }; mgarchBEKK = derive2 { name="mgarchBEKK"; version="0.0.2"; sha256="1k4c34srnckbh5kchzmm44l91ma9sw0gi4y225igs3cl79212q9c"; depends=[mvtnorm tseries]; }; mgcViz = derive2 { name="mgcViz"; version="0.1.6"; sha256="12isaqpbhdg2qhw76wj6hqi233dw3md061bbirkgzr5clrb8kxlk"; depends=[gamm4 GGally ggplot2 gridExtra KernSmooth matrixStats mgcv miniUI plyr qgam rgl shiny viridis]; }; mgcv = derive2 { name="mgcv"; version="1.8-31"; sha256="1if34mqsn9r7g0l82lxvvx0wjhi9paqdymyd73nschxcl1if8vbk"; depends=[Matrix nlme]; }; mglmn = derive2 { name="mglmn"; version="0.0.2"; sha256="1ijkmr85s4yya0hfwcyqqskbprnkcbq8sc9c889i0gy0543fgqz4"; depends=[mvabund snowfall]; }; - mgm = derive2 { name="mgm"; version="1.2-7"; sha256="1s0m9xjq2d067ba2cx87q83nqmdza34vw9g0g0mqd8ap53rmqhas"; depends=[glmnet gtools Hmisc matrixcalc qgraph stringr]; }; + mgm = derive2 { name="mgm"; version="1.2-9"; sha256="0fbri6a6g36cpqw577hdmy2qyj8hd2zkaafj7s5564y1z7xkxn4x"; depends=[glmnet gtools Hmisc matrixcalc qgraph stringr]; }; mgpd = derive2 { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[corpcor evd fields numDeriv]; }; mgsub = derive2 { name="mgsub"; version="1.7.1"; sha256="0v3386a7i71ixqidqfqakl428rnq0z9pjz08lgmyvray0ls5vmvi"; depends=[]; }; mgwrsar = derive2 { name="mgwrsar"; version="0.1"; sha256="13h56fgq3fs28fqh19hwbcza622xd921qnjwcgw2rjwaabqz70w5"; depends=[doParallel foreach htmltools leaflet Matrix nabor Rcpp RcppEigen sp spgwr]; }; @@ -10329,7 +10349,7 @@ in with self; { midas = derive2 { name="midas"; version="1.0.1"; sha256="1alqxk23651jnkg0xn4rpvk71z5rhvx3y0wjrgkw2qw95s7jjn72"; depends=[shiny xml2]; }; midasr = derive2 { name="midasr"; version="0.7"; sha256="02kjyzbznmy0362ambnnh8vc7ywbgikk3n7705sww9p0k0pywrrx"; depends=[forecast Formula MASS Matrix numDeriv optimx quantreg sandwich texreg zoo]; }; midastouch = derive2 { name="midastouch"; version="1.3"; sha256="1pjzcf0hjfhr5p0la8pz1njw7bhfrcrzpqfsdqk2z5c6dbh4awzq"; depends=[]; }; - midrangeMCP = derive2 { name="midrangeMCP"; version="1.3"; sha256="1733dlhzbgrjdzd88rh9dkqhxh05gr078sbmihab7whbrpsq8068"; depends=[SMR WriteXLS xtable]; }; + midrangeMCP = derive2 { name="midrangeMCP"; version="2.1"; sha256="0blvwyvvv5gvnwnlawmqyj00ziwchxk9f39f5nc8d066pwh3mcw4"; depends=[gWidgets gWidgetsRGtk2 pacman SMR writexl xtable]; }; migest = derive2 { name="migest"; version="1.8.1"; sha256="12gk1ip1kw3x35bazxqqjf1drbs2h7kpgzbh5psd6ppphj81dzjg"; depends=[dplyr magrittr mipfp purrr stringr tidyr]; }; migration_indices = derive2 { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; }; migui = derive2 { name="migui"; version="1.1"; sha256="1qchjsc7ff2b6s9w6ncj9knjv6pyp90jd4jxljn2rr1ix1gc45za"; depends=[arm gWidgets2 mi]; }; @@ -10339,7 +10359,7 @@ in with self; { mime = derive2 { name="mime"; version="0.9"; sha256="107sqarmyhxlch5nrg796i5z03p9mshskisiq2fm628ajk99gkrc"; depends=[]; }; mimi = derive2 { name="mimi"; version="0.2.0"; sha256="1ig34qd37my74nmlv3jcfrj7cnd55alxpf2flf2sssk2ws1y56xh"; depends=[data_table doParallel FactoMineR foreach glmnet rARPACK softImpute]; }; mimsy = derive2 { name="mimsy"; version="0.4.3"; sha256="1mj0g2j0fw3j36r59yad7bfqhpjl1mjlca9fmmvxfjr878b4ld5g"; depends=[dplyr lubridate magrittr openxlsx]; }; - minMSE = derive2 { name="minMSE"; version="0.1.1"; sha256="11m34nmxi2v80lsix8k44vl8ms5541js4av6h3pvx11px3i3c841"; depends=[MASS]; }; + minMSE = derive2 { name="minMSE"; version="0.3.1"; sha256="0xzd2hw7ga5fi54d35vr9n3sbnp6acak27fl4lv089sn1ig6s95p"; depends=[MASS]; }; mindr = derive2 { name="mindr"; version="1.2.3"; sha256="1slglva5ipbzj748k7rxvlw6g2iqdkvyf8qnplnzcjc2qsjljd1q"; depends=[data_tree htmlwidgets jsonlite knitr]; }; mineCitrus = derive2 { name="mineCitrus"; version="1.0.0"; sha256="031nfhrsc5rlqls3vyrk18lx0pd4ssdk96cmfr4ifaciz0rgv8h2"; depends=[ggplot2]; }; mined = derive2 { name="mined"; version="1.0-2"; sha256="1py6gylya8dhmxcyfrcwbwc5q226m041rs3cmj4q0dhqy8iy2zsw"; depends=[Rcpp RcppEigen]; }; @@ -10360,7 +10380,8 @@ in with self; { minxent = derive2 { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; }; mipfp = derive2 { name="mipfp"; version="3.2.1"; sha256="1gxazpg81vj5dywpb6jb29188jw28qil6pfygawa7znnjn3k5ca6"; depends=[cmm numDeriv Rsolnp]; }; mipred = derive2 { name="mipred"; version="0.0.1"; sha256="0kijn2xj0dh28rm2sjgd8j1a3c5avc3fjfvvcmzfasvxqdjflv6j"; depends=[mice]; }; - mirt = derive2 { name="mirt"; version="1.31"; sha256="1jfpb69ih0kyffjf9k7z8yhfyw6ngqhkjxmpzgmm0v8lr2mnw0gq"; depends=[dcurver Deriv GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; }; + miraculix = derive2 { name="miraculix"; version="0.9.20"; sha256="0s5r7ikym3s85706wznfc3lh3ap95pv1p2796bi1n19ivd671myc"; depends=[RandomFieldsUtils]; }; + mirt = derive2 { name="mirt"; version="1.32"; sha256="14xijqfyvhp7272n8h89kayi7va3cn2j02gw0fdxivfjlbqa03d2"; depends=[dcurver Deriv GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; }; mirtCAT = derive2 { name="mirtCAT"; version="1.9.3"; sha256="1yd03rkviqxl9rsqnny3fgn2rj0hss49nav11b9w4np8lv9zkwgh"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; }; misaem = derive2 { name="misaem"; version="0.9.2"; sha256="0awn0dvriycgmrx31ibckwjm2cq1wxrqjjjaq0bjgjsl37f4xnkk"; depends=[MASS mvtnorm]; }; misc3d = derive2 { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; }; @@ -10415,7 +10436,7 @@ in with self; { mixor = derive2 { name="mixor"; version="1.0.4"; sha256="1l296z0a3kamb1m94pfx3vczp36pa0np101fy5c23kh45s59pbs7"; depends=[survival]; }; mixreg = derive2 { name="mixreg"; version="0.0-6"; sha256="04g863yxrlj0wqsmzzxph5110g3gjk094r59zzk0b9r89m8vhpsl"; depends=[]; }; mixsep = derive2 { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; }; - mixsmsn = derive2 { name="mixsmsn"; version="1.1-6"; sha256="0zlbs0yn336xdzymrb065rbg1zj8f7zri77lmd7c4w1rxhfjh9a9"; depends=[mvtnorm]; }; + mixsmsn = derive2 { name="mixsmsn"; version="1.1-7"; sha256="1xw8bxkivp50ax0ygsravmzmksdqqg9fdm3hwpl39ikhj0cpa7zr"; depends=[mvtnorm]; }; mixsqp = derive2 { name="mixsqp"; version="0.3-17"; sha256="0dmk5xpgq55bwdjfrnv6frfx708frszscx03h8l9cdsj3l1d002n"; depends=[irlba Rcpp RcppArmadillo]; }; mixtNB = derive2 { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; }; mixtools = derive2 { name="mixtools"; version="1.2.0"; sha256="08whic8hmmzi55b7azwj11l2x5r9s5qbyrv7s9jr08156vqkw0zg"; depends=[kernlab MASS segmented survival]; }; @@ -10424,7 +10445,7 @@ in with self; { mize = derive2 { name="mize"; version="0.2.3"; sha256="1rc3mhcwidmfbkfyxwldm9hg25lh7a81jlj2zv45vsj5hbrmvk6c"; depends=[]; }; mizer = derive2 { name="mizer"; version="2.0.0"; sha256="152bjz37b1sjg1x9sl6286hisk2qpcckfh4gxw1wbdn7kh99law1"; depends=[assertthat deSolve dplyr ggplot2 plotly plyr progress Rcpp reshape2]; }; mkde = derive2 { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[raster Rcpp sp]; }; - mkin = derive2 { name="mkin"; version="0.9.49.9"; sha256="14wnmyrhf6b6cswgfv1a8caji1zk2r1xphg59fgw7527zbdzqm0r"; depends=[deSolve inline lmtest numDeriv pkgbuild R6]; }; + mkin = derive2 { name="mkin"; version="0.9.49.11"; sha256="1palzxv5vyk5hnc09mwja3xz42r3mqpqlcn5rc8kxkm4kg0z3v4c"; depends=[deSolve inline lmtest nlme numDeriv pkgbuild purrr R6]; }; mknapsack = derive2 { name="mknapsack"; version="0.1.0"; sha256="1kzmx7d512681a4hjirfgcd7a8rvndb4da66p16gms5nnxzsby9c"; depends=[assertthat data_table lpSolve]; }; mkssd = derive2 { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; }; mlPhaser = derive2 { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; }; @@ -10442,7 +10463,7 @@ in with self; { mlergm = derive2 { name="mlergm"; version="0.5"; sha256="145004r8xihphsng8pna430a8rqg0ibqx92jwyjkn7hzpx17p7xf"; depends=[cowplot ergm GGally ggplot2 lpSolve Matrix network plyr reshape2 sna stringr]; }; mleur = derive2 { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; }; mlf = derive2 { name="mlf"; version="1.2.1"; sha256="09ihnibpknpp26hdlbxyr99yz7z0n8qpsjs5aq3zngng0yh3wdn9"; depends=[]; }; - mlflow = derive2 { name="mlflow"; version="1.7.0"; sha256="1hdqdwj8j59a2x15alihv0p8hz4hlr9pk6c1qkyimcgfbvj8py04"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr reticulate rlang swagger tibble withr xml2 yaml zeallot]; }; + mlflow = derive2 { name="mlflow"; version="1.8.0"; sha256="03pdn05zgiz8plgf69nw4ji1fkzphampn7pk7ljf6w5dssznjja9"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr reticulate rlang swagger tibble withr xml2 yaml zeallot]; }; mlgt = derive2 { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; }; mlica2 = derive2 { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; }; mlmRev = derive2 { name="mlmRev"; version="1.0-8"; sha256="0ln4nazhc1prnlmvhfzhx268vx3klb0xnz1nsiwh0pwyskskyzym"; depends=[lme4]; }; @@ -10454,15 +10475,15 @@ in with self; { mlogit = derive2 { name="mlogit"; version="1.0-3.1"; sha256="034vymf296abpajkic303j0x4mak62m8iav86k3d3g6hy3c03dp4"; depends=[Formula lmtest MASS Rdpack statmod zoo]; }; mlogitBMA = derive2 { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[abind BMA maxLik]; }; mlr = derive2 { name="mlr"; version="2.17.1"; sha256="0fwjl5dy516vrh2lx5rgps85q0jz8ka5dx61bz7lfxk21k8bjw8b"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; }; - mlr3 = derive2 { name="mlr3"; version="0.1.8"; sha256="02928qw5yc2zhfj69zrnmz0zraq2xf5vb7q7d11np2wdb0vsj1zk"; depends=[backports checkmate data_table digest lgr mlbench mlr3measures mlr3misc paradox R6 uuid]; }; + mlr3 = derive2 { name="mlr3"; version="0.2.0"; sha256="049wabal63560k0mlhn0rwydd50kjwlz56xygyqd18hhfjcnf6m1"; depends=[backports checkmate data_table digest lgr mlbench mlr3measures mlr3misc paradox R6 uuid]; }; mlr3data = derive2 { name="mlr3data"; version="0.1.0"; sha256="0cdicfrrmba87adkcnpzm9gkcspjskqsbs8xryj1d0c48lzws7ab"; depends=[]; }; mlr3db = derive2 { name="mlr3db"; version="0.1.5"; sha256="09hins00pc569vz26mkyg3736vhl01szl8hbwp2vyrh3mdn21c9m"; depends=[backports checkmate data_table digest dplyr mlr3 R6]; }; mlr3filters = derive2 { name="mlr3filters"; version="0.2.0"; sha256="1dps9v4w82qnhvlrshwpaqppjmy405syp4qdirm456ydfw2gywcy"; depends=[backports checkmate data_table mlr3 mlr3misc paradox R6]; }; - mlr3learners = derive2 { name="mlr3learners"; version="0.1.6"; sha256="1wifc8757klkcb84pvs602wa3kc2n7g4vz0m63a83vgxwghlpp6q"; depends=[data_table mlr3 mlr3misc paradox R6]; }; + mlr3learners = derive2 { name="mlr3learners"; version="0.2.0"; sha256="1r9f31wlhqwpslb2sgj6x3akggqdmnglb3s44zfhy6mqi1fwdgxn"; depends=[data_table mlr3 mlr3misc paradox R6]; }; mlr3measures = derive2 { name="mlr3measures"; version="0.1.3"; sha256="1hvhpshmdd76136srndd60d5xijpil5daf392y9lalqq0if6903d"; depends=[checkmate]; }; - mlr3misc = derive2 { name="mlr3misc"; version="0.1.8"; sha256="168d6az4paf3am4id6c9dnsyggnac3ccazr14594zs87a6cv87mn"; depends=[backports checkmate data_table R6]; }; + mlr3misc = derive2 { name="mlr3misc"; version="0.2.0"; sha256="0gynix0l0dzx6zjkw4fmb1rcyfp5vf4hvszf4ny2aqv3pggb03a8"; depends=[backports checkmate data_table R6]; }; mlr3pipelines = derive2 { name="mlr3pipelines"; version="0.1.3"; sha256="0qkhd4gcfh3higz0zqgrblxj70pszg8xb6l5flwp08hlwj1cw44j"; depends=[backports checkmate data_table digest mlr3 mlr3misc paradox R6 withr]; }; - mlr3proba = derive2 { name="mlr3proba"; version="0.1.4"; sha256="13bmpn20hkh19lhp6hpi9lbz8y5fily2mr5j931dm7839zc735q4"; depends=[checkmate data_table distr6 mlr3 mlr3misc mlr3pipelines paradox R6 survival]; }; + mlr3proba = derive2 { name="mlr3proba"; version="0.1.5"; sha256="1vnykzqbd27qaknxkcji17ld81z24hxwiw9d04m68vb8v62fkrag"; depends=[checkmate data_table distr6 mlr3 mlr3misc mlr3pipelines paradox R6 survival]; }; mlr3shiny = derive2 { name="mlr3shiny"; version="0.1.1"; sha256="0jn5n6k1dq59g5m6pvpp964pcjv1mjbdbdz7dag7gs26g8c215jb"; depends=[data_table DT e1071 mlr3 mlr3learners mlr3measures plyr purrr ranger readxl shiny shinyalert shinydashboard shinyjs shinythemes shinyWidgets stringr]; }; mlr3tuning = derive2 { name="mlr3tuning"; version="0.1.2"; sha256="0559jj4xbzg63df2rn0sw6r6fz5b463k2lcx83l4q3mki72pl9xx"; depends=[checkmate data_table lgr mlr3 mlr3misc paradox R6]; }; mlr3verse = derive2 { name="mlr3verse"; version="0.1.1"; sha256="1spwmylnsks479nkj688nd8h3slkh8cnmrxrvh7s2zyqla6arigx"; depends=[mlr3 mlr3db mlr3filters mlr3learners mlr3misc mlr3pipelines mlr3tuning mlr3viz paradox]; }; @@ -10505,6 +10526,7 @@ in with self; { mnormpow = derive2 { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; }; mnormt = derive2 { name="mnormt"; version="1.5-6"; sha256="0k8y08gj6z525yvc7y3dl2kzgnafbj3i7lvpamypsmqxf74zql99"; depends=[]; }; mnreadR = derive2 { name="mnreadR"; version="2.1.4"; sha256="11mfpf12pjpgvcih6q8l9fwspj2gy78fcirimzv7gn061nr4v7sg"; depends=[dplyr ggplot2 nlme tibble tidyr]; }; + mnt = derive2 { name="mnt"; version="1.0"; sha256="1an80q0gv65fd9av9kd5lic6z0g3w3ai2v8asgcvfqrdd87f3piw"; depends=[MASS pracma]; }; mob = derive2 { name="mob"; version="0.1.0"; sha256="0zxp02fl514wb3apcyg072wdydqbnbfqkjj9gq5ql1kkvgh9wqf8"; depends=[gbm Hmisc Rborist]; }; mobForest = derive2 { name="mobForest"; version="1.3.1"; sha256="1g5yfs70abl7pacprijlwdq3l72aqkbqs09z1pmw64wv4wa1vm25"; depends=[modeltools party sandwich strucchange zoo]; }; mobsim = derive2 { name="mobsim"; version="0.1.0"; sha256="077hw1162giwc90y5dvj9052i5hxdf2ii29m9q8ky028375dsd0f"; depends=[Rcpp sads vegan]; }; @@ -10524,8 +10546,9 @@ in with self; { modeest = derive2 { name="modeest"; version="2.4.0"; sha256="087dw0013y4m7fcl06mxylh9lnp6acysl80d80r9srv4pw4r950s"; depends=[fBasics stable stabledist statip]; }; modehunt = derive2 { name="modehunt"; version="1.0.7"; sha256="0qz9kmf1qfs2dr7kzm9l7ac0h5rvi3b9j9896p991sk4bcalsl0b"; depends=[]; }; model4you = derive2 { name="model4you"; version="0.9-5"; sha256="1l94196x594ff61f8iaywpmw9ra3g27bnlchjl14hb9h0l21vbgm"; depends=[Formula ggplot2 gridExtra partykit sandwich survival]; }; + modelDown = derive2 { name="modelDown"; version="1.1"; sha256="1l0aggkh0ykpqrp59bdz1cyl1ai397cw4hya80b7fm7s49imwczg"; depends=[archivist auditor breakDown DALEX devtools drifter DT ggplot2 kableExtra psych svglite whisker]; }; modelObj = derive2 { name="modelObj"; version="4.0"; sha256="1py2y80x37mmnl2y0pxdbhqkjrln6x210hg0g224d34lxk71m172"; depends=[]; }; - modelStudio = derive2 { name="modelStudio"; version="1.0.1"; sha256="0lghbxa27kyg1m8d3n8a6z9b248nzi4ahzvm221gbvxjgk0mrgi4"; depends=[iBreakDown ingredients jsonlite progress r2d3]; }; + modelStudio = derive2 { name="modelStudio"; version="1.0.2"; sha256="0n3hghhw255nfcfrngbbcldvfy96cc13qlim6palmaln4zqhxsi0"; depends=[digest iBreakDown ingredients jsonlite progress r2d3]; }; modelbased = derive2 { name="modelbased"; version="0.1.2"; sha256="0440pckpw9vfbvvhxsikayb0b6k479icr2m9ps0yr0xph240x9hw"; depends=[bayestestR emmeans insight parameters]; }; modeldata = derive2 { name="modeldata"; version="0.0.1"; sha256="0dzjgb5g60hgqppxvzin8m51clkw8d89if7dw5ha46j2paw1n5r9"; depends=[]; }; modeldb = derive2 { name="modeldb"; version="0.2.2"; sha256="14s8xh05qxv414xcnww1b3s0jqwnjb3l1dqf7q1qbw33ilwcmsfb"; depends=[dplyr ggplot2 progress purrr rlang tibble tidypredict]; }; @@ -10534,7 +10557,7 @@ in with self; { modelplotr = derive2 { name="modelplotr"; version="1.0.0"; sha256="1b1pcah28b2fsr5l7v3lwxgvl03jr2cyxk5x5plnc3vwy5g0bnpm"; depends=[dplyr ggfittext ggplot2 gridExtra magrittr RColorBrewer rlang scales]; }; modelr = derive2 { name="modelr"; version="0.1.6"; sha256="1x2m34m4qirb401krmgc5wg3g7ndbcglfab2l0655rmky3fz7rfp"; depends=[broom dplyr magrittr purrr rlang tibble tidyr tidyselect]; }; modelsummary = derive2 { name="modelsummary"; version="0.2.0"; sha256="16z9cdjdg8inp21sq54sc0s30w09draznq8x2zyg5cmsilrbn9p7"; depends=[broom checkmate dplyr generics gt magrittr purrr stringr tibble tidyr]; }; - modeltests = derive2 { name="modeltests"; version="0.1.0"; sha256="00g6jc41caxz2fqynv1pcwdabzwhppqmrrf2x4xzlxpf9sfxr919"; depends=[dplyr generics purrr testthat tibble]; }; + modeltests = derive2 { name="modeltests"; version="0.1.1"; sha256="0s6bnc2q0qxa3v92bsz5xczi4f9nhqz78vzb5jldjwlm4lwwy0xf"; depends=[dplyr generics purrr testthat tibble]; }; modeltools = derive2 { name="modeltools"; version="0.2-23"; sha256="1vqh69256h344sbj5affm0kmc77dakrxp6442xfdnfd0y5d8sgkb"; depends=[]; }; modelwordcloud = derive2 { name="modelwordcloud"; version="0.1"; sha256="0ardib0h923i7jk8bgcq6pn2zazx9acf9sdggifsk46hdz8hvqnm"; depends=[]; }; moderndive = derive2 { name="moderndive"; version="0.4.0"; sha256="16fbr80v0f5v6is19d5zh9s2qgqw2cb5q71lna7lp0hi22xljl98"; depends=[broom dplyr formula_tools ggplot2 glue infer janitor knitr magrittr rlang stringr tibble]; }; @@ -10543,14 +10566,12 @@ in with self; { modi = derive2 { name="modi"; version="0.1.0"; sha256="0v78vzb22v2h2qlfhsyi0d2j3c2gj3wgv67p6gv74269kiaglf92"; depends=[MASS norm]; }; modifiedmk = derive2 { name="modifiedmk"; version="1.5.0"; sha256="171l3ls7icaanqf6jb64jabwq0mis2g1fswr0jfkpkrw5iw1c66q"; depends=[boot]; }; modiscloud = derive2 { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date raster rgdal sfsmisc sp]; }; - modmarg = derive2 { name="modmarg"; version="0.9.2"; sha256="1clyfvn5k87nyh5cj4b0yi2zkavwvnirhlirxkzi8m2qijdl9vgh"; depends=[]; }; modopt_matlab = derive2 { name="modopt.matlab"; version="1.0-2"; sha256="0g5mswalv4y7p1k3n8a6qf7wb072m4bjq2ml2j83dz2j2bmvygsd"; depends=[ROI ROI_plugin_glpk ROI_plugin_quadprog]; }; moduleColor = derive2 { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut impute]; }; modules = derive2 { name="modules"; version="0.8.0"; sha256="1xzlnnl4ka9h4qwq4gg65pzhacq9ip6v347yrhms14c86a851k8k"; depends=[]; }; modygliani = derive2 { name="modygliani"; version="1.0"; sha256="01g96cdm4hgbsh6xsdfjg7vp7zb138sxwgv0msrlm27a6p4fcnlx"; depends=[]; }; moezipfR = derive2 { name="moezipfR"; version="1.0.2"; sha256="0sfl1c7cvm1milcglcvz9lyvgricsdm7shx0jxyn50y7xz0padww"; depends=[tolerance VGAM]; }; mogavs = derive2 { name="mogavs"; version="1.1.0"; sha256="0lhmwdv991bv7j8k066jr7ii94w60ydjpf5pzmv8jlblf3w2pr02"; depends=[cvTools]; }; - mokken = derive2 { name="mokken"; version="3.0.0"; sha256="0fng0dh08f6h80z5q4gwkpkyinvhb52kf5i75gywhqz5cb2yfknl"; depends=[poLCA Rcpp]; }; moko = derive2 { name="moko"; version="1.0.2"; sha256="16hcr570h73ljgfb14pcli358m5vy022bqx1davn26z21n3ls44y"; depends=[DiceKriging DiceOptim emoa GenSA GPareto mco]; }; molaR = derive2 { name="molaR"; version="4.5"; sha256="1mfb05cfg0jh60yxnmwhja6m38185r58kbz2ak0ikgaqd9lls07s"; depends=[alphahull rgl Rvcg]; }; mombf = derive2 { name="mombf"; version="2.2.9"; sha256="0z7crgvl1c15s0pn6isa9i4phfsbhl6msc1jdbk88ckh09ilx0z7"; depends=[mclust mgcv mvtnorm ncvreg Rcpp RcppArmadillo survival]; }; @@ -10597,8 +10618,9 @@ in with self; { movecost = derive2 { name="movecost"; version="0.3"; sha256="0lrnk09sdbamxc4xhrkgggjcim1xhbsnq13f3ysadn7d1rjazl9i"; depends=[gdistance raster rgdal rgeos sp]; }; mozzie = derive2 { name="mozzie"; version="0.1.0"; sha256="09dwrv4r0hi19gzi1vpif3q4wlbny9h22430g1hhv0wkqs86mhmw"; depends=[]; }; mp = derive2 { name="mp"; version="0.4.1"; sha256="0awvwqwb25q47j14b450k1k5mh2yzwhn7gizjv5j7lyiamk30iwq"; depends=[Rcpp RcppArmadillo]; }; + mpMap2 = derive2 { name="mpMap2"; version="1.0.3"; sha256="0fa89sbqd22h4px9lizmsl7f5xmd1g56i6n1x0x418qvlmgrnn6j"; depends=[car fastcluster ggplot2 igraph jsonlite Matrix nnls progress pryr qtl RColorBrewer Rcpp sn]; }; mpa = derive2 { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; }; - mpath = derive2 { name="mpath"; version="0.3-24"; sha256="0bwshhjmb5p5lm4c948yfr2dqms3k4g97xcd4avy5znxh30ra71z"; depends=[bst doParallel foreach MASS numDeriv pscl]; }; + mpath = derive2 { name="mpath"; version="0.3-25"; sha256="1s1n0d681vlgdil9yqm7c5hh62k5mljgzga9475m40ajam1gfcik"; depends=[bst doParallel foreach MASS numDeriv pscl]; }; mpbart = derive2 { name="mpbart"; version="0.2"; sha256="1145n0lxmm0kjm2lc358d79hqws48crj17pjvmchl1pbfd7zi4r8"; depends=[bayesm cvTools mlbench mlogit]; }; mpcmp = derive2 { name="mpcmp"; version="0.1.3"; sha256="11j12ns04g2xdw5r34x86bacwacf3618rzpqz8wvfs1l192l001c"; depends=[]; }; mpcv = derive2 { name="mpcv"; version="1.1"; sha256="0vwycspiw9saj811f6alkbijivy7szpahf35bxn2rpn2bdhbn21i"; depends=[lpSolve]; }; @@ -10606,7 +10628,7 @@ in with self; { mplot = derive2 { name="mplot"; version="1.0.4"; sha256="1f3llh1599q8259la02nvdigrs4p4j1l4qsp5bxi19my6gff0l10"; depends=[bestglm doParallel doRNG dplyr foreach ggplot2 glmnet googleVis leaps plyr reshape2 scales shiny shinydashboard tidyr]; }; mpm = derive2 { name="mpm"; version="1.0-22"; sha256="0wijw8v0wmbfrda5564cmnp788qmlkk21yn5cp5qk8aprm9l1fnk"; depends=[KernSmooth MASS]; }; mpmcorrelogram = derive2 { name="mpmcorrelogram"; version="0.1-4"; sha256="0gv9xswrfvndcjal0csab1w2cnl4rg8pznyxbz84b0qr95jg81ag"; depends=[vegan]; }; - mpmi = derive2 { name="mpmi"; version="0.43"; sha256="15nhh7lizx06mws6gibsvmv29mz1q9id5rqmdbzlk8h1050lcg20"; depends=[KernSmooth]; }; + mpmi = derive2 { name="mpmi"; version="0.43.1"; sha256="1lz7928vz52hs8dad9rj34hnkv8y0yj4mfiydwkrqvsl8avwc4qk"; depends=[KernSmooth]; }; mpoly = derive2 { name="mpoly"; version="1.1.1"; sha256="10is69ks22ka1cqw3xk0fvy4z3b2drm8lanqwj178qrzj7ipf7i0"; depends=[ggplot2 orthopolynom partitions plyr polynom stringi stringr tidyr]; }; mppR = derive2 { name="mppR"; version="1.2.1"; sha256="0q4pyfwypicmx8lqkgjkmagh6kyr6iww8xa64fxv0ayf8pcbzrca"; depends=[ggplot2 igraph qtl]; }; mppa = derive2 { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrcnk3m8y58akapi66lj8xplcx4"; depends=[]; }; @@ -10641,7 +10663,7 @@ in with self; { msap = derive2 { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; }; mschart = derive2 { name="mschart"; version="0.2.5"; sha256="08j342slv4ca6qkd12hh7jmmv5wv6kfxamw34dr6sd89kzrfdj0p"; depends=[cellranger data_table htmltools officer R6 writexl xml2]; }; mscstexta4r = derive2 { name="mscstexta4r"; version="0.1.2"; sha256="1hjcasmn33xav2mw085lcndv0432l6sz327aikf63491wj1sj7mw"; depends=[dplyr httr jsonlite pander stringi]; }; - mscstts = derive2 { name="mscstts"; version="0.5.2"; sha256="1zvicr1c9lh7cscbx7j5d98zkjwq7piggyz6ssz19gpp2gfc4igy"; depends=[httr jsonlite tuneR]; }; + mscstts = derive2 { name="mscstts"; version="0.5.3"; sha256="0snrlab77gmnlppz3hjkdjaxlqv7v68ncxlvgmw9g33p87g7fnkf"; depends=[httr jsonlite tuneR]; }; mscsweblm4r = derive2 { name="mscsweblm4r"; version="0.1.2"; sha256="031s00wpr9zfjpii56m67q1phn05vqlhb8cfzhyf6fbrxvpb8k7n"; depends=[httr jsonlite pander]; }; msd = derive2 { name="msd"; version="0.1.0"; sha256="03j50vq8mypidxzplznsa874inh5zy2v9rbw9yd7wsxwi8jf0s2b"; depends=[]; }; msda = derive2 { name="msda"; version="1.0.2"; sha256="05khpa5qasnngn6yvk87gv5262plqpw4knb6hzgy52w401k0y80r"; depends=[MASS Matrix]; }; @@ -10684,16 +10706,16 @@ in with self; { mulset = derive2 { name="mulset"; version="1.0.0"; sha256="0pigiy6hfiqh6x4zx6zqn3ykk36s3abzzyb67jdlf4jzc5zhrl9g"; depends=[digest gtools]; }; multDM = derive2 { name="multDM"; version="1.1.1"; sha256="06r9dxp1ww5prp1gq67ch1n173dqa93islbjhqnsdaqrhaa7wav2"; depends=[MTS]; }; multbxxc = derive2 { name="multbxxc"; version="1.0.1"; sha256="1ip5awjc2ljpy6nsr4y42x0yg4n7lyaxp9kzfjvwp41k9lriz4gm"; depends=[Rcpp RcppArmadillo rmumps]; }; - multcomp = derive2 { name="multcomp"; version="1.4-12"; sha256="14c2f10rz546w7ly5f4r6wnd07yj5gic38an17gxny1vf2nsff0b"; depends=[codetools mvtnorm sandwich survival TH_data]; }; + multcomp = derive2 { name="multcomp"; version="1.4-13"; sha256="1nszi22rcc551yc75h9cdfkdqsxw1rz30vadazmpyzihp1bh63yk"; depends=[codetools mvtnorm sandwich survival TH_data]; }; multcompView = derive2 { name="multcompView"; version="0.1-8"; sha256="1rfq9wvvrghq0542ff40wy8vdmsyd8spzz6ihcywcvxdfa8m6g8j"; depends=[]; }; multdyn = derive2 { name="multdyn"; version="1.6"; sha256="06yab2lmxp7lc7zjk8n194mn5vza0yjbp276iair3ry35my4h3v8"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; }; multfisher = derive2 { name="multfisher"; version="1.1"; sha256="0vzvq7v2xz35fx8pg25c9xqkic09k6fcg9zh81j7pgqmzi2wwrp8"; depends=[]; }; - multgee = derive2 { name="multgee"; version="1.6.0"; sha256="17qrfvxxapqzjy2ps7kk9k9hkmb9zdxflwclyagp1amgv50la49f"; depends=[gnm VGAM]; }; + multgee = derive2 { name="multgee"; version="1.7.0"; sha256="0f7lwla0i0why8lk4fsyxsc1qhyq4asqvy5pr04mqfxxr8x3nm5v"; depends=[gnm VGAM]; }; multiApply = derive2 { name="multiApply"; version="2.1.1"; sha256="1vsknqzwkimmb9axa72slzpzij4mvkcy3578i7xjx3grfa6kbnlh"; depends=[doParallel foreach plyr]; }; multiAssetOptions = derive2 { name="multiAssetOptions"; version="0.1-1"; sha256="1kb4qxyl9shvrpqfxq26lhh3sssmyjcnhhcl6gcbb0s86snh9ms9"; depends=[Matrix]; }; multiCA = derive2 { name="multiCA"; version="1.1"; sha256="1vgb13cfq10g8hxykgi3is3mrlbm76vh40cznapl7xxmw226ccrl"; depends=[bitops multcomp]; }; multiColl = derive2 { name="multiColl"; version="1.0"; sha256="01csf5gjk2wrv6d0m1j23gk6dcixck318ywfq1a1a0j1dl9wmvx4"; depends=[]; }; - multiDimBio = derive2 { name="multiDimBio"; version="1.2.1"; sha256="1zykfchfl4icjp5y2pjd5vlfrpzhd13xbh2fy3indhh6kdzbdkyy"; depends=[ggplot2 gridGraphics lme4 MASS misc3d pcaMethods RColorBrewer]; }; + multiDimBio = derive2 { name="multiDimBio"; version="1.2.2"; sha256="0xadpvnyghpqh2q1gp1fqwv591sm3icmx60x4g8gn1vybi51k5rx"; depends=[ggplot2 gridGraphics lme4 MASS misc3d pcaMethods RColorBrewer]; }; multiPIM = derive2 { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; }; multiRDPG = derive2 { name="multiRDPG"; version="1.0.1"; sha256="0r6n148pakixw4caj0zwib8zirgl98lm0mxqmhvmqjh389icskxc"; depends=[]; }; multiROC = derive2 { name="multiROC"; version="1.1.1"; sha256="15ydbxpkdyvsc55di13jvwh9p6dzxc1yj93w1cwsd8jp2y10wsd3"; depends=[boot magrittr zoo]; }; @@ -10731,10 +10753,9 @@ in with self; { multisensi = derive2 { name="multisensi"; version="2.1-1"; sha256="0f8i1jvrnmdsws5w7fz9k5pb5yfl5b9hnfd8aq4zj1r6m90kb6sz"; depends=[knitr sensitivity]; }; multisom = derive2 { name="multisom"; version="1.3"; sha256="0msxmrj4iawxg4vf4r7kj26zalxz4di2w4nxgxiakiig4g4ggy9z"; depends=[class kohonen]; }; multispatialCCM = derive2 { name="multispatialCCM"; version="1.0"; sha256="1fzd91w10iln8qb81z240lq3fi4gq22l4rh9npkav6fiq6g6rlp8"; depends=[]; }; - multistate = derive2 { name="multistate"; version="0.2"; sha256="0jdgyzc99k4py39g98c4dlcdl918568ihcyhb7csxbsn1zn1qm9l"; depends=[date relsurv statmod survival]; }; multistateutils = derive2 { name="multistateutils"; version="1.2.4"; sha256="1h1hi9pv28dbznjnafybjlbk196rj2f8lwrzwq2a5cpj0q7s582f"; depends=[data_table dplyr magrittr networkD3 Rcpp tidyr]; }; multitaper = derive2 { name="multitaper"; version="1.0-14"; sha256="04wd9bbhyx7697pfy0fpj02v1csr48hkpqj62h9p8a6w84ji4k68"; depends=[]; }; - multivariance = derive2 { name="multivariance"; version="2.2.0"; sha256="1877yym7fhnjhjdfchpdjrcyz10w7flsvjq78s51y0km0rblycph"; depends=[igraph microbenchmark Rcpp]; }; + multivariance = derive2 { name="multivariance"; version="2.3.0"; sha256="00hvsia4xcs2r2lj9qqnlj4klivvpx58fmhr4dgy3waq8pp5a0dv"; depends=[igraph microbenchmark Rcpp]; }; multivator = derive2 { name="multivator"; version="1.1-9"; sha256="0vbqvhmym46zjr1h4s53sjrddfjpv8wi0sq4lrh2rmqarq068416"; depends=[emulator mvtnorm]; }; multiviewtest = derive2 { name="multiviewtest"; version="2.0.0"; sha256="09svd9jbvn92vkaifr33vg5scyh6311kpkr0lgsdj6lycz9cb4q7"; depends=[doParallel foreach irlba Matrix matrixStats mclust randnet]; }; multiwave = derive2 { name="multiwave"; version="1.4"; sha256="19581kjcyw86cnzhvhhpn997fixm811ggmvb8jkb3dsxg8vp60jc"; depends=[]; }; @@ -10750,14 +10771,14 @@ in with self; { music = derive2 { name="music"; version="0.1.1"; sha256="04ygmlga7i8bpxcrlmj8wc956asf73krghga6fnh2flm675dp42f"; depends=[audio crayon]; }; musicNMR = derive2 { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; }; musica = derive2 { name="musica"; version="0.1.3"; sha256="0cfzfar706l0xdb0n11m18mayj5rrplvf4qry36vgxsiaxcba90r"; depends=[data_table lubridate magrittr qmap]; }; - mustashe = derive2 { name="mustashe"; version="0.1.1"; sha256="1ds6b1dbp669yys5946mfawxzxy0n9cqd6lqixy5a7jj8al5whnp"; depends=[digest formatR readr tibble]; }; + mustashe = derive2 { name="mustashe"; version="0.1.2"; sha256="0ihngnjay9zg8570za2rja0m2hxjy1ygc4zaif862sqflza68kdp"; depends=[digest formatR qs tibble]; }; mut = derive2 { name="mut"; version="1.1"; sha256="0v0vviarsmaiap3fa82ia01cblana65fd3cbj7jkd3aral6pm6yz"; depends=[expm Familias IBDsim paramlink]; }; mutSignatures = derive2 { name="mutSignatures"; version="1.2"; sha256="1kbp221lm43a5wiw754yjkd3qidmca20m0i8jlxsqk8ijbp40ky2"; depends=[cluster doParallel foreach ggplot2 pracma proxy]; }; mutoss = derive2 { name="mutoss"; version="0.1-12"; sha256="1yk7p7pb2xm38d3j19ysgwmix48lvimbhkhjjwk5jmr1a0ysx298"; depends=[multcomp multtest mvtnorm plotrix]; }; mutossGUI = derive2 { name="mutossGUI"; version="0.1-11"; sha256="08pcca9gzns83az6jbjzv4xhm1wgmchhzz4f54x1aq0nmvsz3qq1"; depends=[CommonJavaJars JavaGD JGR multcomp mutoss plotrix rJava]; }; mvLSW = derive2 { name="mvLSW"; version="1.2.3"; sha256="05g6v4jbg1km2215lxbwzx8frr4in7xal9pai3y6l23d66lvh1iz"; depends=[fields wavethresh xts zoo]; }; mvMISE = derive2 { name="mvMISE"; version="1.0"; sha256="0lnc5g3ksl5cvwylh8p8baxyvq3z32a2i337q7lhg00j031ccy5c"; depends=[lme4 MASS]; }; - mvMORPH = derive2 { name="mvMORPH"; version="1.1.1"; sha256="101ds24bir84yj7cnc4l4yv85xga981mk5ap420f3r9lp8db3h6x"; depends=[ape corpcor glassoFast pbmcapply phytools spam subplex]; }; + mvMORPH = derive2 { name="mvMORPH"; version="1.1.2"; sha256="0hhnd9ki9zcgxxfxjb0q2pmpgyfv9r5993n4rw87dh3mjxb0xsxx"; depends=[ape corpcor glassoFast pbmcapply phytools spam subplex]; }; mvMonitoring = derive2 { name="mvMonitoring"; version="0.1.0"; sha256="03nvq8nmrmrpzyxlsqzww5ghk640115l1jgmgwfahhjxkdpkzfxx"; depends=[BMS dplyr lazyeval plyr rlang robustbase xts zoo]; }; mvPot = derive2 { name="mvPot"; version="0.1.4"; sha256="04l9dn8amwp366b6lic5fkl4kck0x2m3xcsqz6as4c3h772nhq1w"; depends=[evd gmp MASS numbers]; }; mvQuad = derive2 { name="mvQuad"; version="1.0-6"; sha256="016477dhjdkqiadc631vzpbp967mn4yli6by3s1k348mlfirwsi3"; depends=[data_table statmod]; }; @@ -10780,7 +10801,7 @@ in with self; { mvnmle = derive2 { name="mvnmle"; version="0.1-11.1"; sha256="131k2bnn6194y3f35r9cgys8g1z2y52123ng8iijpkpbfd147y92"; depends=[]; }; mvnormtest = derive2 { name="mvnormtest"; version="0.1-9"; sha256="1iaxjwp7bgxhaa4xqvgqb61316mq2fb0452d0pabhmbxkvmvdnj6"; depends=[]; }; mvnpermute = derive2 { name="mvnpermute"; version="1.0.0"; sha256="0mbyj5i5vysrnl3pgypl0cjf3sylsvzfl1pcxkn0q16560vqh2ba"; depends=[]; }; - mvord = derive2 { name="mvord"; version="0.3.6"; sha256="0xg73pa7bj42ya69w8bmcgf1nfxa5yh1aq8fc0dk0ygcg3h0g21k"; depends=[BB dfoptim MASS Matrix minqa mnormt numDeriv optimx pbivnorm ucminf]; }; + mvord = derive2 { name="mvord"; version="1.0.0"; sha256="1x5846sb31s45817j05nr5pp8zd1rgq22n8wncj2a61y01ll7qwy"; depends=[BB dfoptim MASS Matrix minqa mnormt numDeriv optimx pbivnorm ucminf]; }; mvoutlier = derive2 { name="mvoutlier"; version="2.0.9"; sha256="1d562h3xicq962h27fi95qhrz9vkwxk0p8axhps1cy4b49w4bygi"; depends=[robCompositions robustbase sgeostat]; }; mvp = derive2 { name="mvp"; version="1.0-8"; sha256="0i2fd9s0dlpaa4vwkiq5is2d4vxc90hkdl0yk57gl651i8nxwnha"; depends=[magic magrittr mpoly partitions Rcpp]; }; mvprpb = derive2 { name="mvprpb"; version="1.0.4"; sha256="1kcjynz9s7vrvcgjb9sbqv7g50yiymbpkpg6ci34wznd33f7nrxm"; depends=[]; }; @@ -10838,10 +10859,9 @@ in with self; { nat_utils = derive2 { name="nat.utils"; version="0.5.1"; sha256="12g87ar795xfbz7wljksb24x9hqvcirjr50y4mbpx1427r0l7clv"; depends=[]; }; nationwider = derive2 { name="nationwider"; version="1.1.1"; sha256="1crflv2wvrsyrhl612f7awvm0yfhl381q7pq190n3ydg093y32r6"; depends=[dplyr httr lubridate magrittr readxl rvest stringr tidyr xml2 zoo]; }; natmanager = derive2 { name="natmanager"; version="0.4.0"; sha256="03vqy6kwc749ccydmjwjl49sydg534ijn0kpm11s4jp6nmybgzsa"; depends=[curl gh remotes usethis withr]; }; - natserv = derive2 { name="natserv"; version="0.3.0"; sha256="0plfcf9c1lwfmac3nnx07hyhpr12q6mfmmj0dz8xyxdspd2ps81w"; depends=[crul data_table tibble xml2]; }; + natserv = derive2 { name="natserv"; version="0.4.0"; sha256="11wws7ikvvlmg7b1g1v6qdnhh40783ap5j3w3533wwdlj1igjzms"; depends=[crul data_table tibble xml2]; }; natural = derive2 { name="natural"; version="0.9.0"; sha256="0zxwbf3gg2h0bhl2w0md3rd162vlsgg0dv3187hc0ax7333cc4cx"; depends=[glmnet Matrix]; }; naturalsort = derive2 { name="naturalsort"; version="0.1.3"; sha256="0mz801y9mzld9ypp3xmsjw2d8l9q97sdnv09wrci9xi3yg2sjf6d"; depends=[]; }; - nbc4va = derive2 { name="nbc4va"; version="1.1"; sha256="025p9h1ghrsq4h439gx25ffpyvh2kp1i51hm7kbzx8nmh4ka8aff"; depends=[]; }; nbconvertR = derive2 { name="nbconvertR"; version="1.3.2"; sha256="0yhmz177r1miain65vspclahhz8cg7638ldbpsw8ylgf7a60l0sg"; depends=[]; }; nbpMatching = derive2 { name="nbpMatching"; version="1.5.1"; sha256="0f90k9vq05gkc0sgywb98frig63df0ih4z41dq7m2inx1zk5rqns"; depends=[Hmisc MASS]; }; nc = derive2 { name="nc"; version="2020.3.23"; sha256="18hjwa86y14sdwzz46k6w9hb8s8w58bxmnqy2spib8qy6dvvpfj4"; depends=[data_table]; }; @@ -10891,7 +10911,7 @@ in with self; { netgsa = derive2 { name="netgsa"; version="3.1.0"; sha256="0mn4dnvckdskigdfbszjnfmb3m6yfbz4qc26qwh1wznwx5wmcbf0"; depends=[corpcor dplyr glassoFast glmnet graph graphite igraph magrittr Matrix msigdbr quadprog rlang]; }; netgwas = derive2 { name="netgwas"; version="1.11"; sha256="13d889ji6x0v5pmqlr1gs9yskm3262fzb5i2l9lw6y6bc72q3l06"; depends=[glasso huge igraph MASS Matrix qtl RBGL tmvtnorm]; }; netjack = derive2 { name="netjack"; version="1.2.0"; sha256="060ygb0kxi0gx1ya38cmf5hhyy6jkwq5519azdqhq5i324cwzzm7"; depends=[brainGraph ggplot2 igraph Rdpack]; }; - netmeta = derive2 { name="netmeta"; version="1.2-0"; sha256="0cy123bs5azg5yinncmgzaxm0m33dzxbwjh0xlvwv2v27m4w4sqk"; depends=[ggplot2 magic MASS meta]; }; + netmeta = derive2 { name="netmeta"; version="1.2-1"; sha256="11yigmk11a9gi3qg3gcszmnp11729qap8yv5pvsss5qfhahfs4qa"; depends=[ggplot2 magic MASS meta]; }; netrankr = derive2 { name="netrankr"; version="0.2.1"; sha256="0csgi09ijp7ygwk7x057l9xjrzyhr7sav8hamh0p6i72l6719ssl"; depends=[igraph Rcpp RcppArmadillo]; }; netregR = derive2 { name="netregR"; version="1.0.1"; sha256="0n5absjra0imddz1spy1piij5rdz76wi4g568yby3rbhkm1896rs"; depends=[Matrix]; }; nets = derive2 { name="nets"; version="0.9"; sha256="1wcr0fj50w3rqxw0k9cb81c2psdkb0dwwwzrjvxv50hksbhyi8kn"; depends=[igraph]; }; @@ -10906,7 +10926,7 @@ in with self; { networkTomography = derive2 { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; }; networkreporting = derive2 { name="networkreporting"; version="0.1.1"; sha256="1ssbz8lw4mlwcblwfbyffvayvb2gmihq4qlz5q9222fn4aa3raxd"; depends=[dplyr functional ggplot2 lazyeval plyr reshape2 stringr surveybootstrap]; }; networksis = derive2 { name="networksis"; version="2.1-3"; sha256="1kvil3qs7xd94ak9jgvj1nss55gjg0y7d35zmass9h1hjkcrq7bg"; depends=[network]; }; - networktools = derive2 { name="networktools"; version="1.2.2"; sha256="1j6jqz02lgafykfdnvv4zgpglhijyhirc9zgjl7pj930wmnpy9p4"; depends=[cocor eigenmodel ggplot2 gridExtra igraph IsingFit NetworkComparisonTest nnet psych qgraph R_utils RColorBrewer reshape2 smacof wordcloud]; }; + networktools = derive2 { name="networktools"; version="1.2.3"; sha256="0jj5cbp036vjjfj10i1lxzj4yi06xbdy1j20j6a035s8l2wc57pl"; depends=[cocor eigenmodel ggplot2 gridExtra igraph IsingFit NetworkComparisonTest nnet psych qgraph R_utils RColorBrewer reshape2 smacof wordcloud]; }; networktree = derive2 { name="networktree"; version="0.2.2"; sha256="0dlci3sqdh6f3w82h0p6c2pn15d170m9ls8zllgscd1sbyry4k4x"; depends=[Formula gridBase Matrix mvtnorm partykit qgraph reshape2]; }; neuRosim = derive2 { name="neuRosim"; version="0.2-12"; sha256="1hsnw9xipdr74fydq9013252ycbi9igh28s0j4dbdx52pv3iixzl"; depends=[deSolve]; }; neural = derive2 { name="neural"; version="1.4.2.2"; sha256="05hrqgppgwp38rdzw86naglxj0bz3wqv04akq7f0jxbbjc6kwy4j"; depends=[]; }; @@ -10931,14 +10951,14 @@ in with self; { nhds = derive2 { name="nhds"; version="1.0.3"; sha256="1cgw3hmsik3vlnb1lgalhvhrqzwdv08dp80vwpw1nwbf8whcbxjn"; depends=[]; }; nhlscrape = derive2 { name="nhlscrape"; version="0.1.3"; sha256="0x6y747j6lha3jw4v2wavgd12xw5nx4m8biv9rmq9z0qy53vncjc"; depends=[DBI httr jsonlite RSQLite rvest xml2]; }; nhm = derive2 { name="nhm"; version="0.1.0"; sha256="1yf9hnbmfb7xj8mbhnq40wvd0pd88x9qspy1jr3x0n8nb75i3jlp"; depends=[deSolve maxLik mvtnorm]; }; - nhstplot = derive2 { name="nhstplot"; version="1.0.1"; sha256="1f07gfmbx80as54mlzdbs2z1vzc78rjy6i6m7zd4jplgcqdcynws"; depends=[ggplot2]; }; + nhstplot = derive2 { name="nhstplot"; version="1.1.0"; sha256="1yk7q731a4y9mhngdsb8xdw2id6m1q78329ja19hdpi6nnd7nhgn"; depends=[ggplot2]; }; nice = derive2 { name="nice"; version="0.4-1"; sha256="1p8vmimiq9sbjvbx6c2wqwwkpnzw4kkdvjry6qyadmm3frwhj5qb"; depends=[]; }; nicheROVER = derive2 { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; }; nichevol = derive2 { name="nichevol"; version="0.1.19"; sha256="0qj5cb0fyw0x1bczl6l0kl6jqir4yg8sb9fsfkd3h64d0ls2arl5"; depends=[ape castor concaveman geiger raster rgdal rgeos sf sp stringr]; }; nilde = derive2 { name="nilde"; version="1.1-3"; sha256="0h88if7dh16inyy5zh0yjqmc0c57k99la038p5vlwkj62vvjscmm"; depends=[]; }; nima = derive2 { name="nima"; version="0.6.2"; sha256="0n8r8h1m0v0ssbpv6p32jby49f45qbicwr0awm7x054p48qk49cy"; depends=[assertthat dplyr ggplot2 ggthemes gridExtra gtools scales]; }; nimble = derive2 { name="nimble"; version="0.9.0"; sha256="04anz8xfkdv2c00hax305lycp0gzjspsq34hfgm3w51kz6nqzhpb"; depends=[coda igraph R6]; }; - nimbleEcology = derive2 { name="nimbleEcology"; version="0.2.0"; sha256="0c8qs5j1n4fag8gw095rabmc619dwv9qyfzix29djjc4wr638xsd"; depends=[nimble]; }; + nimbleEcology = derive2 { name="nimbleEcology"; version="0.2.1"; sha256="0bf0pqvsfvbhnpnk5hs3f90dqvw2n1j9y8ajaw9j7n4gld3wzxqb"; depends=[nimble]; }; nipals = derive2 { name="nipals"; version="0.7"; sha256="14rq54qy4gc4l9f5h48vrsrh7sb0wzzxbvjn0zax82pz2fw6nybx"; depends=[]; }; nitrcbot = derive2 { name="nitrcbot"; version="1.2"; sha256="0lainbw9j5aj9s824afpxdjl3q2f728jfpdfji7kpi9hdg8jixhx"; depends=[dplyr httr jsonlite RCurl]; }; nivm = derive2 { name="nivm"; version="0.3"; sha256="111jkgirgsl1j36xgwi81wzwxial3vdw8mqzi1faldxxd9a2cixm"; depends=[bpcp ssanv]; }; @@ -10950,7 +10970,7 @@ in with self; { nlgeocoder = derive2 { name="nlgeocoder"; version="0.1.3"; sha256="13d30kfgfsny5gnn3yjfnclky6yixaa8sg0m689rszqxrvbrj79x"; depends=[jsonlite]; }; nlirms = derive2 { name="nlirms"; version="3.4.4"; sha256="1njyfip377a0f6hf9y32s077b4jv4h8ydbjgnl68yfypxbfn2xyx"; depends=[gridExtra gtable]; }; nlist = derive2 { name="nlist"; version="0.1.0"; sha256="0i5appxx79fcv2g0frkzlv2yfym6kmmzbsk76rbh7ap8hram04jg"; depends=[abind chk coda purrr term]; }; - nlme = derive2 { name="nlme"; version="3.1-145"; sha256="1i9a3afdmn2ziks0imz0j09ay9n0zb9mhrymy9mg97vvlz5diwrh"; depends=[lattice]; }; + nlme = derive2 { name="nlme"; version="3.1-147"; sha256="1rqc3wy3lmy0wczsvsn8yszzsxhppfwg4iznb1j6ki2qawpdij7g"; depends=[lattice]; }; nlmeODE = derive2 { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve lattice nlme]; }; nlmeU = derive2 { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; }; nlmixr = derive2 { name="nlmixr"; version="1.1.1-7"; sha256="1dl3f0lns8cm32gx64i2jims4wknannl776mn2spzqh5z6g3nnzw"; depends=[BH brew cli dparser fastGHQuad flextable generics ggplot2 huxtable lbfgsb3c magrittr Matrix memoise n1qn1 nlme Rcpp RcppArmadillo RcppEigen RxODE StanHeaders stringr tidyr vpc yaml]; }; @@ -10976,6 +10996,7 @@ in with self; { nlt = derive2 { name="nlt"; version="2.2-1"; sha256="10wf00qzf28dxjfvv12wsqxlfn6xz15wk8njrzgsgm9px1g6s21f"; depends=[adlift EbayesThresh]; }; nltm = derive2 { name="nltm"; version="1.4.2"; sha256="02f3rn5l1hfvjpymy7vljmh6iq9w1w96016kx75qw563zwhmp5kx"; depends=[survival]; }; nlts = derive2 { name="nlts"; version="1.0-2"; sha256="0s49qjwavl9ns2746nn4zy4h4dh0njfcvznm3qd61qhs7np9w1db"; depends=[acepack locfit]; }; + nmaINLA = derive2 { name="nmaINLA"; version="0.2.0"; sha256="0z3iln81dj0sg64hi7dxypcslff5yl6nlx0hkra1kc24rhxfzhh2"; depends=[]; }; nmadb = derive2 { name="nmadb"; version="1.2.0"; sha256="17r5vc57ilhy6cfcqpfyp9nzzjaa5gc8qkgfn3y8sppqh1g1mi40"; depends=[devtools jsonlite RCurl readxl]; }; nmathresh = derive2 { name="nmathresh"; version="0.1.5"; sha256="0ndrkd68wkkj0ib0qamfmawfy4j07cg1nx4rx32amx2j0rc851yl"; depends=[ggplot2 gridExtra gtable Matrix nnls]; }; nmfem = derive2 { name="nmfem"; version="1.0.5"; sha256="0hlddml20bp38yp1dji3l9mc1vnzmdrj6myf19n9p9xb85a30b9c"; depends=[capushe d3heatmap dplyr mixtools plyr tidyr]; }; @@ -10984,7 +11005,7 @@ in with self; { nmslibR = derive2 { name="nmslibR"; version="1.0.4"; sha256="1fw565n4128nswl2qx248ab60is98iqijq5blwskxc9hjddf95a4"; depends=[KernelKnn Matrix R6 Rcpp RcppArmadillo reticulate]; }; nmw = derive2 { name="nmw"; version="0.1.4"; sha256="1vj7b2p40x0h3xp45qzar86i9439mj8y3r5hnlbwa025jqdf2g0q"; depends=[numDeriv]; }; nnGarrote = derive2 { name="nnGarrote"; version="1.0.2"; sha256="1rci3m362wlis8z9afbkcr9vk0ihvay389cq4c8jd9gmcwdrv61g"; depends=[caret glmnet multicool]; }; - nnTensor = derive2 { name="nnTensor"; version="1.0.2"; sha256="12h25kn3d70ldlqpd4nqnycv3mnzfx1f9gcw1yaspmnhs1x6gddf"; depends=[fields plot3D rTensor tagcloud]; }; + nnTensor = derive2 { name="nnTensor"; version="1.0.4"; sha256="1br3jcj79crrb7s22pjp0pxxkni8fagqkr96xb9sbf2dszyva15b"; depends=[fields ggplot2 plot3D rTensor tagcloud]; }; nna = derive2 { name="nna"; version="0.0.2.1"; sha256="17cz1jf7iv61wspqldfdwbdjhlr0wq09idkzlivfb8aik5w9f0z5"; depends=[]; }; nnet = derive2 { name="nnet"; version="7.3-13"; sha256="1z0rj5cm4ycw1y0gd5wwwg8c2298v90iybgqdqh17967jbi2125f"; depends=[]; }; nnetpredint = derive2 { name="nnetpredint"; version="1.2"; sha256="1c6s9wm6vhylwv4xhp2hkllw18zj8hdr17ls9vlxm9qs3wx1v48w"; depends=[RSNNS]; }; @@ -10992,6 +11013,7 @@ in with self; { nngeo = derive2 { name="nngeo"; version="0.3.7"; sha256="1xyj5zjhim2scigkr4ycz7ma18a0sgi60jrhrcv9rnn2fg1hx5c7"; depends=[lwgeom RANN sf units]; }; nnlasso = derive2 { name="nnlasso"; version="0.3"; sha256="1n7karlmgq61z9ywfx9xb5wvmxx40ydpnzzazj1xr70qlv5m0qk4"; depends=[]; }; nnls = derive2 { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; }; + nnt = derive2 { name="nnt"; version="0.1.4"; sha256="1rrqq8m3plsq13hsh53h948wbx37gl87hplj4ms2pxxf1zwqsmnj"; depends=[survival survRM2]; }; noaaoceans = derive2 { name="noaaoceans"; version="0.2.0"; sha256="1hvjkma14kl8f69ichk27ddxlg9cqnzif8x43ckxyny6h341bbkf"; depends=[httr jsonlite rvest xml2]; }; noaastormevents = derive2 { name="noaastormevents"; version="0.1.1"; sha256="1ra852r5hw1ng3f4jk866jx0z2dszwvbidmfrdjchv9bfrjwmlmx"; depends=[choroplethr choroplethrMaps data_table dplyr forcats ggplot2 htmltab hurricaneexposure lubridate maps plyr RColorBrewer rlang stringr tidyr viridis XML]; }; noctua = derive2 { name="noctua"; version="1.6.0"; sha256="1gdlfjgxrhkdp8klis2rz60hvldw5qlzhrcp8frbyjvb8qa83b76"; depends=[data_table DBI paws]; }; @@ -11070,7 +11092,6 @@ in with self; { nprotreg = derive2 { name="nprotreg"; version="1.0.0"; sha256="06n82i5m7sgfj759zdwwh8fqybkbchvnaaqcds64m6hbms592bh3"; depends=[expm]; }; npsf = derive2 { name="npsf"; version="0.5.2"; sha256="0iz4dh2cv1bi90wdf08x70rdm44xmzblck69rlg7vnsb6n2q2is9"; depends=[Formula randtoolbox Rcpp sfsmisc]; }; npsm = derive2 { name="npsm"; version="0.5.1"; sha256="00xh3x731lqb5vbzmfmlldrvc8s4s88dc394iifsn2g7r5naxks0"; depends=[plyr Rfit]; }; - npsp = derive2 { name="npsp"; version="0.7-5"; sha256="0ci3am6lbmb1raxdqj4ckcm7y1889j0zsk52awl15sjhkx8l2saa"; depends=[quadprog sp spam]; }; npsr = derive2 { name="npsr"; version="0.1.1"; sha256="1fzvilzjg9z05991sr1s1bdp17kfl6d1580qdllk8is9ac06np0v"; depends=[gmp infotheo MASS]; }; npst = derive2 { name="npst"; version="2.0"; sha256="1y5ij3nmh9pj6p97jpx75g26sk508mznr0l67cwj381zfb77hj1n"; depends=[]; }; npsurv = derive2 { name="npsurv"; version="0.4-0"; sha256="1wq4c9yfha5azjhrn40iiqkshmvh611sa90jp3lh82n4bl9zfk20"; depends=[lsei]; }; @@ -11099,7 +11120,7 @@ in with self; { numOSL = derive2 { name="numOSL"; version="2.6"; sha256="03h1p56650x4my5vq5jlmjsz5xj0w2j75qfr08rh7nr38dwgp1k8"; depends=[]; }; numbers = derive2 { name="numbers"; version="0.7-5"; sha256="1dz23rmjzdns4av28kk8bc9psj71q2bpcgm1m7sxnyzcxpm8hczc"; depends=[]; }; numbersBR = derive2 { name="numbersBR"; version="0.0.2"; sha256="0ihxlny745gpz1ngq862rydn1zwn8zni1xw9mmgw8hkylsrnjfq8"; depends=[stringr]; }; - numform = derive2 { name="numform"; version="0.5.0"; sha256="1c9vhzm4rjh8b5bkzkv1r9j2y1iqndq9ndandix28wdgn2v6lzv6"; depends=[glue]; }; + numform = derive2 { name="numform"; version="0.6.0"; sha256="0v19dcr5xwi0bf4s0qwipxpmxbw42l2li1h9i73kdrigznhlqq8h"; depends=[glue]; }; nutriNetwork = derive2 { name="nutriNetwork"; version="0.1.1"; sha256="0ya95h88jkiwc7cg7ic8bmyd7b0lgnhxrywwqvi2j6m6nbvvaxzy"; depends=[glasso huge igraph Matrix tmvtnorm]; }; nvctr = derive2 { name="nvctr"; version="0.1.1"; sha256="0hjrimg0hvwgkx2hbln6k8z0f2bp9kln7mxxh623qjp0hg4mcvcn"; depends=[magrittr pracma]; }; nvmix = derive2 { name="nvmix"; version="0.0-3"; sha256="0dvx21nfp82s7bk5vd9xxp9979w4mq8v1hx1zxa97sv2xr4g2m5y"; depends=[Matrix qrng]; }; @@ -11150,10 +11171,12 @@ in with self; { oenb = derive2 { name="oenb"; version="0.0.1"; sha256="1x1jlqp6r27c4gb7wafzpmh5rq6yq61a2d395r5lsmv2g5jb4biz"; depends=[dplyr XML]; }; ofGEM = derive2 { name="ofGEM"; version="1.0"; sha256="0xdkl8k12an9pdy6i5nay4m2iakrwsp0lr3zl8gphii75j0ywz7k"; depends=[CompQuadForm forestplot MASS]; }; officer = derive2 { name="officer"; version="0.3.8"; sha256="0xhx5n6qksyh2s9hvwhnc8y0hn362asc5y94ld06snad786hz0rw"; depends=[magrittr R6 uuid xml2 zip]; }; + offlineChange = derive2 { name="offlineChange"; version="0.0.4"; sha256="005afrm4ki4zz3zkgrf8c1v9gf5cjhc5g50mjkqya3r8npaccwq2"; depends=[Rcpp]; }; oglmx = derive2 { name="oglmx"; version="3.0.0.0"; sha256="13axmhbqhv4kkcdsdmp9r7p0d0kyqlsaqgyyllbkxlxb4hfz79b6"; depends=[maxLik]; }; ohenery = derive2 { name="ohenery"; version="0.1.1"; sha256="0i7cc110c30y7dm86srh2xkikkmlr28mvy0kkjxywxmiwnrsmzjq"; depends=[dplyr magrittr maxLik Rcpp]; }; ohtadstats = derive2 { name="ohtadstats"; version="2.1.1"; sha256="0hkjs322vii1dsminlkwpwi12sc9pd88jag7p4dmy6nfw2hh2d69"; depends=[lattice]; }; oii = derive2 { name="oii"; version="1.0.2.1"; sha256="1n41hikn53ikyynsravg127cw5csa8s0s1l63w5hym7c6j625ya5"; depends=[Deducer gmodels rapportools]; }; + ojsr = derive2 { name="ojsr"; version="0.1.0"; sha256="0lgpdcavk60qyqn3fprqmyi4bi43kjd8llnpb3bibx7h010kg834"; depends=[dplyr magrittr oai purrr rlang rvest stringr tidyr urltools xml2]; }; okcupiddata = derive2 { name="okcupiddata"; version="0.1.0"; sha256="1l04rr4yr73a6q2am9ylyr5prf347hkf2jx735w78rsb6472kbaq"; depends=[]; }; okmesonet = derive2 { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; }; olctools = derive2 { name="olctools"; version="0.3.0"; sha256="1gbchwynvmryarz32f24v56kj57h7x6nrrm878fkjkpq140cqwzz"; depends=[Rcpp]; }; @@ -11192,7 +11215,7 @@ in with self; { openNLP = derive2 { name="openNLP"; version="0.2-7"; sha256="15yl74wv6w1d2wwpn1xlkkpam3c62977gnqal651fv623v29gg35"; depends=[NLP openNLPdata rJava]; }; openNLPdata = derive2 { name="openNLPdata"; version="1.5.3-4"; sha256="0j45rh9qki8r5wavaysrfsvb3wc3x8jjicqff2yi0r34j58xvlv8"; depends=[rJava]; }; openSTARS = derive2 { name="openSTARS"; version="1.1.0"; sha256="1cjws49r22cmdax136zcy3k35yzbajkm6pyfibgcw2iqdxy1vcxg"; depends=[data_table progress raster rgdal rgrass7 sf sp SSN]; }; - openVA = derive2 { name="openVA"; version="1.0.9"; sha256="0pzcnyq45mb7041jx0krws65sxq4wldx01aafnsxqp1p5ly13y3p"; depends=[cli crayon ggplot2 InSilicoVA InterVA4 InterVA5 Tariff]; }; + openVA = derive2 { name="openVA"; version="1.0.10"; sha256="0ly0pwwj40sylv2c96siyq38j491527x4dd02xga9cnscinpbgvp"; depends=[cli crayon ggplot2 InSilicoVA InterVA4 InterVA5 Tariff]; }; openadds = derive2 { name="openadds"; version="0.2.0"; sha256="1jb8zd3rpxfkjkg895iab6m4cfi53p5vy3nnpjkgq7ym6499qjcv"; depends=[crul dplyr jsonlite maptools rappdirs readr tibble xml2]; }; openair = derive2 { name="openair"; version="2.7-2"; sha256="1bbhnbg9v2n3g4cnd3ryivdbid9kdcd45m0rfxr0hxbcq3a8gwmk"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr Rcpp readr rlang tidyr]; }; openblender = derive2 { name="openblender"; version="0.5.71"; sha256="0imk1pam0rcdwclnz66n4bvwj94l6dc63fayar3ampd8j2mxpa4q"; depends=[httr jsonlite]; }; @@ -11203,9 +11226,10 @@ in with self; { opendatatoronto = derive2 { name="opendatatoronto"; version="0.1.3"; sha256="1rcdv2zk3ckrp2fig71lgzw5i06767qqlrdj80r4b522nxx7npyn"; depends=[ckanr curl magrittr readxl sf tibble xml2]; }; opendotaR = derive2 { name="opendotaR"; version="0.1.4"; sha256="17cygsw3nkg6zincfrcdh1509rlz3n5zrv9wvv7mjngm61sn79nf"; depends=[dplyr jsonlite lubridate]; }; openintro = derive2 { name="openintro"; version="1.7.1"; sha256="059azlasdkmp8f54qpjf3mq5dyqakw0dgx0kx85wfdmhq38zal5n"; depends=[]; }; + openmetrics = derive2 { name="openmetrics"; version="0.1.1"; sha256="16glrs2wisfkhnhmd11554fg9yp3axkj81kmwxcw12fgsq1bk52q"; depends=[R6]; }; openssl = derive2 { name="openssl"; version="1.4.1"; sha256="1ihz2qi33lhngl19xdanq0pbmfaacy63794mg8ll7z2lab3yryzp"; depends=[askpass]; }; opentraj = derive2 { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; }; - opentripplanner = derive2 { name="opentripplanner"; version="0.2.0.8"; sha256="0irk885r8s6xq0krnmb1ylz29z3dg9ypj7k7pf0lcxd5l74kh4jm"; depends=[checkmate dplyr geodist googlePolylines httr jsonlite pbapply sf]; }; + opentripplanner = derive2 { name="opentripplanner"; version="0.2.1.0"; sha256="0qml2mwpmbp91w2c6aynyssfffp88jdz995gh8j4pj7150bvsihy"; depends=[checkmate dplyr geodist googlePolylines httr jsonlite pbapply sf]; }; openxlsx = derive2 { name="openxlsx"; version="4.1.4"; sha256="1mwxldw9i9nfksx1i6h1kfs7vmsz9fgyllbsipar4vnfyqhqp8q7"; depends=[Rcpp stringi zip]; }; opera = derive2 { name="opera"; version="1.1"; sha256="1nvm7a1g0pzzlpyk7g5plys1byl4xq2wz59hqys5gxiq0y5sgqwm"; depends=[]; }; operator_tools = derive2 { name="operator.tools"; version="1.6.3"; sha256="1v4dg7xhz24dnp0zxn815x1405ig64ibii6y40la1gvmzcc41dz5"; depends=[]; }; @@ -11238,13 +11262,13 @@ in with self; { optimr = derive2 { name="optimr"; version="2019-12.16"; sha256="003wz9r3xdi47ad22l4dkhp0dalknb2s9fp82yamjx7x1xbfvcbk"; depends=[numDeriv optextras Rcgmin Rvmmin setRNG]; }; optimsimplex = derive2 { name="optimsimplex"; version="1.0-7"; sha256="1if32133556zwmijlz6085fg1h65442hy03lzia0ahap3yndqfqy"; depends=[optimbase]; }; optimus = derive2 { name="optimus"; version="0.2.0"; sha256="01njyjfrm6kjwx2qq41c0hsgxzydnrmr3538cpbfdn5i0z5blgyx"; depends=[mvabund ordinal]; }; - optimx = derive2 { name="optimx"; version="2020-2.2"; sha256="1dr281q21563ysh60sqca7in1pvzx776qn9v7wv1sp8hk7w99x21"; depends=[numDeriv]; }; + optimx = derive2 { name="optimx"; version="2020-4.2"; sha256="00bi2sr2hr7x6cfwlsn7hz2r56lcyv9naa8vmfcgr1r269fc50b3"; depends=[numDeriv]; }; optinterv = derive2 { name="optinterv"; version="0.1.0"; sha256="1yvjb9fyqj3pfglfdwdq4kpw9i5g5i3klgpqb05xdnacbnpdxvmp"; depends=[boot distances Hmisc lattice pbapply rootSolve weights]; }; optional = derive2 { name="optional"; version="2.0"; sha256="0hj0gwvk9svllv44kfdgv3a2mriwqnaxvn3rj7w1djha7mryl6jl"; depends=[magrittr]; }; optionstrat = derive2 { name="optionstrat"; version="1.4.1"; sha256="0vidaf888zdls5yxy7637fqg6r39l3rxw9bhn16s4xmag7kawljv"; depends=[]; }; optiscale = derive2 { name="optiscale"; version="1.2"; sha256="185yv0xizrrjik0ydyknms28p8ql9x54bhnq3wpyrbiinjm51fms"; depends=[lattice]; }; optmatch = derive2 { name="optmatch"; version="0.9-13"; sha256="1n6h6j0rk750jqxwxkbzdid1ig5xp8xpjw356xrqg02wm7x2gwzq"; depends=[digest Rcpp RItools survival]; }; - optparse = derive2 { name="optparse"; version="1.6.4"; sha256="0wyrc42ja3ab5szx46zmz8lm7vzfqxkjca0m0sms8g9hqbmmay6d"; depends=[getopt]; }; + optparse = derive2 { name="optparse"; version="1.6.6"; sha256="1l301dy3gc8pn7j00awcjh41wmc1ks9kswak255kbsa6f54rsxsi"; depends=[getopt]; }; optpart = derive2 { name="optpart"; version="3.0-3"; sha256="18h659gbgzflq81lcchc058xjgljkmhpsjkh51ylygwrv1qjrz2i"; depends=[cluster labdsv MASS plotrix]; }; optrcdmaeAT = derive2 { name="optrcdmaeAT"; version="1.0.0"; sha256="16g4612mwyfsckn6l71fbrjnnjv4yvnac1cccbrn3k8jh07qgb1h"; depends=[igraph MASS Matrix]; }; optrees = derive2 { name="optrees"; version="1.0"; sha256="1zqpjii8dsfs98n58qpif81ckvyxkr0661svhlbgzi19xb2vszqs"; depends=[igraph]; }; @@ -11302,10 +11326,10 @@ in with self; { oshka = derive2 { name="oshka"; version="0.1.2"; sha256="02hglpq5lknq93zbcf219lhnhppzgygkhxqixb15f89rxf9fczgs"; depends=[]; }; osmar = derive2 { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[geosphere RCurl XML]; }; osmdata = derive2 { name="osmdata"; version="0.1.3"; sha256="1a57fg8j7ski050l17hv137mlb5ir7qx7212y9d49arbwlh9bpcq"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp tibble xml2]; }; - osmose = derive2 { name="osmose"; version="0.1.1"; sha256="0fiijnrvvydhj6j9yb02rn5sg8arcpj3jz977m2zwjgqy878cffg"; depends=[rlist stringr]; }; + osmose = derive2 { name="osmose"; version="3.3.3"; sha256="0b6998m3id0llpvlj5xgdrrrx1j90kxax9nfn2a5f0xq7hpcd9cg"; depends=[fields knitr mgcv ncdf4 rappdirs rlist rmarkdown stringr]; }; osmplotr = derive2 { name="osmplotr"; version="0.3.2"; sha256="0k5rjxsi1sfcxcl6lf8zcncqnshz2jaz7hcwn2ifg4yhvxvkfma8"; depends=[curl e1071 ggm ggplot2 httr mapproj osmdata rgeos sp spatstat]; }; osqp = derive2 { name="osqp"; version="0.6.0.3"; sha256="1266n04c8zsv4ixf7y25jkccv9lx3rvmd7bnkxynbwga9psd3l0j"; depends=[Matrix R6 Rcpp]; }; - osrm = derive2 { name="osrm"; version="3.3.2"; sha256="10adkq8sm0jvyd35m8vvjxiqvay976fsgffyxh9sh564l053srkp"; depends=[gepaf isoband jsonlite lwgeom RCurl sf sp]; }; + osrm = derive2 { name="osrm"; version="3.3.3"; sha256="1kiy3ij2fkvaxsgbhwn1lvhqav6prsqfi5ipzkihi2piw2gfns2r"; depends=[gepaf isoband jsonlite RCurl sf sp]; }; osrmr = derive2 { name="osrmr"; version="0.1.35"; sha256="1pmsybyqkgpqz0yhfmwrsa2smgmclxzk9mlzcqmm8ph6dcd1x0s8"; depends=[assertthat bitops R_utils rjson stringr]; }; otinference = derive2 { name="otinference"; version="0.1.0"; sha256="1l75jjnkyk8yzaw9zyk45jq9ys304i6pzm2xd5apxrb1jk75a3li"; depends=[MASS Rglpk sm transport]; }; otpr = derive2 { name="otpr"; version="0.3.0"; sha256="02p0wiz791023zpwy8dq8blsax2yfji3cpp4b77n7ri1fsisfy39"; depends=[checkmate geojsonsf httr janitor jsonlite]; }; @@ -11320,7 +11344,7 @@ in with self; { outbreaks = derive2 { name="outbreaks"; version="1.5.0"; sha256="00369lnh65nfkcbjd5i39irdv2hcwy5cinb2dvv2x4c2q2ax9f0d"; depends=[]; }; outcomerate = derive2 { name="outcomerate"; version="1.0.1"; sha256="07mwml7r98qjgvrp938sqf7klyspz110583j0zwb72j69n4whmrj"; depends=[Rdpack]; }; outliers = derive2 { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; }; - outliertree = derive2 { name="outliertree"; version="1.1.3"; sha256="07spgpvw665f53ifcsxgdq5q8wm4fsvjmqf7qsbwknlvly06cmcn"; depends=[Rcereal Rcpp]; }; + outliertree = derive2 { name="outliertree"; version="1.2.0"; sha256="1az71acng963j58cina4ng40762g0japrms99ff7ly1pw4252vrq"; depends=[Rcereal Rcpp]; }; outreg = derive2 { name="outreg"; version="0.2.2"; sha256="04f1x7mxq4swbd7bfwjjgx4838jm6qj4piaighmhcscwrdkxa1cp"; depends=[magrittr reshape2 sandwich stringr tidyr]; }; ouxy = derive2 { name="ouxy"; version="1.1"; sha256="0f07m8zs4vnr0vpsdw1qdzdrq80qyq4477l06w9i3bb0n64yxcaa"; depends=[abc adephylo ape coda EasyABC geiger maps MCMCpack nlme phytools Sim_DiffProc TreeSim]; }; overdisp = derive2 { name="overdisp"; version="0.1.0"; sha256="0j1rr9grzhlma9hgljxhn70ia268pc6f3gbinrlqky3pg73xjg2k"; depends=[]; }; @@ -11329,7 +11353,6 @@ in with self; { overlapptest = derive2 { name="overlapptest"; version="1.1"; sha256="0r732za6lm7dk5r237nhadgbpinaz5dmb6f7pn3mbg0plkdy3mff"; depends=[spatstat]; }; overture = derive2 { name="overture"; version="0.4-0"; sha256="1s16x5kn0apb0w1f7hqzcsqvw3x621y5n6yr1qn7yb7431pdw3cz"; depends=[bigmemory]; }; owdbr = derive2 { name="owdbr"; version="1.0.1.1"; sha256="0q4654zr5aw04sssy7127vafry72b7p3d8i44fqvqg3055awin0i"; depends=[data_table dplyr httr jsonlite magrittr tibble]; }; - owl = derive2 { name="owl"; version="0.1.1"; sha256="1wc2i04pn8aimnyqbi02hhzmzi5kmh7ikbjccqbb6zb9i89v7gkx"; depends=[lattice Matrix Rcpp RcppArmadillo]; }; owmr = derive2 { name="owmr"; version="0.8.2"; sha256="0qlb5aw6n06yf8y2gd2fjp8kp3w0xgqh3fka7rxqndgvaqmin1a6"; depends=[httr jsonlite magrittr plyr tibble tidyr]; }; ows4R = derive2 { name="ows4R"; version="0.1-4"; sha256="1chvb7i9a6kalnjacfvwrnp5j0fhr6da6v6llazqarij9njxfing"; depends=[geometa httr openssl R6 rgdal sf XML]; }; oxcAAR = derive2 { name="oxcAAR"; version="1.0.0"; sha256="19inf2bcpfj4jzfym1v5f1w5fkmcycz5jrfc2hf0wsvixy53lfxa"; depends=[jsonlite stringr]; }; @@ -11361,7 +11384,7 @@ in with self; { packageRank = derive2 { name="packageRank"; version="0.3.0"; sha256="1617xah0c8rnyjq09k69yrmalfryx921fflpx7k7bk52zwrrblc9"; depends=[cranlogs data_table ggplot2 memoise RCurl rversions]; }; packagedocs = derive2 { name="packagedocs"; version="0.4.0"; sha256="0zw9ana7s42ardphhdaklba02yjj1v8gliq4l98397mjmzc6f4xd"; depends=[crayon devtools digest evaluate highlight htmltools lazyrmd magrittr rmarkdown stringr whisker yaml]; }; packagefinder = derive2 { name="packagefinder"; version="0.2.1"; sha256="01nfh9han9k6gg59c6qhahfkwl9bi45ncs7mhrp0fkmxw6z21fyh"; depends=[crayon formattable htmlTable httr jsonlite lubridate pander stringr textutils tidyr]; }; - packager = derive2 { name="packager"; version="1.1.0"; sha256="1fsdh21ahhxrw77a3nwib0hypb5wn4xhz02qmm7r6z9bkg5njhak"; depends=[callr checkmate codetools crayon cyclocomp desc devtools fakemake git2r httr pkgbuild pkgload rcmdcheck remotes rprojroot usethis whisker whoami withr]; }; + packager = derive2 { name="packager"; version="1.2.0"; sha256="1jgcas51wmn00s4j9qxr8igs8mhdhv62f4pd5ajlx7qhc8h78qw8"; depends=[callr checkmate codetools crayon cyclocomp desc devtools fakemake git2r httr pkgbuild pkgload rcmdcheck remotes rprojroot usethis whisker whoami withr]; }; packagetrackr = derive2 { name="packagetrackr"; version="0.1.1"; sha256="0xjq27j7bd7lps0vp9gdinxn19wl10k2cp9wb2xjih7p6l0wd57g"; depends=[dplyr httr magrittr rappdirs]; }; packcircles = derive2 { name="packcircles"; version="0.3.3"; sha256="0gik0splf48zfl40297nh7lbgvd2qqlci99wv841mfy7858ai933"; depends=[Rcpp]; }; packrat = derive2 { name="packrat"; version="0.5.0"; sha256="1xy5dd2hrpqa07jfl4s7dsrya05mf36ms74j833scdz0zf89586n"; depends=[]; }; @@ -11382,7 +11405,7 @@ in with self; { pairsD3 = derive2 { name="pairsD3"; version="0.1.0"; sha256="0ql6pqijf24pfyid52hmf5fmh4w1ca3sm47z9vknqpnjbn47v8q2"; depends=[htmlwidgets shiny]; }; pairwise = derive2 { name="pairwise"; version="0.4.4-7"; sha256="1cgan403p9p08q3cwxnfwgrjg1l23dpmy4fjzcfla6mw24qn60wh"; depends=[]; }; pairwiseCI = derive2 { name="pairwiseCI"; version="0.1-27"; sha256="0yp9nibdrsddjqq6vdlfbpvmfgm209h99b6qqqd6wgfzng327822"; depends=[boot coin MASS MCPAN mcprofile]; }; - pairwiseComparisons = derive2 { name="pairwiseComparisons"; version="0.2.5"; sha256="1kvpa05102vy2dgcg7x7dmj2dk8h2z8ncpfcjfihaw32nabcrprx"; depends=[dplyr forcats ipmisc jmv purrr rlang tibble tidyr WRS2]; }; + pairwiseComparisons = derive2 { name="pairwiseComparisons"; version="0.3.0"; sha256="07l4i3wmi92b05ix2sy30nghwrqax5fp88f0y897bgyf7wm5fd1b"; depends=[broomExtra dplyr forcats ipmisc jmv purrr rlang tidyBF tidyr WRS2]; }; pak = derive2 { name="pak"; version="0.1.2"; sha256="05s8rg84w4xhpbaa98p3lgvsnbjrxfbcz5izgkamqa1dw4gdxml4"; depends=[assertthat base64enc callr cli cliapp crayon curl desc filelock glue jsonlite lpSolve pkgbuild pkgcache prettyunits processx ps R6 rematch2 rprojroot tibble]; }; palaeoSig = derive2 { name="palaeoSig"; version="2.0-3"; sha256="1sn2nbiq037l81qvrqbg7gf1312g8vy574hsfng07qk1jpx7vwkk"; depends=[assertr dplyr forcats ggplot2 ggrepel magrittr MASS mgcv purrr rioja rlang TeachingDemos tibble tidyr vegan]; }; palasso = derive2 { name="palasso"; version="0.0.7"; sha256="1r7kcx0i1xqvqpqwvh5khsv3g0hj3j8f56q9jbya18scywk2ivzg"; depends=[glmnet Matrix survival]; }; @@ -11421,14 +11444,14 @@ in with self; { paperplanes = derive2 { name="paperplanes"; version="0.0.1.9"; sha256="1d9grc95xqxn91lvk8v7w3z90bhl8savkhihwshyjp8ij2xpzfkl"; depends=[]; }; parSim = derive2 { name="parSim"; version="0.1.1"; sha256="1iqxv1qspx6b32qdczdzhc4sdjy5a2pb8mvg8jnc18jydi7ljs64"; depends=[dplyr pbapply]; }; parade = derive2 { name="parade"; version="0.1"; sha256="07x02j9jlldz4p0cyhw292041l3pziv56bhbzp4f0qpxhcbn5zn4"; depends=[]; }; - paradox = derive2 { name="paradox"; version="0.1.0"; sha256="00rhn8vwlcl4gnvgkqbaqyx9j1ymmgmqjry3smhc5xqnclx2spzs"; depends=[backports checkmate data_table mlr3misc R6]; }; + paradox = derive2 { name="paradox"; version="0.2.0"; sha256="0n26mpmbab8wpzwizgxwwms4qsm9p8vpifhvyqx0211zk10472hz"; depends=[backports checkmate data_table mlr3misc R6]; }; parallelDist = derive2 { name="parallelDist"; version="0.2.4"; sha256="0gqf9vi9hlbflxj941jv7hli8jiy2sqg8b312h401f8rkfqa9ckv"; depends=[Rcpp RcppArmadillo RcppParallel]; }; parallelML = derive2 { name="parallelML"; version="1.2"; sha256="05j0rb81i8342m8drwgmgi1w30q96yf501d83cdq4zhjbchphbl1"; depends=[doParallel foreach]; }; parallelMap = derive2 { name="parallelMap"; version="1.5.0"; sha256="0kjyskwvkqvsyjq55rhypif6z92r33llb7krrhc9f9w68xzp5yja"; depends=[BBmisc checkmate]; }; parallelSVM = derive2 { name="parallelSVM"; version="0.1-9"; sha256="0nhxkllpjc3775gpivj8c5a9ssl42zgvswwaw1sdhwg3cxcib99h"; depends=[doParallel e1071 foreach]; }; parallelize_dynamic = derive2 { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; }; paramGUI = derive2 { name="paramGUI"; version="2.1.4"; sha256="0k2wkl99ji3w7xmd9k7zzvrr3dbf3237q7lxm527dnrq331pmxmi"; depends=[colorspace fields shiny shinydashboard TIMP]; }; - parameters = derive2 { name="parameters"; version="0.6.0"; sha256="0zin3ikc013hc713n5zs0dbhc3m4nfw1vhc3924z0mrww8r241xn"; depends=[bayestestR insight]; }; + parameters = derive2 { name="parameters"; version="0.6.1"; sha256="0mylxkf1y6mk4kf6c57x102sf4c800pfasjcfbf1hnsh6ya0m6dy"; depends=[bayestestR insight]; }; paramhetero = derive2 { name="paramhetero"; version="0.2.0"; sha256="16gvs8328bnqvhx47f0xwnmbmlakxmp4ivnjxk2b13z6qjs70ij4"; depends=[ggplot2 ggpubr lme4 survey]; }; paramlink = derive2 { name="paramlink"; version="1.1-2"; sha256="0y6wsrxwyavipmrjjznr2n920w0p6qlwapxc9mnkh9c6w3yznka2"; depends=[assertthat kinship2 maxLik]; }; params = derive2 { name="params"; version="0.6.1"; sha256="0w7k8k7z8p1y2w0dhpfssa868xaikfzfdjw2vlj1yl299k5yisax"; depends=[whisker]; }; @@ -11446,10 +11469,10 @@ in with self; { parsec = derive2 { name="parsec"; version="1.2.3"; sha256="142zxj34qsf0s537bcabf04yi2qfmy65bgczpkvbyv5vkajxl10v"; depends=[igraph netrankr]; }; parsedate = derive2 { name="parsedate"; version="1.2.0"; sha256="0gb3w6hmwxayhijpf36p5dk4h6bbdps57x3cgikwvvxkgi83rarr"; depends=[rematch2]; }; parsemsf = derive2 { name="parsemsf"; version="0.1.1"; sha256="0ks4503k06ib5lq4ar2rg0sdni99rjcqxj76b0mclasxbi07kjsa"; depends=[DBI dbplyr dplyr lazyeval RSQLite stringr tidyr]; }; - parsetools = derive2 { name="parsetools"; version="0.1.2"; sha256="0rdznny4wqq721ikcarpf4lcp9cb6911zpvjsn37flnclhvjwj0i"; depends=[]; }; - parsnip = derive2 { name="parsnip"; version="0.0.5"; sha256="1y3bkxkk1ib5p6zzz5js28n761rmxgws3rl1ravq37vk0h16bhg1"; depends=[dplyr generics globals glue magrittr prettyunits purrr rlang tibble tidyr vctrs]; }; + parsetools = derive2 { name="parsetools"; version="0.1.3"; sha256="1d18cdaw90g3362218d5i1j8n30p46drjygfri79sqgxhidb25sz"; depends=[]; }; + parsnip = derive2 { name="parsnip"; version="0.1.0"; sha256="0z28dwm1z5crlgrpkxfdllynhnhbr91qp7c03pv25wpkf445ypxb"; depends=[dplyr generics globals glue magrittr prettyunits purrr rlang tibble tidyr vctrs]; }; partDSA = derive2 { name="partDSA"; version="0.9.14"; sha256="1kp0cdsdjiay349jz22iqfzvspny8s343cfan8xahgf931k9h8p6"; depends=[survival]; }; - partialAR = derive2 { name="partialAR"; version="1.0.11"; sha256="1x7vsrjn91nr4bbkzz9mp8h93j9yhwwaqw1abh5n3bsrkq3xmgqj"; depends=[data_table ggplot2 KFAS MASS plot3D Rcpp tseries urca zoo]; }; + partialAR = derive2 { name="partialAR"; version="1.0.12"; sha256="0fv1ffgqdbl04b4cmfmvzwah8ms9cxx3dsdralkk92bxxhybcjsl"; depends=[data_table ggplot2 KFAS MASS plot3D Rcpp tseries urca zoo]; }; partialCI = derive2 { name="partialCI"; version="1.2.0"; sha256="0hi936yg4g5bg61ix2i68f8q4c5nvvshl2728ynz1rl970qfcrp7"; depends=[data_table ggplot2 glmnet KFAS MASS partialAR Rcpp TTR zoo]; }; partialOR = derive2 { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpxq5rxb6crp7yhlc13i42kybv8fr10jaagjj"; depends=[nnet]; }; particles = derive2 { name="particles"; version="0.2.2"; sha256="0pncfpk89hsfjch8h5b86rx7hsgdyg9bsxc54f5bf0y8gh9v98qj"; depends=[digest dplyr igraph magrittr mgcv Rcpp rlang tidygraph]; }; @@ -11484,7 +11507,7 @@ in with self; { patrick = derive2 { name="patrick"; version="0.0.1"; sha256="16r0q3d9bq06393v46gabn9y9w2w7nqjcl65b7y2ryp35nv0aqsi"; depends=[dplyr purrr rlang testthat tibble]; }; patternator = derive2 { name="patternator"; version="0.1.0"; sha256="0s4vrhdfblllnhpz2awhhrkwm8d4170xg7fpsp7kvvqy8z8biwvi"; depends=[data_table]; }; patternize = derive2 { name="patternize"; version="0.0.2"; sha256="0hd6l66ybrjjndad5m2li9qqsjd0k2blhvjm469j6ab95073zq9f"; depends=[abind dplyr imager magrittr Morpho purrr raster rgdal RNiftyReg sp vegan]; }; - patternplot = derive2 { name="patternplot"; version="0.3.2"; sha256="0bzy1fq9za1251h8iiixyq397wnw9k3s59i3wi2pyjca2dydhr9a"; depends=[dplyr ggplot2 gridExtra gtable jpeg png R6 Rcpp RcppParallel]; }; + patternplot = derive2 { name="patternplot"; version="1.0.0"; sha256="0n4y23g894amwi62lx10k15i28rsmiaw52bds8dzmvkykkp9mm8q"; depends=[dplyr ggplot2 gridExtra gtable jpeg png R6 Rcpp RcppParallel]; }; pauwels2014 = derive2 { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; }; pavo = derive2 { name="pavo"; version="2.4.0"; sha256="1f71plrm5j5k66lw0za1a16rfjbl1gq4cwczybrc9rpzz6a0i6li"; depends=[cluster future_apply geometry lightr magick plot3D progressr sp viridisLite]; }; pawacc = derive2 { name="pawacc"; version="1.2.2"; sha256="0d5k0bq8zmb7sjvba3ljp97mba2iycnw44rnsnn2aajs02l1c2xg"; depends=[SparseM]; }; @@ -11565,6 +11588,7 @@ in with self; { pear = derive2 { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1q90lhddq4sp46m0q7qyxb192"; depends=[]; }; pearson7 = derive2 { name="pearson7"; version="1.0-2"; sha256="0x8bnlzgmfah8lzdg8skxs7bm8yq0nkrhqi7q43h902j4jl5b8jy"; depends=[]; }; pec = derive2 { name="pec"; version="2019.11.03"; sha256="1h6fk3k9w61a9xqhvkm1zdv75nsl06n78036qvcxkcf0bkfxl360"; depends=[foreach prodlim rms survival timereg]; }; + pedSimulate = derive2 { name="pedSimulate"; version="0.0.3"; sha256="0nm8iszmi3f91l09ziw5iwmkdggx9j8w17sx3k2ar4wibq4swsfi"; depends=[]; }; pedgene = derive2 { name="pedgene"; version="3.3"; sha256="0y6kr5ad4fmxljsj0czs9h1dkz63wvqiira9ibgsf0707xb0vh7f"; depends=[CompQuadForm kinship2 Matrix survey]; }; pedigree = derive2 { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[HaploSim Matrix reshape]; }; pedigreeTools = derive2 { name="pedigreeTools"; version="0.1"; sha256="0kgbjyw9dlp4s91cyg5w0p2vn2h9pg9ixrhc5pwvkp3v1acd0xfm"; depends=[Matrix]; }; @@ -11572,7 +11596,7 @@ in with self; { pedmut = derive2 { name="pedmut"; version="0.1.0"; sha256="0b8qlcl4g8kjix4q1drs1yk7wnilxqslv4p8svyabcg8wb4bnvwa"; depends=[]; }; pedometrics = derive2 { name="pedometrics"; version="0.7.0"; sha256="0rqldc67yrcg16i5q9wrmfmh3lw3qrfdxwdb4mxkjxx18v4fv737"; depends=[lattice latticeExtra Rcpp]; }; pedprobr = derive2 { name="pedprobr"; version="0.2.0"; sha256="1s986n05wciq0nwvaqhq5d4rdzdh9sli66qihmfm43rqy246kjlr"; depends=[pedmut pedtools]; }; - pedquant = derive2 { name="pedquant"; version="0.1.3"; sha256="11l6h0pvysb02f81rnwsyc8c2xj3p4smgi9dbmsv41ka54v6rss7"; depends=[curl data_table ggplot2 gridExtra httr jsonlite readr readxl rvest scales stringi TTR xml2 zoo]; }; + pedquant = derive2 { name="pedquant"; version="0.1.5"; sha256="01kmagaapx5qlvar0l862rl8s1caqzdld3qjygxi9zl232042x89"; depends=[curl data_table ggplot2 gridExtra httr jsonlite readr readxl rvest scales stringi TTR xml2 zoo]; }; pedtools = derive2 { name="pedtools"; version="0.9.3"; sha256="1jc11d1hd4wwc3lfa5h7g9sy6crybidc2mlasc3sbasjdzr1cyxb"; depends=[kinship2]; }; pegas = derive2 { name="pegas"; version="0.13"; sha256="002i7s4g0nhnq0v05gs0yssqiyhpq2f7rw2rhn31hsbgxc86frvy"; depends=[adegenet ape]; }; pems_utils = derive2 { name="pems.utils"; version="0.2.26.4"; sha256="13d5cg2wdz84inby017bra6xzwhkp5qcy1b213r387fq771h2xrx"; depends=[baseline dplyr ggplot2 lattice latticeExtra loa RColorBrewer Rcpp rlang]; }; @@ -11586,7 +11610,7 @@ in with self; { pencopulaCond = derive2 { name="pencopulaCond"; version="0.2"; sha256="18hjjxnd0l2ms20ddqkghfbd4as5kq2rgwqzpz4y38k6nw76x511"; depends=[doParallel fda foreach igraph lattice latticeExtra pacotest quadprog TSP]; }; pendensity = derive2 { name="pendensity"; version="0.2.13"; sha256="1wcsib7m2161nqqrmgdvrj7lr8zq6njc9xr935hwfh3qbbgkmfjb"; depends=[fda lattice]; }; pense = derive2 { name="pense"; version="1.2.9"; sha256="0ls573kx3z09v848fi5pvidc5l2dhmqv9vvyjspzzfiff3z6w09i"; depends=[Matrix Rcpp RcppArmadillo robustbase]; }; - pensim = derive2 { name="pensim"; version="1.3.1"; sha256="0n4f4vyyvr362fd8sbppwhbhrfr6wvfa5706ynhx82xmq04rkfcn"; depends=[MASS penalized]; }; + pensim = derive2 { name="pensim"; version="1.3.2"; sha256="12rh9n6jjnlzjsdjjw60ams7l0n05skwkbql5d0jqrmpbxrca6rp"; depends=[MASS penalized]; }; peperr = derive2 { name="peperr"; version="1.1-7.1"; sha256="12k9crhsv3p4zrcbyr85cfwp68z3r1w2kb62g7jb7h311c7zykjx"; depends=[snowfall survival]; }; peptider = derive2 { name="peptider"; version="0.2.2"; sha256="109z81x6jcsx2651lclff7ak55zb1i89pyi58rxri40aamx4b1x2"; depends=[discreteRV dplyr plyr]; }; pequod = derive2 { name="pequod"; version="0.0-5"; sha256="0mwrgyrxgiifpnpy15qxpdrdmd7dxqihccrnj5nh8fq9fvwymamg"; depends=[car ggplot2]; }; @@ -11658,15 +11682,14 @@ in with self; { phiDelta = derive2 { name="phiDelta"; version="1.0.1"; sha256="0g1g5516p8i1gfpvsy75rdirib8sx1ki2mbf1cvgsnzh70h72gbv"; depends=[]; }; phia = derive2 { name="phia"; version="0.2-1"; sha256="0rv2akl5a488vax4sd9wnx765mch4vvcmg3iyxyljzl5kpqh5r00"; depends=[car Matrix]; }; philentropy = derive2 { name="philentropy"; version="0.4.0"; sha256="09vi6mfcig397226kq2fgymwg5ng8iysi6b2f616masscgshplxz"; depends=[dplyr KernSmooth Rcpp]; }; - phmm = derive2 { name="phmm"; version="0.7-14"; sha256="1kq7xgw3afzy1crbzqjpf2zqavmhiqkxh66j3nfisa1h4cq4kj9l"; depends=[lattice Matrix survival]; }; phonR = derive2 { name="phonR"; version="1.0-7"; sha256="0al2cbynnbvmd90lk1w1g1ppslqq0ng8vbb6bl7m4kqwd2lgv056"; depends=[deldir plotrix splancs]; }; phonTools = derive2 { name="phonTools"; version="0.2-2.1"; sha256="01i481mhswsys3gpasw9gn6nxkfmi7bz46g5c84m13pg0cv8hxc7"; depends=[]; }; phonenumber = derive2 { name="phonenumber"; version="0.2.2"; sha256="1m5idp538lvynmfp8m7l89js6hk5lpp26k419bdvj3hd3ap0n9lg"; depends=[]; }; phonfieldwork = derive2 { name="phonfieldwork"; version="0.0.3"; sha256="1d7rhyzdhm17hdd7ibvkgz3js01c7wskvxlhr1c6kzbvf0mibmb6"; depends=[phonTools rmarkdown tuneR]; }; phonics = derive2 { name="phonics"; version="1.3.2"; sha256="03iacdpzzw90jgh38mhs49gswz3292nlkizc1xr02xry6nd7357a"; depends=[BH data_table Rcpp]; }; - photobiology = derive2 { name="photobiology"; version="0.10.0"; sha256="04i8s658r4y1aynhnv58xgwcqc9la6yjn0gax791qs29ilxqs5zp"; depends=[dplyr lubridate plyr polynom rlang splus2R stringr tibble zoo]; }; + photobiology = derive2 { name="photobiology"; version="0.10.1"; sha256="1wg98lsixdz1qimigjxx7gwqxv36mgyb5i065gmsjf5jhd6w40jw"; depends=[dplyr lubridate plyr polynom rlang splus2R stringr tibble zoo]; }; photobiologyFilters = derive2 { name="photobiologyFilters"; version="0.5.0"; sha256="1zijk6g9xf29ql7pybjs1zqkyn8s2zav4vz2pskj548v6hmrcw3x"; depends=[photobiology]; }; - photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.22"; sha256="0zk9cikvvxh8k9yixq3ssv9yk9i6142fp7iijm4n48nzma61fdd3"; depends=[colorSpec dplyr lazyeval lubridate photobiology readr readxl stringr tibble tidyr]; }; + photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.22-1"; sha256="1dqjlcra3vqydxjf6rwha6y1bykkpqwf8bqjkljs4kb89642qbv1"; depends=[colorSpec dplyr lazyeval lubridate photobiology readr readxl stringr tibble tidyr]; }; photobiologyLEDs = derive2 { name="photobiologyLEDs"; version="0.4.3-1"; sha256="0inhl6ba1fzkak4752m60hkm6fzapzyz5kchvz18yv33dmm13v1c"; depends=[photobiology]; }; photobiologyLamps = derive2 { name="photobiologyLamps"; version="0.4.3"; sha256="1df7ngcyrmvhab80w1ggyv1p9srsvwr9f6pm8yl7hvkpkv6jbdsk"; depends=[photobiology]; }; photobiologyPlants = derive2 { name="photobiologyPlants"; version="0.4.2"; sha256="0ab5ks72mb5x03xc0ww9fcl0h13ja8402b1s670lqmmhyvp6fj3s"; depends=[photobiology photobiologyWavebands]; }; @@ -11719,7 +11742,7 @@ in with self; { pinnacle_data = derive2 { name="pinnacle.data"; version="0.1.4"; sha256="1sl36i2857b3xwx7iwgy8mkgjvz7nfa74ch1n8kcxbj59ib7mp8p"; depends=[tibble]; }; pinochet = derive2 { name="pinochet"; version="0.1.0"; sha256="0qy18mlw34cv9p7b3qb5bidxyq44k0hzj91hm5vp6wkjhik4knvi"; depends=[]; }; pinp = derive2 { name="pinp"; version="0.0.9"; sha256="1hdj0mqwz0hwl6jsh5zknbgg10bj49giqnr4y3lavfbk8d7qmmvs"; depends=[knitr rmarkdown]; }; - pins = derive2 { name="pins"; version="0.3.2"; sha256="0bjax4zwjx0csxqrn5v80mqx8aw4apsrqggxncvwprd98wlyakjr"; depends=[base64enc crayon httr jsonlite magrittr mime openssl rappdirs withr yaml zip]; }; + pins = derive2 { name="pins"; version="0.4.0"; sha256="1dg4553hjfy948nq3y7fx90ybdxnlwkfjv7zjfrf128zdwpvnb7x"; depends=[backports base64enc crayon digest filelock httr jsonlite magrittr mime openssl rappdirs withr yaml zip]; }; pinyin = derive2 { name="pinyin"; version="1.1.6"; sha256="0rw9qd5hbcmpi30vdqs31ijy37d8jlpqv0xif2nndb8cwj8x5bw2"; depends=[data_table splitstackshape]; }; pipe_design = derive2 { name="pipe.design"; version="0.5.1"; sha256="0r0szkdzifxmnnbr6675w8ij4zwqgxj3gwahc7a74mxr51f7qh8j"; depends=[ggplot2 gtools xtable]; }; pipeGS = derive2 { name="pipeGS"; version="0.4"; sha256="0ki4i70r5f195b4jfv3hxlxz3zj57mhy2yf4984bwr11impilz5w"; depends=[]; }; @@ -11738,10 +11761,10 @@ in with self; { pixmap = derive2 { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; }; pkgKitten = derive2 { name="pkgKitten"; version="0.1.5"; sha256="0nnib0gv9g22b9p01xigsgj04jv29fv7f444invfphfh9cc866m4"; depends=[]; }; pkgbuild = derive2 { name="pkgbuild"; version="1.0.6"; sha256="0xnlz6ivhkbmncg9hfw5p69lm4rjy3wn5lyxmygxyf4rrfnnqwxx"; depends=[callr cli crayon desc prettyunits R6 rprojroot withr]; }; - pkgcache = derive2 { name="pkgcache"; version="1.0.6"; sha256="1wxxrcrckgrbsqrk2l4xrrkmya85pzjij1nc8cqcym8q0sgy7vph"; depends=[assertthat callr cli curl digest filelock glue prettyunits processx R6 rappdirs rlang tibble uuid]; }; + pkgcache = derive2 { name="pkgcache"; version="1.0.7"; sha256="1abjswh5jkx60vssrsfgznl2l97rys00icwrxp1pm6i99aqsiscp"; depends=[assertthat callr cli curl digest filelock glue prettyunits processx R6 rappdirs rlang tibble uuid]; }; pkgcond = derive2 { name="pkgcond"; version="0.1.0"; sha256="0pxj798042g23cf19r67nbgdyhpd868n2pkqjvjgrgr8ivwnkf1h"; depends=[]; }; pkgconfig = derive2 { name="pkgconfig"; version="2.0.3"; sha256="0l1qph8zyi2sic3k2qcd7vlfl7rzfh1q7z7zvjkl5f7y1x2fy3rk"; depends=[]; }; - pkgdown = derive2 { name="pkgdown"; version="1.5.0"; sha256="03r33cdnbq3xzm9485xhq2pn3vwxiji6rz5s7lvrcyq2k0gmdw7g"; depends=[callr cli crayon desc digest evaluate fansi fs highlight httr magrittr MASS memoise openssl processx purrr rematch2 rlang rmarkdown rstudioapi tibble whisker withr xml2 yaml]; }; + pkgdown = derive2 { name="pkgdown"; version="1.5.1"; sha256="0sy7f4bzbdzh2z8m30hq2i5yx9vrpmridrg4l85qpvwm5j7yhd88"; depends=[callr cli crayon desc digest evaluate fansi fs highlight httr magrittr MASS memoise openssl processx purrr rematch2 rlang rmarkdown rstudioapi tibble whisker withr xml2 yaml]; }; pkgfilecache = derive2 { name="pkgfilecache"; version="0.1.2"; sha256="07x63w19fg7sl547501r2dx2ds5sfdfb29xvqrvjibf8265x25fw"; depends=[downloader rappdirs]; }; pkggraph = derive2 { name="pkggraph"; version="0.2.3"; sha256="1isiywgm20rypc5qr03p0k7lis76zzd96x5ncbvia644d2n13brm"; depends=[curl data_table dplyr ggnetwork ggplot2 htmltools igraph intergraph Matrix network networkD3 plyr RColorBrewer tibble]; }; pkgload = derive2 { name="pkgload"; version="1.0.2"; sha256="0z7jvharafahi2gv5547mk1n499isjzw06kfwymmxc0gd575d1ii"; depends=[desc pkgbuild rlang rprojroot rstudioapi withr]; }; @@ -11754,7 +11777,6 @@ in with self; { pks = derive2 { name="pks"; version="0.4-1"; sha256="1lwm65s2b9y6vr1yr683n535yz8hbzc6j289a6yp45v2yai72m07"; depends=[sets]; }; pksensi = derive2 { name="pksensi"; version="1.1.5"; sha256="108qm4y1ss1pd6nhckwmg8b45hc3pg0xn5ch8q2xzi1h9imm7hz3"; depends=[data_table deSolve dplyr getPass ggplot2 magrittr reshape]; }; plRasch = derive2 { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; }; - pla = derive2 { name="pla"; version="0.2"; sha256="1qb71zjcxvs3zbfy0sryyxizwix0nw530zsfw661a8vm8sk054kw"; depends=[]; }; plac = derive2 { name="plac"; version="0.1.1"; sha256="08kqnjzbfygnbqvqg5wyw148kfhjqxy46y4vaiq9zzwzj58w8vzn"; depends=[Rcpp RcppEigen survival]; }; placer = derive2 { name="placer"; version="0.1.3"; sha256="0d7b6mkyyrcjn1pqxlj9mjis6vzks986i7vhc8ffkp8hz8sc7271"; depends=[]; }; plainview = derive2 { name="plainview"; version="0.1.0"; sha256="0yvw357p1hwrlj4c2sjr4klmy6j98a3kbdfwg0snaiv0drdyhznk"; depends=[gdalUtils htmltools htmlwidgets lattice png raster viridisLite]; }; @@ -11796,10 +11818,10 @@ in with self; { plotluck = derive2 { name="plotluck"; version="1.1.1"; sha256="16wqj4xfa8b7kal6v8mp2zlhwf9l3y6y5n44qbpvy652gzb2rw2z"; depends=[ggplot2 hexbin Hmisc plyr quantreg RColorBrewer scales]; }; plotly = derive2 { name="plotly"; version="4.9.2.1"; sha256="1f0x83a2s7200iqi6gpngijks06fcvcbm6701d5r5rxpb8rawppl"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 hexbin htmltools htmlwidgets httr jsonlite lazyeval magrittr promises purrr RColorBrewer rlang scales tibble tidyr viridisLite]; }; plotlyGeoAssets = derive2 { name="plotlyGeoAssets"; version="0.0.2"; sha256="1c6i4dz5qmym1pcddgffcqgb76jz84252xldprg2caylrqvzv6b7"; depends=[]; }; - plotmo = derive2 { name="plotmo"; version="3.5.6"; sha256="15555b7y62sc0z3r41gb56fmc6rmj1icnanyibx22v8kjz48vw3q"; depends=[Formula plotrix TeachingDemos]; }; + plotmo = derive2 { name="plotmo"; version="3.5.7"; sha256="135k643vf2np0y20zrhfy4id1bjg7bi285csg5fzvarwlr4nldma"; depends=[Formula plotrix TeachingDemos]; }; plotpc = derive2 { name="plotpc"; version="1.0.4"; sha256="1sf7n7mfyaijldm24bc8r8pfm8pp9cyaja7am14z2wpj2j9f9vyq"; depends=[]; }; plotprotein = derive2 { name="plotprotein"; version="1.0"; sha256="14kfb4xxpfp8klz31kb7cpc39636ax2cx2483vqqkciccb28f0ks"; depends=[ade4 plotrix plyr seqinr XML]; }; - plotrix = derive2 { name="plotrix"; version="3.7-7"; sha256="1x92mmyfry127zzr6cmcj6kjsc4zhxrrdlr0jcxn3bb0hpdfps54"; depends=[]; }; + plotrix = derive2 { name="plotrix"; version="3.7-8"; sha256="104llmr6dvlcnfpmd8zbdlv63k79djc4qqgadjavj4v4cmz1zkcc"; depends=[]; }; plotrr = derive2 { name="plotrr"; version="1.0.0"; sha256="07ilqpa3ypqb2gpnq23r9v4kkfxz06mcak9si9adr9sf6c7gqwxz"; depends=[dplyr ggplot2]; }; plotscale = derive2 { name="plotscale"; version="0.1.6"; sha256="0h2g0rv1lh70nqmqydgg5swwnwmy08wbjajxyb1c2a716rad765j"; depends=[]; }; plotwidgets = derive2 { name="plotwidgets"; version="0.4"; sha256="1w7c9grw4pyyra230196yq32snr4wdg6xi8vh4dx5df2v500wz22"; depends=[]; }; @@ -11811,6 +11833,7 @@ in with self; { plsdepot = derive2 { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; }; plsdof = derive2 { name="plsdof"; version="0.2-9"; sha256="1g41nbycgzjwrackbdf08q1phqpyy6zihm5ak2728683vd88fxzv"; depends=[MASS]; }; plsgenomics = derive2 { name="plsgenomics"; version="1.5-2"; sha256="1pvb50nv6jc99bm2hsxpzazg26y49yi24wwwim5xcjj6j1szbip4"; depends=[boot fields MASS plyr reshape2 RhpcBLASctl]; }; + plsmod = derive2 { name="plsmod"; version="0.0.1"; sha256="16yc8ydkc054is0f17nly4kwakfh410i3hqwas0479v1qywcszxb"; depends=[dplyr generics magrittr mixOmics parsnip purrr rlang tibble tidyr]; }; plsmselect = derive2 { name="plsmselect"; version="0.2.0"; sha256="044mwdqv5vw0apmx3yhn6xkdmw6baalvb8c6hhmawcs279kwi1m9"; depends=[dplyr glmnet mgcv survival]; }; plspm = derive2 { name="plspm"; version="0.4.9"; sha256="03aj1ffq11hh931dbkxy9ba74xyvzmr1ylrj4fw1rbryrwqg89v6"; depends=[amap diagram shape tester turner]; }; plspm_formula = derive2 { name="plspm.formula"; version="1.0.1"; sha256="1i2d1q8pz21js1ci8afnqzcky430hh1iwf5f6jr3j9yr9gs365k5"; depends=[plspm]; }; @@ -11829,7 +11852,7 @@ in with self; { pmd = derive2 { name="pmd"; version="0.1.5"; sha256="18a7j5lvsl2jsay4g7790slj12xkljlnrpvg66cq5cvsid8qm8x8"; depends=[rcdk RColorBrewer rmarkdown shiny]; }; pmdplyr = derive2 { name="pmdplyr"; version="0.3.1"; sha256="1155hikxfz9rp111sy96kj2dkka45ip1xi7kximq9ilsn5kwswzn"; depends=[dplyr lubridate magrittr pillar rlang tibble tidyr tidyselect vctrs]; }; pmhtutorial = derive2 { name="pmhtutorial"; version="1.5"; sha256="1hcw8hwpsivbhz86lnzy08q9n8vahnq8f7rmi4xkmg6b44582cqx"; depends=[mvtnorm Quandl]; }; - pmml = derive2 { name="pmml"; version="2.3.0"; sha256="13w5i98yj3ksbryzsgkx3i59iafywygyq1dk8x2c0nlb1nm0dji9"; depends=[stringr XML]; }; + pmml = derive2 { name="pmml"; version="2.3.1"; sha256="1qsrpbmwgmq9s45f30657cpfzkrvva8h1hqq1g3fd69p5g735rwp"; depends=[stringr XML]; }; pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.3"; sha256="0315kb5x04pidpzr04yaxyynp0mz4ilzp7vkspq4agjkds5hyc88"; depends=[]; }; pmpp = derive2 { name="pmpp"; version="0.1.1"; sha256="1srmkih6zsyf8yf1f045xy1afcz0if6nf1ncslgrq6rgm7330lkw"; depends=[data_table dplyr ggplot2 magrittr MASS Matrix minqa moments plm pracma]; }; pmr = derive2 { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; }; @@ -11847,7 +11870,7 @@ in with self; { pointRes = derive2 { name="pointRes"; version="1.1.3"; sha256="0yfzidc93ghpf116lxbx4fr0d71wl79y3nz6mkirx4pli6gb8x8d"; depends=[ggplot2 gridExtra plyr TripleR]; }; pointblank = derive2 { name="pointblank"; version="0.3.1.1"; sha256="0qqj3x4zvh14b2kirvvyzscm9jsk6k11s6cqjdwv6pyb32afn1iq"; depends=[blastula cli DBI dbplyr dplyr ggforce ggplot2 glue gt htmltools magrittr rlang scales tibble tidyselect]; }; pointdensityP = derive2 { name="pointdensityP"; version="0.3.4"; sha256="0vv8j1yz8n2vmmp6bg2i8w3dchdbybsdxn3sk5d1ync2knih8l2s"; depends=[data_table]; }; - poio = derive2 { name="poio"; version="0.0-3"; sha256="1smbnqjlicaqq2hswl910yiirzb9zikbk4pqxm9pwpixywj0nkys"; depends=[assertive_base assertive_files assertive_properties assertive_sets assertive_strings assertive_types devtools digest dplyr magrittr R6 stringi tibble whoami]; }; + poio = derive2 { name="poio"; version="0.0-4"; sha256="12d47hn9rsx2n0fl107dpswfklnh8nkm0kspcxf7yfljayvxr474"; depends=[assertive_base assertive_files assertive_properties assertive_sets assertive_strings assertive_types devtools digest dplyr magrittr purrr R6 stringi tibble whoami]; }; poisDoubleSamp = derive2 { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp]; }; poisFErobust = derive2 { name="poisFErobust"; version="2.0.0"; sha256="1i6y3745i385y3r45i0xk7ciw1k6brmn709k5qhx8xphq0k4an5n"; depends=[data_table glmmML]; }; poisbinom = derive2 { name="poisbinom"; version="1.0.1"; sha256="0mjxg0s3nck7qrmq4bbrhwxfwr6fqml54s9k8q1mkfzlifa7qyf7"; depends=[Rcpp]; }; @@ -11855,18 +11878,19 @@ in with self; { poisson = derive2 { name="poisson"; version="1.0"; sha256="1diyf1b84sr6iai3ghd3kcp6fc6w7fan49wzs1lzvxxsmp15ag2d"; depends=[]; }; poisson_glm_mix = derive2 { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; }; poissonMT = derive2 { name="poissonMT"; version="0.3-5"; sha256="14qkc8qz3423b13gp6gsp8cbb1nv9wwjjfa4i9zc15qy5i99ha26"; depends=[checkmate MASS robcbi robustbase]; }; + poissonreg = derive2 { name="poissonreg"; version="0.0.1"; sha256="04qika4k0hak8kp6z4jqdzslymy7wklw4bx6kcmz3932avlwyym9"; depends=[dplyr glue parsnip purrr rlang tibble tidyr]; }; poistweedie = derive2 { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; }; poker = derive2 { name="poker"; version="0.8.8"; sha256="14ik77440z22k4kwq0p1fn7adzi0p8mh8j8hd7ayinvrab4b5r85"; depends=[]; }; polaroid = derive2 { name="polaroid"; version="0.0.1"; sha256="0m3jbiz4n7mgbbdkd28m6dqsclyjcgshpxd6ws8df7zchx7fch07"; depends=[argonDash argonR colourpicker ggplot2 hexSticker png shiny shinyWidgets]; }; policytree = derive2 { name="policytree"; version="0.9.2"; sha256="0d0b3rdmcr692rkbg223l0cwc86zlj2p75m9jlgk6w07f1n2h68p"; depends=[BH grf Rcpp]; }; poliscidata = derive2 { name="poliscidata"; version="2.2.3"; sha256="18mmdzf9hrfz36rh1rg1j5q1m131xadppy272y4f4yay0ljafbm2"; depends=[abind car descr ENmisc gplots Hmisc plotrix plyr survey weights xtable]; }; polite = derive2 { name="polite"; version="0.1.1"; sha256="15hiifaf63hx0xn453lr0xhdnxqifrgyrgrymp0a9k3j7qja59jk"; depends=[here httr magrittr memoise ratelimitr robotstxt rvest usethis]; }; - politeness = derive2 { name="politeness"; version="0.5.1"; sha256="0vvqh53kj4vm6wfg2fk5gdxyiycg7zg72m8d7qym9si930jbm32s"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textclean textir tm]; }; + politeness = derive2 { name="politeness"; version="0.6.0"; sha256="1mrg4k76h77qrd34b8imcn4nh0vchf8v6jbymlgigxgr7m75gpmj"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textclean textir tm]; }; politicaldata = derive2 { name="politicaldata"; version="0.1.3"; sha256="1n25k53mmlmmg9p9a36jh4z6xhl1yyv9v1c56mav873105h359wi"; depends=[]; }; pollen = derive2 { name="pollen"; version="0.72.0"; sha256="0plxc7rys5q4c1dwammv3b2pnys1hdh5ic0b2ndmv5cbyspf2h0y"; depends=[dplyr lubridate purrr]; }; pollimetry = derive2 { name="pollimetry"; version="1.0.1"; sha256="09zmcwlgzl4fnkdg2m424ibv3izzrm595c7pi4mc3bd1g8sa2ypn"; depends=[brms repmis]; }; pollstR = derive2 { name="pollstR"; version="2.0.1"; sha256="13g5z1hix1bmsxznq5qx82yf445rvvyn67ch9bihxm1hr4cr4sbl"; depends=[httr lubridate purrr stringr]; }; - pollster = derive2 { name="pollster"; version="0.1.0"; sha256="1hyh9xc6h6lzsbgymg3m1660ia7bg9c9nv2dgsy83lzpjrzc7yn5"; depends=[dplyr forcats labelled lubridate rlang stringr tidyr]; }; + pollster = derive2 { name="pollster"; version="0.1.1"; sha256="1a4k0d5cs9sziq1idd4q6dakl8cy3w8iakgqnd40w3d7vx63hmfd"; depends=[dplyr forcats labelled rlang stringr tidyr]; }; polmineR = derive2 { name="polmineR"; version="0.8.0"; sha256="1j9f83b1lfb02q830zaffrspxrhp58j9l3cc80cxiflmkm9s1jm9"; depends=[data_table DT jsonlite knitr magrittr Matrix pbapply R6 RcppCWB slam stringi tm xml2]; }; polspline = derive2 { name="polspline"; version="1.1.17"; sha256="0c7fnxpqpy3hibiim4yib6l6bq363s97wwvllxp4lp8h06fjcyyn"; depends=[]; }; polyCub = derive2 { name="polyCub"; version="0.7.1"; sha256="0ln1n5w64vgq63gm4mm9wzl9lbp7ppgaxg0ba0yw0xsr5cmkyp37"; depends=[sp]; }; @@ -11881,7 +11905,7 @@ in with self; { polycor = derive2 { name="polycor"; version="0.7-10"; sha256="0wzwzklflbhi8sv9m7ijwr16v9zmkk0j0v4pbcpf32f8lbn3psna"; depends=[Matrix mvtnorm]; }; polyfreqs = derive2 { name="polyfreqs"; version="1.0.2"; sha256="13859vbpys5yj1qiapyzv9wlvi6x6k0rm335bsi1v07ch3x2bh3b"; depends=[Rcpp]; }; polyglot = derive2 { name="polyglot"; version="0.2.1"; sha256="1w52vhix5pynx2gz9f71yi9x5cdkp4sbs98zz2d5z993qbbf1wyq"; depends=[magick]; }; - polylabelr = derive2 { name="polylabelr"; version="0.1.0"; sha256="1bki35p6a8bgmdwll9sczdicdkvmxcl55vbx5xiabkz58imvcmym"; depends=[Rcpp]; }; + polylabelr = derive2 { name="polylabelr"; version="0.2.0"; sha256="01b2v0l5g8nxwbd6nwqv8ahypgh6gfhd4qabg75brlj7z1iyfzf2"; depends=[Rcpp]; }; polymapR = derive2 { name="polymapR"; version="1.0.20"; sha256="16gyzlvj2nfyl9ypv5cmvqvn3phxpxf36b0bnvslkxyyx0fsyxrx"; depends=[combinat doParallel foreach igraph knitr MDSMap]; }; polynom = derive2 { name="polynom"; version="1.4-0"; sha256="1pflscwc0qzdf0y60j7s0dkglgmz18xajywfbn6s263idyr8idy5"; depends=[]; }; polypoly = derive2 { name="polypoly"; version="0.0.2"; sha256="00c1hrnf575awvh0rlsnf6nkgi9p3fnqhd1knamkgb4icwi5s46d"; depends=[ggplot2 reshape2 rlang tibble]; }; @@ -11890,7 +11914,7 @@ in with self; { polywog = derive2 { name="polywog"; version="0.4-1"; sha256="02qk1cyvkd77mwlvhj1zzzi0bmy7qxz29j2v730wp7rz4w7h5x5n"; depends=[foreach Formula glmnet iterators Matrix miscTools ncvreg Rcpp stringr]; }; pom = derive2 { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; }; pomdp = derive2 { name="pomdp"; version="0.9.2"; sha256="0bzppkda355zj467ahcyaf2dsjajyiznzi0y07n9pf9ccr6rh5lg"; depends=[igraph]; }; - pomp = derive2 { name="pomp"; version="2.7"; sha256="0gqc84hsxms3s2qcb082vsvzfawbc5xyl11f3lkmqkpxmqyazs7h"; depends=[coda deSolve digest magrittr mvtnorm plyr reshape2]; }; + pomp = derive2 { name="pomp"; version="2.8"; sha256="13y1jfx9j2dqya9icv4k5wvkjs09d3xhqkzwicf0zdfqlypjd79l"; depends=[coda deSolve digest magrittr mvtnorm plyr reshape2]; }; pompom = derive2 { name="pompom"; version="0.2.0"; sha256="1alz3lrj7m16vhymsvvrcmf0kmgx88q2f3v4j6wiciqv77bnyai1"; depends=[ggplot2 lavaan qgraph reshape2]; }; pooh = derive2 { name="pooh"; version="0.3-2"; sha256="0qwa5j91aypasvsf4xcfbl6lz7llawdr38jiflzmfak2ad72rv7j"; depends=[]; }; pool = derive2 { name="pool"; version="0.1.4.3"; sha256="065pbvhgvvgv00df4kj4zn7mlbrv2iqa1583k0hlgavn15gfm6d2"; depends=[DBI dbplyr dplyr later R6]; }; @@ -11898,7 +11922,7 @@ in with self; { poolfstat = derive2 { name="poolfstat"; version="1.1.1"; sha256="12iwhfj1a87mbis7whgp4z3qg97xkj90rw8b9jsqnfmzhz6fn0yp"; depends=[doParallel foreach]; }; pooling = derive2 { name="pooling"; version="1.1.2"; sha256="19mrzax3k35fhgjpnlrigf0nscsdl3xb7k82s5q472k4bcz7ya5b"; depends=[cubature data_table dplyr dvmisc ggplot2 ggrepel mvtnorm numDeriv]; }; poolr = derive2 { name="poolr"; version="0.8-2"; sha256="1rkfnrz5x7f9kqpivj0gvs3fxfb9agnm8sybb7wmvvcsmshzrpkf"; depends=[Matrix]; }; - poorman = derive2 { name="poorman"; version="0.1.9"; sha256="0g3f02752i890pq3yayhjwlczddmwqcc67xza3249301k508vbpv"; depends=[]; }; + poorman = derive2 { name="poorman"; version="0.1.11"; sha256="06b1h2a391ha7jd38rr44mzf2wry2bcgg16ypcv2scnfiwm96gnk"; depends=[]; }; pop = derive2 { name="pop"; version="0.1"; sha256="0hbxdrkasb69x7ipddvyrzl5vvc7dd6rzj1vy7v3chg3rzgq89cj"; depends=[igraph MASS]; }; popEpi = derive2 { name="popEpi"; version="0.4.8"; sha256="1gc7kyik0209pc8mvl6c69lzb3dnkif0mby4l4pq8zfdz73lmi06"; depends=[data_table Epi survival]; }; popKorn = derive2 { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; }; @@ -11928,15 +11952,16 @@ in with self; { postlightmercury = derive2 { name="postlightmercury"; version="1.2"; sha256="1345ckp50jplcdqp3a250c6mhapqh9322jzpxj5dyqmbg2nmgp9i"; depends=[crul jsonlite purrr rvest tibble xml2]; }; postlogic = derive2 { name="postlogic"; version="0.1.0.1"; sha256="11bpmfn375zpyg90dh44h86cvppzri1smmkn26jyydqjz74f4q9w"; depends=[]; }; potts = derive2 { name="potts"; version="0.5-9"; sha256="1kiha209w9nyyx4qqsdp51q2y7ny67nzqkdanlrh2106lcab3hj8"; depends=[]; }; + pould = derive2 { name="pould"; version="1.0.0"; sha256="03338c61njhrb1dyxndyci1kdalzc38h0l7a1majv8nf82k40l62"; depends=[BIGDAWG gap ggplot2 haplo_stats reshape2]; }; povcalnetR = derive2 { name="povcalnetR"; version="0.1.0"; sha256="11hwb52lrvdxplsx85ps54k2k7cvr0k4g5s2cj2a5l3rlqbyayx8"; depends=[dplyr ggplot2 ggthemes httr js jsonlite memoise naniar purrr readr stringr tibble tidyr]; }; powdR = derive2 { name="powdR"; version="1.2.0"; sha256="0l1sb4bxam53jg1zfzqy851652c0yr88gz04z97cqdcn7smg6fgi"; depends=[baseline DT ggplot2 ggpubr nnls plotly plyr reshape shiny shinyWidgets tidyr]; }; powdist = derive2 { name="powdist"; version="0.1.4"; sha256="1my88ag5q9hwkn2wy79jl9008gpvg0bsrnyc81gkdfi7pjh2mp1z"; depends=[gamlss_dist normalp rmutil]; }; - poweRlaw = derive2 { name="poweRlaw"; version="0.70.2"; sha256="1asr6ikr7hmj78jyg8r1gwvcjg14addkxdiz92nh06lv71a183r4"; depends=[VGAM]; }; + poweRlaw = derive2 { name="poweRlaw"; version="0.70.5"; sha256="1z1x93zc4qim53bx4cjq611xfa1rxw7cr2j2saq9vxr1j58fw99p"; depends=[pracma]; }; powerAnalysis = derive2 { name="powerAnalysis"; version="0.2.1"; sha256="0cma4v402n6wcb2gy9g1ymydzh8vimy9nfrrn8xhnjsf7x6jh215"; depends=[]; }; powerCompRisk = derive2 { name="powerCompRisk"; version="1.0.1"; sha256="11xprjn9hzi8gxrsi7wivwgchg9h2apgxa63fp466ngjfy5ybxf4"; depends=[mvtnorm]; }; powerEQTL = derive2 { name="powerEQTL"; version="0.1.3"; sha256="1045vkzl5p20mqlsm0j6vnyyvfz5v6jyy443c38sw1cps0a09i1n"; depends=[powerMediation]; }; powerGWASinteraction = derive2 { name="powerGWASinteraction"; version="1.1.3"; sha256="1i8gfsk9qzx54yn661i4x9k7n7b6r1jd808wv1hcq7870mzyb27k"; depends=[mvtnorm pwr]; }; - powerMediation = derive2 { name="powerMediation"; version="0.2.9"; sha256="1rk8h8qn4b68ra5h5hiy9fvvbpskj9y806rwrvl1l7gs7xlmji7l"; depends=[]; }; + powerMediation = derive2 { name="powerMediation"; version="0.3.2"; sha256="06liw58hwvd5n55axwldrngwfqckmi5yh2i9b2c75cghqdnihvby"; depends=[]; }; powerSurvEpi = derive2 { name="powerSurvEpi"; version="0.1.0"; sha256="1xxicvw113mc2y889rklws3xml5z64sgjpn4wg95gbw6nadch7zz"; depends=[survival]; }; powerbydesign = derive2 { name="powerbydesign"; version="1.0.4"; sha256="0xd4hylx7jl4ksycz5gfjcgy92mh5c9d4r34ap1g81ybmyk7yrsj"; depends=[gdata ggplot2 lme4 MASS plyr reshape2 stringr]; }; powerlmm = derive2 { name="powerlmm"; version="0.4.0"; sha256="0dpfvbp54lhz7ibzihqqrbl45s6dqxn6qyvv39mk2166hjcgi1h2"; depends=[lme4 MASS Matrix scales]; }; @@ -11947,7 +11972,7 @@ in with self; { ppclust = derive2 { name="ppclust"; version="1.1.0"; sha256="0vmgjjy7gin88qailzfcwapndl5s8fm6i8kw9gv6aykg9mr75xlv"; depends=[inaparc MASS]; }; ppcong = derive2 { name="ppcong"; version="0.0.2"; sha256="0k34ibzyxak2a8xhsf4jdp50w8k8dsd1nn3gcdcakx8s2rgymq7v"; depends=[curl jsonlite tfse tibble]; }; ppcor = derive2 { name="ppcor"; version="1.1"; sha256="1x9b2kb8s0bp92b17gby0jwzzr3i4cf3ap9c4nq7m8fav72g0y3a"; depends=[MASS]; }; - ppgam = derive2 { name="ppgam"; version="1.0.0"; sha256="0wna2z8pvr0zxvlp7zbvjnl99r1z976jiq44gwh425ypnla6wgpp"; depends=[evgam MASS mgcv]; }; + ppgam = derive2 { name="ppgam"; version="1.0.1"; sha256="0w2jci5k0y8m7rapj8w6xq849y59m7y4fp9n3f5l6q954mbc6bv0"; depends=[evgam MASS mgcv]; }; ppgmmga = derive2 { name="ppgmmga"; version="1.2"; sha256="1dq0p3xna5r1kiyhiziz3wc78dfqh362qhna5hmkjzhljawr9jg0"; depends=[cli crayon GA ggplot2 ggthemes mclust Rcpp RcppArmadillo]; }; ppitables = derive2 { name="ppitables"; version="0.5.2"; sha256="1fwl2mscnfkbdpdjb0vkyv6xrbi73rfkxlbpri35hfqscaxlzk98"; depends=[tibble tidyr]; }; ppls = derive2 { name="ppls"; version="1.6-1.1"; sha256="1zyrisy3c4cz896j1bjh61sf57wdl9p8ywdq268cl819szfq78mx"; depends=[MASS]; }; @@ -11975,7 +12000,7 @@ in with self; { predict3d = derive2 { name="predict3d"; version="0.1.3.3"; sha256="1kb3jacpgzln1ddnkfzhvfpzzf9wig60lppca6iy0fvq5cm8ddr4"; depends=[dplyr ggiraphExtra ggplot2 magrittr modelr moonBook plyr prediction purrr reshape2 rgl rlang stringr TH_data tidyr]; }; prediction = derive2 { name="prediction"; version="0.3.14"; sha256="0awlq5lxfia6m2b91w73rksp93rbwv5gwqb36wbji4rgq41rzbrx"; depends=[data_table]; }; predictionInterval = derive2 { name="predictionInterval"; version="1.0.0"; sha256="029hc57cblfcbqckrghf95l2rkn7acgb4yr36da01bx8bmpww0bn"; depends=[ggplot2 MASS MBESS pbapply]; }; - predictmeans = derive2 { name="predictmeans"; version="1.0.2"; sha256="191kidf66xy8g779chpsyxp02hgn1npb4acga9nnd5f428bvzfc7"; depends=[ggplot2 lme4 Matrix nlme numDeriv pbkrtest plyr]; }; + predictmeans = derive2 { name="predictmeans"; version="1.0.4"; sha256="11282jzmlkbawsh1k4582a7yh4xxfh01sn6zp5nbdsr9c9p6vqfz"; depends=[ggplot2 lme4 Matrix nlme numDeriv pbkrtest plyr]; }; predictoR = derive2 { name="predictoR"; version="1.1.0"; sha256="12y23q08m7v4dl6anbkhf7zxy8wkah5bxy1c2fdcwb6ng3snpfvb"; depends=[ada colourpicker corrplot DT e1071 flexdashboard glmnet kknn neuralnet randomForest rattle ROCR rpart shiny shinyAce shinydashboardPlus shinyjs shinyWidgets tidyverse xgboost zip]; }; predictrace = derive2 { name="predictrace"; version="1.0.0"; sha256="1vpamn1j1jqdjar14j7fn4gvr8wq8lpqfnrwifgl0qvpa4y1938y"; depends=[dplyr here tidyr]; }; predkmeans = derive2 { name="predkmeans"; version="0.1.1"; sha256="0352c50zlyzn8fczrkinayllj9jp978njjl7dazzkzypx0p20va5"; depends=[e1071 maxLik mgcv Rcpp RcppArmadillo]; }; @@ -12058,7 +12083,7 @@ in with self; { progenyClust = derive2 { name="progenyClust"; version="1.2"; sha256="0azp5pvk316s8xbawcqwqfd80fxb4xn8hc6aq87xwksc6fhwp94l"; depends=[Hmisc]; }; prognosticROC = derive2 { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; }; progress = derive2 { name="progress"; version="1.2.2"; sha256="0dgzb362641aqm8xd88iqa8jmpdm43xs0aba0d5kk6fvapnxi95l"; depends=[crayon hms prettyunits R6]; }; - progressr = derive2 { name="progressr"; version="0.4.0"; sha256="1wgqabp8qmg58gymv3wq9ci5mp64isbdgg1by5s9g8ncwyhnfalb"; depends=[digest]; }; + progressr = derive2 { name="progressr"; version="0.5.0"; sha256="0w4vx1sk0qxnzkjqzvc6facd142qah2nzzkrcmgnsajp025xxfs5"; depends=[digest]; }; proj4 = derive2 { name="proj4"; version="1.0-10"; sha256="1l6i4735ki6y2qhmg1gmrj93rzrvgpzi23rr3a1akkqp58bnyfaz"; depends=[]; }; projections = derive2 { name="projections"; version="0.3.1"; sha256="12vskql6x04jzik72a0vx83amfj01w9f7mxn052vsv7aaljbi124"; depends=[distcrete ggplot2 incidence]; }; projects = derive2 { name="projects"; version="2.1.0"; sha256="0clrspmrlfi8w8h8afbpfjfg74qn1ys6zsb8gj3g5p0lcap2269g"; depends=[dplyr fs lubridate magrittr purrr readr rlang rstudioapi sessioninfo stringr tibble vctrs zip]; }; @@ -12066,16 +12091,14 @@ in with self; { projpred = derive2 { name="projpred"; version="1.1.6"; sha256="07bixjpnvj9i5hsr9bfycnxryzsw2vg27z1lw86aj7948wdjgar1"; depends=[ggplot2 loo Rcpp RcppArmadillo]; }; promises = derive2 { name="promises"; version="1.1.0"; sha256="01l0ydjvvy6afcg5d6pzvk1ikd3djq8n2flv8c831ksn68z0zsn8"; depends=[later magrittr R6 Rcpp rlang]; }; promote = derive2 { name="promote"; version="1.1.1"; sha256="1cdz4xqinyzpbbgkxxd4f86n1h8zj88vp5z6w01cxd5ykyjf5411"; depends=[httr jsonlite stringr]; }; - promotionImpact = derive2 { name="promotionImpact"; version="0.1.3"; sha256="1aik47g82mian7yv5a4vi7wr4a7vx8larfqgar1mf2a7kqv5ik7w"; depends=[crayon data_table dplyr ggplot2 ggpubr KernSmooth lmtest prophet Rcpp reshape2 scales stringr strucchange]; }; prop_comb_RR = derive2 { name="prop.comb.RR"; version="1.2"; sha256="10s52fkq7rv6v4gw1yd46f0fbg89ksim0qhgb5jbglzrqh585ny5"; depends=[rootSolve]; }; propOverlap = derive2 { name="propOverlap"; version="1.0"; sha256="0q72z9vbkpll4i3wy3fq06rz97in2cm3jjnvl6p9w8qc44zjlcyl"; depends=[Biobase]; }; propagate = derive2 { name="propagate"; version="1.0-6"; sha256="17jinz1jramlsf87i7vyn2qp82rc1dacljfaxxplrk3crhw3bhs7"; depends=[ff MASS minpack_lm Rcpp tmvtnorm]; }; properties = derive2 { name="properties"; version="0.0-9"; sha256="1zd66cg31yd53rqsc0cwxhlpfn7kvc67qdh3vyj9qib8kwxaw1zl"; depends=[]; }; - prophet = derive2 { name="prophet"; version="0.6"; sha256="17whiynwfff7xajj89flr80kz2k4x559cbhf72fvyf9xpqg3vg09"; depends=[dplyr dygraphs extraDistr ggplot2 Rcpp rlang rstan scales tidyr xts]; }; proportion = derive2 { name="proportion"; version="2.0.0"; sha256="0a71f6hz6blb7550m9x0di84vp51yjhnn952301rwlrh3axf6dbr"; depends=[ggplot2 TeachingDemos]; }; propr = derive2 { name="propr"; version="4.2.6"; sha256="16ghgzpwz6q9zlaa0pc8wqv0wpz81c75n7zwjyr1lv9y19qwlkfg"; depends=[fastcluster ggplot2 igraph Rcpp]; }; prospectr = derive2 { name="prospectr"; version="0.2.0"; sha256="16ba2dmg1v2gsd66s25c28s413vg5xcbhicb75qwpijlgmjvfpgi"; depends=[foreach iterators Rcpp RcppArmadillo]; }; - protViz = derive2 { name="protViz"; version="0.6.3"; sha256="1ldciqh3f43xr9663yyhd9r6qwrg4c4vmkprlcancbnd460wakg7"; depends=[Rcpp]; }; + protViz = derive2 { name="protViz"; version="0.6.4"; sha256="1qq9bf4485x8cviry9fmhnv4hw9aw657w134003myzcv42c4pml6"; depends=[Rcpp]; }; protag = derive2 { name="protag"; version="1.0.0"; sha256="1iaw2w1d7hdvlg5vplpqc49wq08dgmm0ifvp2v0ggqb8invvdnw8"; depends=[dplyr ggplot2 RColorBrewer]; }; proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; }; proteomics = derive2 { name="proteomics"; version="0.2"; sha256="01cd4sb79gcx8gbzl624scvjbwhgcsca1wdvvfkhsv7jfwdd2ry2"; depends=[foreach ggplot2 plyr reshape2]; }; @@ -12095,7 +12118,7 @@ in with self; { proxy = derive2 { name="proxy"; version="0.4-23"; sha256="17b6qfllqrhzrxqgx7dccffgybnkcria5a68ap5ly3plg04ypm4x"; depends=[]; }; proxyC = derive2 { name="proxyC"; version="0.1.5"; sha256="159bc42x4shm6n3rh9fc8ziv3ivq0ipmpbasrh279hhn1prc8gg6"; depends=[Matrix Rcpp RcppArmadillo RcppParallel]; }; prozor = derive2 { name="prozor"; version="0.2.11"; sha256="1a2k69fvgi6vxgczk81kh8r2jxc6nirc51w6ac239rqjzb1zyhjm"; depends=[AhoCorasickTrie doParallel dplyr foreach Matrix plyr readr seqinr stringr]; }; - prrd = derive2 { name="prrd"; version="0.0.2"; sha256="0ifs55yqvwbcs3xyc90yi763fgavdhajk1ba73g1kchn2ak39qhb"; depends=[config crayon data_table DBI liteq RSQLite]; }; + prrd = derive2 { name="prrd"; version="0.0.3"; sha256="1j1hcs5h6h9nz3pdjnw9p2y837706k9yxxjgiv0mgnwyh8pmz425"; depends=[config crayon data_table DBI liteq RSQLite]; }; pryr = derive2 { name="pryr"; version="0.1.4"; sha256="06vj5xl9x37kbd3l5bw7sbgfdnp37spvrjrn976rxi04clqk966k"; depends=[codetools Rcpp stringr]; }; ps = derive2 { name="ps"; version="1.3.2"; sha256="0127q6pw9iw8hhcfp231gmdh29nahh2n5jzc38avrzy7yrm4bwl9"; depends=[]; }; psData = derive2 { name="psData"; version="0.2.2"; sha256="013hb6lk9rm2w08m5jbw90ndrcd4wyy2h125jx07c9bs60wh4mp4"; depends=[countrycode DataCombine reshape2 rio xlsx]; }; @@ -12125,14 +12148,14 @@ in with self; { psychNET = derive2 { name="psychNET"; version="0.0.4.1"; sha256="1h30ag185h9jw1w9119a9hxp984g2yj85hgi4vcwznjj18ssx377"; depends=[bigtime car corpcor crayon doParallel fastDummies glmnet graphicalVAR gtools Hmisc igraph imputeTS longitudinal MASS Matrix mgm mlVAR ncvreg networktools ordinalNet picasso qgraph reshape2 SparseTSCGM vars]; }; psychReport = derive2 { name="psychReport"; version="0.7"; sha256="1dapzq20aw9l4r5grfjd2sf14ga3wcxg67pq5fj6q4bcg5dggc9l"; depends=[cli crayon dplyr ez testthat xtable]; }; psychTools = derive2 { name="psychTools"; version="1.9.12"; sha256="1l1q3l6i40kkbvfjx7nri21jqy9vhdbcc7b5g56a5cqdimkddvkn"; depends=[foreign psych]; }; - psychmeta = derive2 { name="psychmeta"; version="2.3.6"; sha256="16fqy75a5zrfp7jnm49fl6qmagw747zwdd5nkg3a3k4wc0kbn56w"; depends=[boot cli crayon curl data_table dplyr ggplot2 MASS metafor nor1mix progress purrr reshape2 rlang stringi stringr tibble tidyr tmvtnorm]; }; + psychmeta = derive2 { name="psychmeta"; version="2.3.8"; sha256="1sqcp88kkjdlni3wicjhgw9a8y4a53xr7avbqnq2wzz0n2fa1q29"; depends=[boot cli crayon curl data_table dplyr ggplot2 MASS metafor nor1mix progress purrr reshape2 rlang stringi stringr tibble tidyr tmvtnorm]; }; psycho = derive2 { name="psycho"; version="0.5.0"; sha256="0vcabk9j1yf7nz8fh3xg5rr2ia97mfkka23vbv9jya75dhgd84h2"; depends=[bayestestR dplyr effectsize ggplot2 insight parameters performance scales stringr tidyr]; }; psychometric = derive2 { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme]; }; psychomix = derive2 { name="psychomix"; version="1.1-8"; sha256="0lfhfcmrk65gkr1yp317b515vmadbcf0vjcnc76d07yp6yfkz5qw"; depends=[flexmix Formula lattice modeltools psychotools]; }; - psychonetrics = derive2 { name="psychonetrics"; version="0.7"; sha256="0mcldwy70wj210v4z389lzcawrvjrgc1pv10556wciazcriwhzwk"; depends=[abind combinat corpcor dplyr GA ggplot2 glasso IsingSampler lavaan magrittr Matrix matrixcalc mgcv mvtnorm numDeriv optimx pbapply pbv psych qgraph Rcpp RcppArmadillo roptim tidyr ucminf VCA]; }; + psychonetrics = derive2 { name="psychonetrics"; version="0.7.1"; sha256="1aj4a0yihiypsvzsrni5qfdjl4h3gffyimrhqcdwfd9wz8q09126"; depends=[abind combinat corpcor dplyr GA ggplot2 glasso IsingSampler lavaan magrittr Matrix matrixcalc mgcv mvtnorm numDeriv optimx pbapply pbv psych qgraph Rcpp RcppArmadillo roptim tidyr ucminf VCA]; }; psychotools = derive2 { name="psychotools"; version="0.5-1"; sha256="0nm5ngdkyskkj5akbqavdz8njsa8mr61kzknnn1kkdz6bn6zy6lq"; depends=[]; }; psychotree = derive2 { name="psychotree"; version="0.15-3"; sha256="18lr9dlv5l5fw88n61ch251ddgy1cv6klcj7ba3fg109b86p3bgf"; depends=[Formula partykit psychotools]; }; - psychrolib = derive2 { name="psychrolib"; version="2.4.0"; sha256="0dz3lwds9lxwqdid88l6bkndk6lv1q7b0qzgf9imxmi8f8zhkrbh"; depends=[Rcpp]; }; + psychrolib = derive2 { name="psychrolib"; version="2.5.0"; sha256="154bv16fyyyp5zgcrl2ncyqy15ybjnhqmim75pba11sbww7jdfbw"; depends=[Rcpp]; }; psymonitor = derive2 { name="psymonitor"; version="0.0.2"; sha256="09288w2bk5jhnbyj516jqn5qb33yqqg5kqbg6ylqk7anlq2yg2sl"; depends=[doParallel foreach magrittr]; }; psyosphere = derive2 { name="psyosphere"; version="0.1.5"; sha256="14xnni31p2dh4wfnr2cmr3ymz5phx4506cq2n7ymy4k1587w25g6"; depends=[geosphere ggmap ggplot2 Hmisc lubridate plyr rgdal RgoogleMaps sp]; }; psyphy = derive2 { name="psyphy"; version="0.1-9"; sha256="1ndc6sy662wj2qfx7r97crlqjd8fdkfvfy59qmf34bcbzbg33riz"; depends=[]; }; @@ -12140,7 +12163,7 @@ in with self; { pterrace = derive2 { name="pterrace"; version="1.0"; sha256="15k5149jqjy20cck5121zsv2mk63amn5b8qgdlacivri9dpxjns1"; depends=[doParallel foreach plotly TDA viridis]; }; ptest = derive2 { name="ptest"; version="1.0-8"; sha256="1d30a23yknf7xgqj8adgr36pnh9dpffl1v5fq682f26fk3ss30qp"; depends=[quantreg]; }; ptinpoly = derive2 { name="ptinpoly"; version="2.4"; sha256="1jbj8z7lqg7w1mqdh230qjaydx2yb6ffgkc39k7dx8xl30g00i5b"; depends=[misc3d]; }; - ptmixed = derive2 { name="ptmixed"; version="0.4.3"; sha256="0n62zrv4j7h9605izzpxjknhr495ir3yjlvzgmk9hil15r8n0w06"; depends=[aod GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv tweeDEseq]; }; + ptmixed = derive2 { name="ptmixed"; version="0.5.2"; sha256="1vi9xh5kv9389hdfq1f3j32ymycsdy6w21lv0h4gg3giwvxwkz3p"; depends=[aod GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv tweeDEseq]; }; pts2polys = derive2 { name="pts2polys"; version="0.1.3"; sha256="0rmgryv0vds20npvaqvvwrhrx0grfcz9qwdy2w3bx945r0chhw39"; depends=[Rcpp]; }; ptstem = derive2 { name="ptstem"; version="0.0.4"; sha256="0dx677c7qh7rbalsys1n3xv4hjdhd6qypjd1mrggfwz1bd4vig4j"; depends=[dplyr hunspell magrittr rslp SnowballC stringr tidyr tokenizers]; }; ptsuite = derive2 { name="ptsuite"; version="1.0.0"; sha256="1df273p8v6zvhy2jj6imhjigwj77grx6sxqmg0sidxwqny5d1d9c"; depends=[Rcpp]; }; @@ -12160,7 +12183,7 @@ in with self; { puniform = derive2 { name="puniform"; version="0.2.1"; sha256="0pizpq3v0jlvl41pqypk5i5ghyg2na8mysf2pcvihx4ha7415i51"; depends=[ADGofTest metafor Rcpp]; }; purge = derive2 { name="purge"; version="0.2.1"; sha256="1faf8mkaxsnj63wnig5rs50hd3j6vzaj0xkdz8kn0j7y2vvshp9p"; depends=[]; }; purging = derive2 { name="purging"; version="1.0.0"; sha256="1b8f87jn6wyh4fp6b1660bd484wcf7xiajdg9dz2594aj1r94qsr"; depends=[MASS]; }; - purrr = derive2 { name="purrr"; version="0.3.3"; sha256="17lyys7dxjrwsfkq7a7hw65iy3qn3pp1sn70srdy64jf8adahc8g"; depends=[magrittr rlang]; }; + purrr = derive2 { name="purrr"; version="0.3.4"; sha256="1cj091rsjdj2xz16qhynyw72gh5cyhznifcfbrbygndfr4xwksr3"; depends=[magrittr rlang]; }; purrrlyr = derive2 { name="purrrlyr"; version="0.0.5"; sha256="0rcamyf7d01rpd9izh8xp66j130aqarfbc24p898dqhghb6q1ryq"; depends=[BH dplyr magrittr purrr Rcpp]; }; purrrogress = derive2 { name="purrrogress"; version="0.1.1"; sha256="1l7wr7jjpang9gx61pfw9qiapsviwpp13kbylmxvw7lz7q0khzcz"; depends=[assertthat glue hms pkgcond purrr R6 rlang testextra]; }; pushbar = derive2 { name="pushbar"; version="0.1.0"; sha256="1gxarv6x32y6ssrhsq3pyihzcvpnnj7bg0jf2cpcr99da78n1d9b"; depends=[jsonlite shiny]; }; @@ -12201,16 +12224,17 @@ in with self; { qcapower = derive2 { name="qcapower"; version="0.1.0"; sha256="14vszidjvyi8namwv5k0hpgdw1dpns5ilvxfwa920ivdg35709ki"; depends=[devtools ggforce ggplot2]; }; qcc = derive2 { name="qcc"; version="2.7"; sha256="0lc26w7p3d023lfr8v6v75m2vwqg9vi9pdipap19l4vbdq29l4zz"; depends=[MASS]; }; qccrs = derive2 { name="qccrs"; version="0.1.0"; sha256="0lwrmf2809zzdj5f25bb1psh57ibyw90ra41fy2i9vjmgph9wgiq"; depends=[dplyr magrittr purrr tibble]; }; - qcr = derive2 { name="qcr"; version="1.0"; sha256="1251naica44kccmikyzdi3ncxfmvyqbc4qspfqnc0w54cqpsy5rw"; depends=[fda_usc MASS mvtnorm qcc qualityTools]; }; + qcr = derive2 { name="qcr"; version="1.2"; sha256="10770a1rijhl2mhri8vgcdp9k17vbn93z0kiv1fsdd8z48ywbwx4"; depends=[fda_usc MASS mvtnorm qcc qualityTools]; }; qcv = derive2 { name="qcv"; version="1.0"; sha256="0hf02l9c1cpzs02mfn9swfc8l635qsvh6xrhj21g19h5rxaf8jwg"; depends=[]; }; - qdap = derive2 { name="qdap"; version="2.3.6"; sha256="1j9s5gfq2hz7vkh8j682ykfqvl11kjqa16nbmgyhv33l8wb79skf"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reports reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; }; + qdap = derive2 { name="qdap"; version="2.4.1"; sha256="136vmcsnclcc1bgvfrsxq5f7vqpsf3590bx8j9770xfw9gx27ynw"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; }; qdapDictionaries = derive2 { name="qdapDictionaries"; version="1.0.7"; sha256="0jdx7bxmvc4p41jb4fhaagg5jsbsi7gva870cmyia72li52grhyn"; depends=[]; }; qdapRegex = derive2 { name="qdapRegex"; version="0.7.2"; sha256="1xa8q1way3gjadrjh3mv3xr4c6b4h16nd2c6lgl969difplpfz9p"; depends=[stringi]; }; - qdapTools = derive2 { name="qdapTools"; version="1.3.3"; sha256="0a28jn57d2fas3009cm10z07fq77ql3ffcrhcxsiimb57179wj0n"; depends=[chron data_table RCurl XML]; }; + qdapTools = derive2 { name="qdapTools"; version="1.3.5"; sha256="09byvv39qmdcavlykpcvk248l2f7sw0pq64ynq2xffmnga3ji24c"; depends=[chron data_table RCurl XML]; }; qdm = derive2 { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; }; qfasar = derive2 { name="qfasar"; version="1.2.1"; sha256="14370bmq4qx5j02va13wz52m2lgl4vb992p9587z9v2sxl1v4jjg"; depends=[Rsolnp]; }; qgam = derive2 { name="qgam"; version="1.3.2"; sha256="0lks2cj0p7irp1i01756v1l7i26d7alax1fbkc20qd6wpz840fi7"; depends=[doParallel mgcv plyr shiny]; }; - qgcomp = derive2 { name="qgcomp"; version="2.2.2"; sha256="0dszh56drh9h4gc4vb31749hjgl9k3yvj8x10d2nkr8ba29ng4x2"; depends=[arm future future_apply generics ggplot2 gridExtra pscl survival tibble]; }; + qgcomp = derive2 { name="qgcomp"; version="2.3.0"; sha256="1ik81vj0brwnzvaij25jq4jchhqqjayckihdjh1l1zy3vfphla5m"; depends=[arm future future_apply generics ggplot2 gridExtra pscl survival tibble]; }; + qgg = derive2 { name="qgg"; version="1.0.3"; sha256="0ylpsvhvkznw1b280im026mlwa5bydh3gdki72a7rr2vpjnbgxm2"; depends=[data_table MASS MCMCpack statmod]; }; qgraph = derive2 { name="qgraph"; version="1.6.5"; sha256="0pwys9irxvp0ap158drplyypkplbmwqinv0fmlsblk7q875cr592"; depends=[abind BDgraph colorspace corpcor d3Network dplyr fdrtool ggplot2 ggraph glasso gtools Hmisc huge igraph jpeg lavaan Matrix pbapply plyr png psych Rcpp reshape2 tidygraph]; }; qgtools = derive2 { name="qgtools"; version="2.0"; sha256="1gj7vbam53yr2rnxzfxng1p107bjcyjmyj47cxyzaiv19pznkbmw"; depends=[]; }; qha = derive2 { name="qha"; version="0.0.8"; sha256="0sdf6g6884wn73i237xkwszg2mq8xddhvyy225qzpplh5za4pnhl"; depends=[ade4 FactoClass FactoMineR]; }; @@ -12219,7 +12243,6 @@ in with self; { qif = derive2 { name="qif"; version="1.5"; sha256="12azs7c0anpd71d5663y1jrhirry6cr78wislp4fk64hmsbx7sx4"; depends=[MASS]; }; qiitr = derive2 { name="qiitr"; version="0.1.0"; sha256="1p0mcwgzvbib20l05wrnshkqx99vwr69dgy15dfwp75skyy5l797"; depends=[httr jsonlite purrr rstudioapi]; }; qkerntool = derive2 { name="qkerntool"; version="1.19"; sha256="14inry2hqvkmy0y2y3cl75ri4vri0hirv98gw2rymny69lia5x0s"; depends=[class]; }; - qlcData = derive2 { name="qlcData"; version="0.2.1"; sha256="0n1r7462zmyzkyi7mp3hf7pn7bgw1m1zs9flm3n199kjm8f6yyzy"; depends=[ape data_tree docopt phytools shiny stringi yaml]; }; qlcMatrix = derive2 { name="qlcMatrix"; version="0.9.7"; sha256="0iqkcvvy8rxlk0s83sjq57dd6fadb18p5z31lzy0gnzv1hsy1x8y"; depends=[docopt Matrix slam sparsesvd]; }; qmap = derive2 { name="qmap"; version="1.0-4"; sha256="02xvq1mw83gln7phacbi3vhkvb100crggbldv13mhwq3wjnmg5k2"; depends=[fitdistrplus]; }; qmethod = derive2 { name="qmethod"; version="1.5.5"; sha256="1s787big5f1m91n9s7yhxpsfx0161l7pyihlvfp9406k8qxs3jnl"; depends=[digest GPArotation knitr psych xtable]; }; @@ -12228,12 +12251,11 @@ in with self; { qoma_smuggler = derive2 { name="qoma.smuggler"; version="0.0.1"; sha256="03p9i0kr6i3adpb9lcszcmdr9p26nfy7f8hw2sbydazglaw4hscr"; depends=[lubridate rhli tibble]; }; qpcR = derive2 { name="qpcR"; version="1.4-1"; sha256="1r01q7jv3w59yx1gc0qw91rq7rvdhqsi8y57sqqkmwyqfw2x2vsv"; depends=[MASS Matrix minpack_lm rgl robustbase]; }; qpdf = derive2 { name="qpdf"; version="1.1"; sha256="03lnfncw8qd1fwfyqh1mjvnsjr3b63wxbah0wp5g7z7gba90dwbi"; depends=[askpass curl Rcpp]; }; - qqid = derive2 { name="qqid"; version="1.0.3"; sha256="1j2s5zilz97x4kl10g85qr3rxg022p9i601r6gvkaa57xcx6smw1"; depends=[qrandom]; }; qqman = derive2 { name="qqman"; version="0.1.4"; sha256="1v9s9ag1hfb47py87wb2nad4mbsfx35832hdmrh5kxrb2f11zl1s"; depends=[calibrate]; }; qqplotr = derive2 { name="qqplotr"; version="0.0.4"; sha256="1zy7mlnll0infr2las5c28vi5da04rm869dpccwcws1467mhys3k"; depends=[dplyr ggplot2 knitr MASS robustbase]; }; qqtest = derive2 { name="qqtest"; version="1.2.0"; sha256="1v0qbbp2dpqflpg7yif7hipwdbz27isfyfwcia1ln7z0nnvkjm8c"; depends=[]; }; qqvases = derive2 { name="qqvases"; version="1.0.0"; sha256="1fli4v1slmnwcmzmmfw84sa4mx3xzv3im1q0plb8811sbsgmwdvl"; depends=[shiny shinythemes]; }; - qrLMM = derive2 { name="qrLMM"; version="2.0"; sha256="0ci4679kfif1sk4009v89yfm5p6nyk7nhvikgd00rhrbqi9qaqy4"; depends=[ald lqr mvtnorm psych quantreg]; }; + qrLMM = derive2 { name="qrLMM"; version="2.1"; sha256="1viyllsd08dwgd5z930ml1nrcc9saaa18i5sx0bska8b0s7qh414"; depends=[ald lqr mvtnorm psych quantreg]; }; qrNLMM = derive2 { name="qrNLMM"; version="2.0"; sha256="0j69zhs1v4546xrkwra9c2q3kmhf593vi05yjn3b3s5nzh2k0i1x"; depends=[ald lqr mvtnorm psych quantreg]; }; qrage = derive2 { name="qrage"; version="1.0"; sha256="00j74bnkcpp0h8v44jwzj67q9aaw47ajc2fvgr6dckj9rymydinl"; depends=[htmlwidgets]; }; qrandom = derive2 { name="qrandom"; version="1.2.2"; sha256="1s0frb3qjaraigx79g0sm60dj216jrmp1lgzcvjk3rh7xdjhjrkn"; depends=[curl jsonlite Rmpfr]; }; @@ -12243,7 +12265,7 @@ in with self; { qrjoint = derive2 { name="qrjoint"; version="2.0-3"; sha256="1ymnq8mbvxfdi63f4554mjlix5n864v2nask27pkf3yfxmkr346k"; depends=[coda kernlab Matrix quantreg]; }; qrmdata = derive2 { name="qrmdata"; version="2019-12-03-1"; sha256="0738wiac0dgani0yy61kvpra7zj8qj5ak627i8cjd42zf1yjziz5"; depends=[xts]; }; qrmix = derive2 { name="qrmix"; version="0.9.0"; sha256="1r695d9bmmngvblh9jj0rnjymdaln9w0jywz51wla0bdssssf845"; depends=[MASS quantreg]; }; - qrmtools = derive2 { name="qrmtools"; version="0.0-12"; sha256="1gbnc8cl0iv5snkrz5vrg3k6c5zz74amrb6yxwnlhh69yh63zxhi"; depends=[ADGofTest lattice Quandl quantmod rugarch xts zoo]; }; + qrmtools = derive2 { name="qrmtools"; version="0.0-13"; sha256="1pr0q0wh3xjy3y59nkbpqfkakagbank3b31150rlxy72hkf52g1y"; depends=[ADGofTest lattice Quandl quantmod rugarch xts zoo]; }; qrng = derive2 { name="qrng"; version="0.0-7"; sha256="1dw1qqajxavlnfyh6xn58069fpfza28x1xjzd3diqlcxxlb4hjaf"; depends=[copula randtoolbox]; }; qrnn = derive2 { name="qrnn"; version="2.0.5"; sha256="0ligz67kbfg5cmvacnb7y0ms1v0c7mbvbcfsxyfiz543ppl3xn1v"; depends=[]; }; qs = derive2 { name="qs"; version="0.21.2"; sha256="1i4xrm9vz8ffl4mbw1qmgwkcm3j6ajw25ilj08n87ghy798pyab3"; depends=[RApiSerialize Rcpp]; }; @@ -12259,12 +12281,12 @@ in with self; { qtlcharts = derive2 { name="qtlcharts"; version="0.11-6"; sha256="114h19d741abyz7c0w0lir7m7816hw92lnd4shb3d9m94a9dwxqp"; depends=[htmlwidgets qtl]; }; qtlhot = derive2 { name="qtlhot"; version="1.0.4"; sha256="0gf0fsq91g830vqg5kz01zznm40qpjncy964ccvmms3i6d3hxd9m"; depends=[corpcor mnormt qtl]; }; qtlmt = derive2 { name="qtlmt"; version="0.1-6"; sha256="023h60z8d05832l2g7mg776hfjb0i7xpvhz3i899rc3h5pgjd94c"; depends=[]; }; - qtlnet = derive2 { name="qtlnet"; version="1.4.4"; sha256="1r9r6wp71i36ffcdxiljvh2c8nva868x2dx6bkinbaq8cixww2cx"; depends=[graph igraph pcalg qtl sem]; }; + qtlnet = derive2 { name="qtlnet"; version="1.5.4"; sha256="0jdf3hyzas0lyv2v4gqai9mhh7218a1mvm0nlwv9hfdbij0hi84v"; depends=[graph igraph pcalg qtl sem]; }; qtpaint = derive2 { name="qtpaint"; version="0.9.1"; sha256="08x7qcxwkaclwv1p4s9a5k95x35hzp69whiihkakjv5blm83m3g9"; depends=[qtbase]; }; quRan = derive2 { name="quRan"; version="0.1.0"; sha256="108d797l9ggggc5b61pl7f6avzknmnnib2ys5vrg385zfbx9srvw"; depends=[]; }; quad = derive2 { name="quad"; version="1.0"; sha256="0fak12l19f260k0ygh6zimx8dabzsv7a9i2njw8hnfcs3ndffhv5"; depends=[PearsonDS]; }; quadmatrix = derive2 { name="quadmatrix"; version="0.1.0"; sha256="0nngrvvbalmrr6g9bq9f5qrllvwfq5p1b9yhs4zb098s3wga8jms"; depends=[geigen matrixcalc]; }; - quadmesh = derive2 { name="quadmesh"; version="0.4.0"; sha256="196p1qiis1hbs8yxd5570cqln0zcp3ngbajf3rsc0rwgjzqgm3wv"; depends=[geometry gridBase png raster reproj scales sp viridis]; }; + quadmesh = derive2 { name="quadmesh"; version="0.4.5"; sha256="0wppxi8g3dq7x4f6dsv7843fhdb43rx45lky4aanqa2im81qa7l8"; depends=[geometry gridBase png raster reproj scales sp viridis]; }; quadprog = derive2 { name="quadprog"; version="1.5-8"; sha256="1ka9g8zak8sg4y2xbz93dfrldznlk9qpd4pq9z21cdcdn3b8s4i2"; depends=[]; }; quadprogXT = derive2 { name="quadprogXT"; version="0.0.5"; sha256="1yna2kx9pr58vyy6f4mwx4a6avjz84wwhcary88v1k0ihhv9swcz"; depends=[quadprog]; }; quadrupen = derive2 { name="quadrupen"; version="0.2-7"; sha256="05yn9cnnc1481k8yqc6dg5hcv0ll4v3h2yw3qyaarwhgyxiips11"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; }; @@ -12290,6 +12312,7 @@ in with self; { quantregForest = derive2 { name="quantregForest"; version="1.3-7"; sha256="0lk7r02i6zpx9sdl2rp0r7fc3a84s8qhg49nh2x7k3vxwa095pjz"; depends=[randomForest RColorBrewer]; }; quantregGrowth = derive2 { name="quantregGrowth"; version="0.4-3"; sha256="0q2yk51hcn7jnvh14nxa7szfj4pr9grh5rdfwazaziilbwqdmw4f"; depends=[quantreg]; }; quantregRanger = derive2 { name="quantregRanger"; version="1.0"; sha256="1a9q2prr790bpw6s0y5ni5ppd3vqkjr0v4nqp6ywcj5n3sk69pvx"; depends=[ranger Rcpp]; }; + quantspec = derive2 { name="quantspec"; version="1.2-2"; sha256="1mn5r575hdffy1znd98njrms2pz84z8k4bv6qmbwgqwvh8pn10rg"; depends=[abind quantreg Rcpp snowfall zoo]; }; quarrint = derive2 { name="quarrint"; version="1.0.0"; sha256="13fdmmrgn23xd9vpywmcl7pf729gmcxjfl1wxs30axsbp4h1s6rk"; depends=[neuralnet]; }; queryparser = derive2 { name="queryparser"; version="0.2.0"; sha256="1fsp64rm4jch2jjw7czw9qmwb4f3s46avbf3z3gpvcfdq4aw65kb"; depends=[]; }; questionr = derive2 { name="questionr"; version="0.7.0"; sha256="1cschww3g2jhrfh87bxcaaig84yr0zcj0virmpx033yal606hmn4"; depends=[classInt highr htmltools labelled miniUI rstudioapi shiny]; }; @@ -12336,14 +12359,12 @@ in with self; { rCBA = derive2 { name="rCBA"; version="0.4.3"; sha256="10rc08gwsf15f4lci8bbgwpwj8n7k1m23hxk633v68g9amla5nvx"; depends=[arules R_utils rJava TunePareto]; }; rCMA = derive2 { name="rCMA"; version="1.1"; sha256="0dswshg80hbgcib5x9w791sh71q5s4435q8sm9dh170v4ngbax0w"; depends=[]; }; rCRM = derive2 { name="rCRM"; version="0.1"; sha256="01xxkrwd0iwhmq8dshgbn84qi6kky757y01alqrk0pkq2n8ghms4"; depends=[Rcpp RcppEigen]; }; - rCUR = derive2 { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[lattice MASS Matrix]; }; rChoiceDialogs = derive2 { name="rChoiceDialogs"; version="1.0.6"; sha256="0lp8amdalirpsba44aa3r31xnhmi36qb9qf8f8gdxxbarpgprsbi"; depends=[rJava]; }; rClinicalCodes = derive2 { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[RCurl rjson stringr tm XML]; }; rDEA = derive2 { name="rDEA"; version="1.2-6"; sha256="0045crn7azsy3ggzr28vw5jd4f5aw5nj16cjnjxy2md3skfbc3zw"; depends=[maxLik slam truncnorm truncreg]; }; rDNAse = derive2 { name="rDNAse"; version="1.1-1"; sha256="0cl51q61kwvdsm5f49cjjbzggqam1fnr6gp15cmy6m2yahyxg1lk"; depends=[]; }; rDecode = derive2 { name="rDecode"; version="0.1.0"; sha256="1d0rrhycw9anhvx6czz7axkzhzqprdgi9sqfglmc962zf1x3hmn2"; depends=[]; }; rDotNet = derive2 { name="rDotNet"; version="0.9.1"; sha256="18cd5373pdfi1x958llb4cgjqdi1fb7h7m5nkdwcd4xw9hxhinzd"; depends=[Rcpp testthat]; }; - rEDM = derive2 { name="rEDM"; version="1.2.3"; sha256="1zz7rn57afax2hcffchzbkn0z6sbmbyhz6s6qbj5k92b48b1xdxb"; depends=[Rcpp RcppEigen]; }; rEMM = derive2 { name="rEMM"; version="1.0-11"; sha256="0ynjn10gcmxs8qnh6idb34ppmki91l8sl720x70xkzcqpahy0nic"; depends=[cluster clusterGeneration igraph MASS proxy]; }; rENA = derive2 { name="rENA"; version="0.2.0.1"; sha256="0sljnrhc710xbcdbsjx1rqrivbklgcnh7l4nqpnxdknvrxz6ky5y"; depends=[data_table doParallel foreach magrittr plotly R6 Rcpp RcppArmadillo scales]; }; rFDSN = derive2 { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; }; @@ -12359,7 +12380,6 @@ in with self; { rIntervalTree = derive2 { name="rIntervalTree"; version="0.1.0"; sha256="0xd6wcra4zvphfgnz1rnnslx96p840zlgms367370xm4hyg6d37x"; depends=[]; }; rIsing = derive2 { name="rIsing"; version="0.1.0"; sha256="1208lwfk9j8gghj8xf6i8v6s18h89ydqsd4jq3r88n403yzbzzck"; depends=[data_table Rcpp RcppEigen]; }; rJPSGCS = derive2 { name="rJPSGCS"; version="0.2-10"; sha256="0a00s10yp22fkvk67dkq43sbphcqla65x9j4qpv076bmdchn7arw"; depends=[chopsticks rJava]; }; - rJST = derive2 { name="rJST"; version="1.3"; sha256="0l8znqvg4qiygv6mxwff1ipanzxvcdn54m879sk8z7zn3x5sg6iw"; depends=[magrittr quanteda Rcpp RcppArmadillo RcppProgress reshape2 SnowballC]; }; rJava = derive2 { name="rJava"; version="0.9-12"; sha256="03vv0pj6san03c51iyqsyb1rwh3097dfpl2s8iswzzmc7k3shj12"; depends=[]; }; rJython = derive2 { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; }; rKIN = derive2 { name="rKIN"; version="0.1"; sha256="1j6fdi5h869q4d1hq6ha6qyhisa0zk2qmhjrc4ahl9991d680dyn"; depends=[ggplot2 maptools MASS rgeos sp]; }; @@ -12371,9 +12391,9 @@ in with self; { rMEA = derive2 { name="rMEA"; version="1.1.0"; sha256="1aarnik0qjxg6h55xpskx1dwkp78nfdyrwpy9r6ffyxhz9jbplnj"; depends=[]; }; rMR = derive2 { name="rMR"; version="1.1.0"; sha256="0da1hclfnnlkp9by6zf2p079643p8nimplr9p3ipbjdy739j344z"; depends=[biglm]; }; rModeling = derive2 { name="rModeling"; version="0.0.3"; sha256="0xrjxayp59f31wwcqqkzs5my2j2lpbv1f4pp709fmqxz02vbdzhv"; depends=[caret e1071 MASS]; }; - rMouse = derive2 { name="rMouse"; version="0.1"; sha256="0pzxasap5kwxqq36mb4zi139jllsl4vk06dw2pv9xnwdxiszr3gp"; depends=[rJava]; }; rNMF = derive2 { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[knitr nnls]; }; rNOMADS = derive2 { name="rNOMADS"; version="2.4.2"; sha256="0mir7b2693s27gll5j6fsgy7wq0fg48ddx6h78j7cgg7md75756f"; depends=[fields GEOmap MBA RCurl rvest stringr uuid XML]; }; + rNeighborGWAS = derive2 { name="rNeighborGWAS"; version="1.0.0"; sha256="13yhc279w5ds908bjplpqxf63db7hlp2dgnj8307ds4wkw6w1mbk"; depends=[gaston Matrix RcppParallel]; }; rODE = derive2 { name="rODE"; version="0.99.6"; sha256="0l518ghfw6283kckqcbh45a35vd73njy05v3dwghhhjdj7v3km8b"; depends=[data_table]; }; rPACI = derive2 { name="rPACI"; version="0.1.1"; sha256="0skpv7h91vfr8xkx0ic8yz7hcj1bbwd1f80sa9p9jn2rpfpzalv9"; depends=[]; }; rPAex = derive2 { name="rPAex"; version="1.0.1"; sha256="1v85qy8fg6vf1fqqqawzw4i9sfaihdqzbs0h91hpqbzkc4v7n2bb"; depends=[agricolae raster]; }; @@ -12381,7 +12401,6 @@ in with self; { rPowerSampleSize = derive2 { name="rPowerSampleSize"; version="1.0.2"; sha256="1insdfvcn1pirsnf7nwfia0kzgsmh2zpghgfj2yc35ld1r9j2hp2"; depends=[mvtnorm ssanv]; }; rPraat = derive2 { name="rPraat"; version="1.3.1"; sha256="01bz0ja35k8q3ncj9jaqbfh42sf5s73yrb6gsj11lapmfb3g8scf"; depends=[dplyr dygraphs readr stringr tuneR]; }; rPref = derive2 { name="rPref"; version="1.3"; sha256="0vlzhxhf2x6gw015sjfw2638wv6hckg068rpbzncp7wprn9msa6y"; depends=[dplyr igraph lazyeval Rcpp RcppParallel]; }; - rPython = derive2 { name="rPython"; version="0.0-6"; sha256="1aw9jn45mw891cskr51yil60i55xv5x6akjvfdsbb9nwgdwwrqdp"; depends=[RJSONIO]; }; rQCC = derive2 { name="rQCC"; version="1.20.3"; sha256="01gi447qwm6j682s7ka034g28k74l3fr9ijam6l9n0f228q930gp"; depends=[]; }; rRAP = derive2 { name="rRAP"; version="1.1"; sha256="1nzvs8bjkbjraa33azxf9mrxsxh87qhh3qlldrcs5y4fq4ancyqb"; depends=[lars lassoshooting MASS]; }; rSCA = derive2 { name="rSCA"; version="3.1"; sha256="0dhd5325x05cbnw34mlipndw5xnncl9kj7kppb2s5bx2gllcdqqd"; depends=[]; }; @@ -12407,7 +12426,7 @@ in with self; { radar = derive2 { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; }; radarBoxplot = derive2 { name="radarBoxplot"; version="1.0.0"; sha256="16s38yy984mb1hmsdw17z4nk2z4xg03xi0yrp7445yqv3fs1fghl"; depends=[]; }; radarchart = derive2 { name="radarchart"; version="0.3.1"; sha256="0gcxnbgj8ja1m4wzhbjy67m6zphf0c5ni9yx7sr7f0abm03ry753"; depends=[htmltools htmlwidgets]; }; - radiant = derive2 { name="radiant"; version="0.9.9.1"; sha256="18zj6lbs04vqslm4zgga6fvm868a0m55sk45kj5vl46jadb6a52f"; depends=[r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate shiny]; }; + radiant = derive2 { name="radiant"; version="1.3.2"; sha256="02qc7s64ryfn0l88kfj61kdnrg8gl6dmrxzscgqh85fc1yaipjcf"; depends=[r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate shiny]; }; radiant_basics = derive2 { name="radiant.basics"; version="1.3.4"; sha256="0y4s3zhphkaxlgwmiz96nwxq1s87i2i1mnph062xghlm7x92bwc3"; depends=[dplyr ggplot2 lubridate magrittr patchwork polycor psych r_import radiant_data scales shiny tidyr]; }; radiant_data = derive2 { name="radiant.data"; version="1.3.4"; sha256="19sjjb49inrfl7jzq4zpwhdslni0zrp30bl58pisin29ka3ylpzs"; depends=[base64enc broom car curl dplyr DT ggplot2 glue jsonlite knitr lubridate magrittr markdown MASS patchwork plotly psych r_import randomizr readr readxl rlang rmarkdown rstudioapi scales shiny shinyAce shinyFiles stringi tibble tidyr writexl]; }; radiant_design = derive2 { name="radiant.design"; version="1.3.5"; sha256="1514s21jybyvpi2sx06xsxfrzgg07x7xxhwsazc61v3w1mllj2xw"; depends=[AlgDesign dplyr magrittr mvtnorm polycor pwr r_import radiant_data randomizr shiny]; }; @@ -12416,7 +12435,6 @@ in with self; { radiomics = derive2 { name="radiomics"; version="0.1.3"; sha256="1ra94yaqw88slznhyv70kbfricxi44m4pnx1zh4ijghm491rphr5"; depends=[Rcpp reshape2 spatstat]; }; radir = derive2 { name="radir"; version="1.0.4"; sha256="12a99ig3n6kp5wa5rjp2w1nal4qqjs6vq05d3lrqcyl3bind6lqb"; depends=[hermite]; }; radix = derive2 { name="radix"; version="0.6"; sha256="0290n0yax8649srdjbq4439h0d9f6jsmxayyhp86igcnszcxilnb"; depends=[base64enc bookdown digest downloader htmltools jsonlite knitr lubridate mime png progress rmarkdown rprojroot rstudioapi stringr whisker xfun xml2 yaml]; }; - radjust = derive2 { name="radjust"; version="0.1.0"; sha256="0krryhqid16a6jfb007n0k6rc8r7c808h859a9pjid2jbkg0bm7l"; depends=[]; }; radlibs = derive2 { name="radlibs"; version="0.1.0"; sha256="1yyd63shc35mdixkz8gigwqb9g2l1baxgmzijhshpqavixdhazmk"; depends=[data_table lexicon stringr]; }; radmixture = derive2 { name="radmixture"; version="0.0.1"; sha256="0rs60xjd43lg5c9972qhpg6bsqfg2578qvrz7gz3bdip10jb1ryj"; depends=[magrittr MCMCpack plyr quadprog]; }; radsafer = derive2 { name="radsafer"; version="2.2.0"; sha256="0xkmyxw2lslgy22rnb1ll4zw4h06p4ldvaavvwnzy8l7mzqlr6in"; depends=[dplyr ggplot2 ggthemes magrittr RadData readr rlang stringr]; }; @@ -12431,7 +12449,7 @@ in with self; { rainette = derive2 { name="rainette"; version="0.1"; sha256="0rchm02bzahmwa11riyypfgb72dz5003y9zsyfknin0ckvqycysv"; depends=[dendextend dplyr formatR future future_apply ggplot2 ggwordcloud gridExtra highr miniUI progressr purrr quanteda RColorBrewer Rcpp rlang RSpectra shiny stringr tidyr]; }; rainfarmr = derive2 { name="rainfarmr"; version="0.1"; sha256="1gasnmyjnis6vv0krx6299ck2a6v9v1fgqajzqdpjaz2fsxn245i"; depends=[]; }; rakeR = derive2 { name="rakeR"; version="0.2.1"; sha256="0cd89q6k0y9z1qk9k06iw56lhj4c52ckr0g4qv6q95lkyrbi3qg8"; depends=[ipfp wrswoR]; }; - ralger = derive2 { name="ralger"; version="1.1.0"; sha256="077yi2xba2ilhsr0r689r74axazb3wpxz0w8ic6c17jplm828q7s"; depends=[crayon dplyr magrittr purrr robotstxt rvest stringr testthat tidyr xml2]; }; + ralger = derive2 { name="ralger"; version="2.0.0"; sha256="05hcrly7wf5bmfi14ji791vbix8q4fsl13la6yi7zjzwh1hd55sd"; depends=[crayon dplyr magrittr purrr robotstxt rvest stringr testthat tidyr xml2]; }; ramchoice = derive2 { name="ramchoice"; version="1.1"; sha256="1im9r95109919hfmici6avdqxh3a375wmg2lfy75z1gjivvcygbr"; depends=[MASS]; }; ramcmc = derive2 { name="ramcmc"; version="0.1.0-1"; sha256="0x8q0bah8fcyqlwap9iw52xhl6b989va5c144kgmfimh2b4yinc7"; depends=[Rcpp RcppArmadillo]; }; ramify = derive2 { name="ramify"; version="0.3.3"; sha256="0cxmkxhshg0vrcxai2gbm4iih04f44liv5nh5jiq85hjz8qbhdi2"; depends=[]; }; @@ -12481,15 +12499,16 @@ in with self; { rareGE = derive2 { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; }; rareNMtests = derive2 { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; }; rarms = derive2 { name="rarms"; version="1.0.0"; sha256="11wjxd3pxvjv1j2nz26l8f0kykk9w6lf08izhivfngp63dk2akns"; depends=[jsonlite]; }; - rasciidoc = derive2 { name="rasciidoc"; version="2.0.1"; sha256="0mj3qn048ppxddq2ml06hvccixxg7kvb9rsx9iy9mn4rr2caw67v"; depends=[document highr knitr]; }; + rasciidoc = derive2 { name="rasciidoc"; version="2.1.1"; sha256="05zlp14hiimf5p8l7381wvqzi28pbp7ig9a3i6n79zkrqz7hsab0"; depends=[document git2r highr knitr xfun]; }; rasclass = derive2 { name="rasclass"; version="0.2.2"; sha256="1lsmv8kh519mz3szb4k9s17fz1480cw0i4qk12givhhm2rpzjy50"; depends=[car e1071 nnet randomForest RSNNS]; }; rase = derive2 { name="rase"; version="0.3-3"; sha256="03jqf5y5vj354m9psp81wzw6d7dfqr76bfjqv9kannsakkj587sy"; depends=[ape mvtnorm polyCub rgl sm spatstat]; }; - raster = derive2 { name="raster"; version="3.0-12"; sha256="0rrbsigkqxsdic8fly6nrsc79zsliwvr1x2b4xqpl9d34vr50dvg"; depends=[Rcpp sp]; }; + raster = derive2 { name="raster"; version="3.1-5"; sha256="010sq00ijpmwac280ip9rryw0pxk0al8g675v2lc9rdrbgaj4rnv"; depends=[Rcpp sp]; }; rasterDT = derive2 { name="rasterDT"; version="0.3.1"; sha256="1dl083jm4x0shl7lq4in2alksgi63hp1p7j2cnsvkmwjaxygzm9v"; depends=[data_table fasterize raster sf]; }; rasterImage = derive2 { name="rasterImage"; version="0.4.0"; sha256="191m5k1rbbwziznmxbsq4g55afkw8gb5011i70f3wx3dscr3phxz"; depends=[plotrix]; }; rasterKernelEstimates = derive2 { name="rasterKernelEstimates"; version="1.0.1"; sha256="1733ic1hxym3gyibk2ysy5zzq7s9rbf6jx63x7irnrcavq151f8s"; depends=[raster]; }; rasterList = derive2 { name="rasterList"; version="0.5.8"; sha256="0q7apglxzpah04463z07cpkzyd6l6dbbdhm601brzh6yk75z20vh"; depends=[raster]; }; rasterVis = derive2 { name="rasterVis"; version="0.47"; sha256="1lsi3vk7s3bzw07vn57s6748flmbrj5s3n349cxbmhlm123vwghj"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; }; + rasterdiv = derive2 { name="rasterdiv"; version="0.1-0"; sha256="19cz25wwv7h7h9c374mgci8ic1425g5rmsfhyv0bwaqhhn3wz93q"; depends=[doParallel foreach proxy raster svMisc]; }; rasterize = derive2 { name="rasterize"; version="0.1"; sha256="18nrhmq1qmi05rkyr86xsyc8nz0fbdpf2d45h62bbfzbfynqd4qy"; depends=[png]; }; rasterly = derive2 { name="rasterly"; version="0.1.0"; sha256="128699nc1y2parfwqfx31afdy3f91z5iarpx8q1v5qfmbmb12ppx"; depends=[data_table ggplot2 magrittr plotly Rcpp rlang]; }; rasterpdf = derive2 { name="rasterpdf"; version="0.1.1"; sha256="0zi54nifbb4dzb29i8rskynblw3z42vzaykwbq30ia5zs9q1bvm5"; depends=[png]; }; @@ -12508,15 +12527,16 @@ in with self; { rawKS = derive2 { name="rawKS"; version="0.1.0"; sha256="1yiw9imhgij49qbm9hk6psb73zngqmxxwnaxq144ydwb7fbk6j0z"; depends=[dplyr ggplot2 magrittr ROCR tidyr]; }; rawr = derive2 { name="rawr"; version="0.1.0"; sha256="1a8r1vyvki3z2ms4miqv6wq9pzympgifsjx0pzzs6f4b40m083lq"; depends=[dplyr jsonlite rvest xml2]; }; raws_profile = derive2 { name="raws.profile"; version="0.1.0"; sha256="04f7wk7x9j3rb6nn3zqss9vw0h9a4vpcjyilc2vqy0fm2by41xkg"; depends=[stringr tibble withr]; }; - rayimage = derive2 { name="rayimage"; version="0.2.5"; sha256="0ihi0i93ypk75h567ay3g46n8x4ni09r4r6p6spm16hji0ri5dp1"; depends=[jpeg magrittr png progress raster Rcpp RcppArmadillo]; }; - rayrender = derive2 { name="rayrender"; version="0.6.0"; sha256="19al04afiibd0hbvlps4zwmm085x0vnfkbn5lpd3mzyilccyjhcb"; depends=[assertthat magrittr png progress purrr raster Rcpp RcppThread tibble]; }; - rayshader = derive2 { name="rayshader"; version="0.13.7"; sha256="0mlygrsbg0nzz8hhz0q28hizqh3ck4vdi67i9cvgpkrrnm13jyqx"; depends=[doParallel foreach ggplot2 magrittr png progress raster rayrender Rcpp RcppArmadillo rgl scales]; }; - rbacon = derive2 { name="rbacon"; version="2.4.1"; sha256="0xxgdh3zr2k0asxklbpyn1d0q67hdmd5r81s9y8x4anjjvz5zx0g"; depends=[coda Rcpp]; }; + rayimage = derive2 { name="rayimage"; version="0.2.7"; sha256="075ms29ra354ygcxwazj3d217f94jq93hay4g6vl7g6sa0vnirrl"; depends=[jpeg magrittr png progress raster Rcpp RcppArmadillo]; }; + rayrender = derive2 { name="rayrender"; version="0.9.1"; sha256="1r2cpxlibkqmah1x3xdjzajz0kshbrmd575y8wngp44ihhajdzsd"; depends=[assertthat decido magrittr png progress purrr raster rayimage Rcpp RcppThread tibble]; }; + rayshader = derive2 { name="rayshader"; version="0.15.1"; sha256="0ppjjr2yawzr10jfrwlm4ih366sn5p7l6ql61k2yxwzc0516hsng"; depends=[doParallel foreach magrittr png progress raster Rcpp RcppArmadillo rgl scales]; }; + rbacon = derive2 { name="rbacon"; version="2.4.2"; sha256="0y6vsr2fyy059v10fdh8viwb7361pnh97k8zzh8105da9n6ymhrc"; depends=[coda Rcpp]; }; rbart = derive2 { name="rbart"; version="1.0"; sha256="1byfm1ycw9nfhdblqklyn8pxn6b9q5fa3inbgfpynqpsid97ig35"; depends=[Rcpp]; }; rbefdata = derive2 { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[RColorBrewer RCurl rjson rtematres wordcloud XML]; }; rbenchmark = derive2 { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; }; - rbgm = derive2 { name="rbgm"; version="0.0.5"; sha256="1gz9hxlwmj2ch1ds6mx1nlkwy4fm811jkz5fz3cl6675n11bjdpg"; depends=[dplyr geosphere raster readr rlang sp stringr tibble]; }; + rbgm = derive2 { name="rbgm"; version="0.1.0"; sha256="0jw7p6l0il0fz5rq7ra731xzj06aqqvm9s1r0hwa4rd74lkg198n"; depends=[dplyr geosphere raster reproj rlang sfheaders sp]; }; rbhl = derive2 { name="rbhl"; version="0.9.0"; sha256="0n9jxyrpq1s0yq13ylkhm0qcjlm8b25p19vpxv2s4wxan758zypd"; depends=[crul jsonlite plyr tibble xml2]; }; + rbi = derive2 { name="rbi"; version="0.10.3"; sha256="09hqv235fry60nqvd1is8n7szkq96w160xpw2pdxqdxvlh52cf2r"; depends=[data_table ncdf4 processx reshape2]; }; rbin = derive2 { name="rbin"; version="0.1.2"; sha256="0kiad4l0qplzxqx6zx5fp48lq5g6l80qgydfri0vh3giadzcmsp7"; depends=[DescTools dplyr forcats ggplot2 magrittr miniUI recipes rlang rstudioapi shiny tibble]; }; rbiouml = derive2 { name="rbiouml"; version="1.9"; sha256="01ysjq49nhawp0r2by7b15s4b7bzsbn2xhdcyyrh38vrl04rpf57"; depends=[RCurl RJSONIO]; }; rbison = derive2 { name="rbison"; version="0.8.0"; sha256="0x2yiq1wvm6mzmhfa3ds8mmhidv91hxi14nhz4nib6nmna3c9al2"; depends=[crul data_table dplyr ggplot2 jsonlite mapproj plyr sp]; }; @@ -12532,6 +12552,7 @@ in with self; { rbtt = derive2 { name="rbtt"; version="0.1.0"; sha256="1gbsb0vmqxcl28c5nn0rz95bxrvl7i0b17lq90cj5ahbk6x9jblz"; depends=[data_table]; }; rbundler = derive2 { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; }; rbvs = derive2 { name="rbvs"; version="1.0.2"; sha256="1wzxz2ca8f1phhbqr9p7c8sk09cyrdq5jc45g4ddrqvi2q29k28y"; depends=[]; }; + rbw = derive2 { name="rbw"; version="0.2.0"; sha256="01y33gbljb6bvbdsr42vgfi75sywhwn313y5jv1y4kkc4iqzag1r"; depends=[rlang]; }; rcane = derive2 { name="rcane"; version="1.0"; sha256="0p2mgkq6fh0n289n2h19c52lnqxl05wvpmd6nwvgnjqwa4wwpa7r"; depends=[]; }; rcanvec = derive2 { name="rcanvec"; version="0.2.1"; sha256="0gsk2cfiysxjw2lrnpl2l524lvhh9nhnyyh79n8p7vykyqj711yn"; depends=[rgdal sp]; }; rcarbon = derive2 { name="rcarbon"; version="1.3.1"; sha256="1qdmbvp758758ny2d4y0xi5gdhzvjmwvxh6yjhmavhb454fys0yi"; depends=[doParallel foreach knitr sp spatstat]; }; @@ -12563,12 +12584,11 @@ in with self; { rcrossref = derive2 { name="rcrossref"; version="1.0.0"; sha256="1743qy5q0n2ij7x88nkk99w59vnl7g9fwpkwgb3a3s235f6lb4df"; depends=[bibtex crul dplyr DT jsonlite miniUI plyr R6 shiny stringr xml2]; }; rcrtan = derive2 { name="rcrtan"; version="0.1.1"; sha256="0kcp3gnjmp00i1hsjagpp0dlr6zgpc4y5ihpx93hm4m3fnzcmn7x"; depends=[dplyr magrittr purrrlyr tibble tidyr]; }; rcrypt = derive2 { name="rcrypt"; version="0.1.1"; sha256="002r5wr0bmqbj014iz8wacj883j6gqcxc786m6p9a7zdrjpx2pqi"; depends=[]; }; - rcss = derive2 { name="rcss"; version="1.8"; sha256="0c2i1zqjgl81i91b3bv70v54iib1d7hbsd1h63nip1al6lwnya4c"; depends=[nabor Rcpp RcppArmadillo]; }; rcube = derive2 { name="rcube"; version="0.5"; sha256="1162y7fs3fsbb5jj66g9kvxxhggprlifrabqbb9lqm8rrdwhz3r9"; depends=[magrittr]; }; rcv = derive2 { name="rcv"; version="0.2.1"; sha256="0i5z3a918ykl56dv3dvzwwcv550gvjjdg5kfh63jlpaxn9ybmv3f"; depends=[dplyr readr stringr tibble tidyr]; }; rdatacite = derive2 { name="rdatacite"; version="0.5.2"; sha256="07zbxr89fxx9nlp5w7n60rjm3prck08h0fjrq0pnpkbnnkx9cv9a"; depends=[crul jsonlite tibble]; }; rdataretriever = derive2 { name="rdataretriever"; version="2.0.0"; sha256="0gnvvxvlfh6j887y5w83q5kg6lqqcb0c54lfcx9qp3r28hpdlxkz"; depends=[reticulate]; }; - rdbnomics = derive2 { name="rdbnomics"; version="0.5.2"; sha256="149ma5rvrfd1hcjm47g7yqwiildqcf0q3n70jfhd48fqgs0x30l9"; depends=[curl data_table jsonlite]; }; + rdbnomics = derive2 { name="rdbnomics"; version="0.6.1"; sha256="1jvgmfa0qc3l2bp2896827vxpavc32bzby8x9z2wbyfmkk6pm985"; depends=[curl data_table jsonlite]; }; rdd = derive2 { name="rdd"; version="0.57"; sha256="1lpkzcjd18x51wzr4d1prdjfsw5978z6zap65psfs02nszy69nqp"; depends=[AER Formula lmtest sandwich]; }; rddensity = derive2 { name="rddensity"; version="1.0"; sha256="0v94izsghy35b33dq5b28p2lqs1fw1snyipdf9vgjz5s3qkzjkd8"; depends=[ggplot2 lpdensity]; }; rde = derive2 { name="rde"; version="0.1.0"; sha256="1zw9gdh90hl0wc5c0xwl5x7566r611wk73sbqdmpzpswjyyl9aqm"; depends=[clipr]; }; @@ -12588,7 +12608,7 @@ in with self; { rdoxygen = derive2 { name="rdoxygen"; version="1.0.0"; sha256="16907969w66xvy62k45rw10qfv4x8z6jkkc6i97vppkgnlvf4d4b"; depends=[devtools]; }; rdpla = derive2 { name="rdpla"; version="0.2.0"; sha256="0d32bp68z1agymcmjwnds4fkblhjrcx8i2q6f5b7sl4kdfdbjchf"; depends=[crul data_table hoardr jsonlite tibble]; }; rdpower = derive2 { name="rdpower"; version="0.5"; sha256="1kqfxh2g9dar130d0wld64iyd6iq51s2zrsjrprg1s3ssgi9xmb6"; depends=[rdrobust]; }; - rdrobust = derive2 { name="rdrobust"; version="0.99.6"; sha256="0dzg7yksa0cjj5gc77qq6isc97w00chjmf0ak3dbm6gjy68kv8nx"; depends=[ggplot2]; }; + rdrobust = derive2 { name="rdrobust"; version="0.99.7"; sha256="07v7cllcwmjgn8iscgm8lmxp1m6c9v6ikph4g3r4d4prbap7p556"; depends=[ggplot2]; }; rdrop2 = derive2 { name="rdrop2"; version="0.8.1"; sha256="1f4ysck58dm40k4wn9nfjaxym0mbgfkm146iidfkz7agmd1x0xyl"; depends=[assertive digest dplyr httr jsonlite magrittr purrr]; }; rdryad = derive2 { name="rdryad"; version="0.4.0"; sha256="19ca618hymvpk5byrrglc6iidsgm6wn43fypspssa7b3r1c4xhdc"; depends=[crul curl data_table oai solrium tibble xml2]; }; rdtLite = derive2 { name="rdtLite"; version="1.2.1"; sha256="0mm2psp8j1dfvah5d68a721kl3klins038nwgbv4s6x38a9amvq6"; depends=[curl digest ggplot2 gtools jsonlite knitr provSummarizeR provViz rmarkdown sessioninfo stringi XML]; }; @@ -12616,15 +12636,15 @@ in with self; { readmnist = derive2 { name="readmnist"; version="1.0.6"; sha256="0f2kp5r04k47gpvbj8x13c47zsis3bw3y8f5f37sh6jggblqr004"; depends=[]; }; readobj = derive2 { name="readobj"; version="0.3.2"; sha256="0n25n02f5kn8zv90n2xzdasjnrqisl4n5szb667jw57v40b726cw"; depends=[Rcpp]; }; readr = derive2 { name="readr"; version="1.3.1"; sha256="1wz496rw0ah433p755n3xac8gh7yzid4xgdjzd1a7wmpkgilvy9k"; depends=[BH clipr crayon hms R6 Rcpp tibble]; }; - readroper = derive2 { name="readroper"; version="0.9.1"; sha256="153iy144c4yxcs2cwr73czy69b4fj4q1g77rb8qmvp6blfwdcd71"; depends=[readr]; }; + readroper = derive2 { name="readroper"; version="0.9.3"; sha256="00l731hryx0igj0x7knljs9xq4gaczmsgw2hh05ngrl9y5s528dc"; depends=[readr]; }; readsdmx = derive2 { name="readsdmx"; version="0.3.0"; sha256="188yzkjblbjly032312w0fazj7k7j4ynqfc69xpblnw4gs708sx0"; depends=[Rcpp]; }; readstata13 = derive2 { name="readstata13"; version="0.9.2"; sha256="02mqwpzn7n3pqjxivnd1vlfc47xkyiywfz594x0f6vd2dym8rdwd"; depends=[Rcpp]; }; readtext = derive2 { name="readtext"; version="0.76"; sha256="1k79db2aay15gdb52cqd87wnwk0pn27y45c65741rk8rgddk7lwj"; depends=[antiword data_table digest httr jsonlite pdftools readODS readxl streamR stringi striprtf tibble xml2]; }; readtextgrid = derive2 { name="readtextgrid"; version="0.1.1"; sha256="03qrbmlpbjwx4ia0ydv6m9lwzalsas9pdhds82mg5f8ir0cd0qi6"; depends=[magrittr plyr purrr readr stringr tibble]; }; readthat = derive2 { name="readthat"; version="0.0.1"; sha256="04vnpvfa8in3gxi6nv3si59hr8hj17wq3a5n8rnpiaczg46qr1dr"; depends=[curl Rcpp]; }; - readwritesqlite = derive2 { name="readwritesqlite"; version="0.1.0"; sha256="15ahhdmrcas199ki3fl8mbdailgp0w18ki64nkq2f6sz9yyxngq1"; depends=[chk DBI hms lifecycle RSQLite tibble]; }; + readwritesqlite = derive2 { name="readwritesqlite"; version="0.1.1"; sha256="1s0av5ijnsan9lr3szdf91hf0xwyy9m0qidp8dxh2zpm5md4ipkr"; depends=[chk DBI hms lifecycle RSQLite tibble]; }; readxl = derive2 { name="readxl"; version="1.3.1"; sha256="15mambxr8c7k2ikdfsl1w3vxvm54dsnk0cl1qvks6iig7rql3d14"; depends=[cellranger progress Rcpp tibble]; }; - readxlsb = derive2 { name="readxlsb"; version="0.1.2"; sha256="0vm1hl8rjmcly6wkq06x9q5yswcdxasdc66xgpvhvw8mf0q6rlkd"; depends=[cellranger Rcpp xml2]; }; + readxlsb = derive2 { name="readxlsb"; version="0.1.3"; sha256="1n3j2g18n908z7n275mjjha9l358z1dvyg3p8gpymb66vaz55ims"; depends=[cellranger Rcpp xml2]; }; reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; }; rebird = derive2 { name="rebird"; version="1.1.0"; sha256="0l1wignhs4hsy0yshr9gh9mwy8h794injkl5f7flkl1m4c39rz8w"; depends=[assertthat dplyr httr jsonlite]; }; rebmix = derive2 { name="rebmix"; version="2.11.0"; sha256="1rmpgzxpxk3dr0c625j5g37kvxvlqwprkixk7lwjwn4lviin3cwq"; depends=[mvtnorm]; }; @@ -12658,7 +12678,7 @@ in with self; { redlistr = derive2 { name="redlistr"; version="1.0.3"; sha256="003jxfmj1gryw77vnrvaxmpvjbshlq53wgcrj02mcywfcqzg4jcr"; depends=[plyr raster rgeos sp]; }; redux = derive2 { name="redux"; version="1.1.0"; sha256="0a551w7fph338mqzxda6y21lsad19dway7w18jw9cv1rgvcp9nvc"; depends=[R6 storr]; }; ref_ICAR = derive2 { name="ref.ICAR"; version="1.0"; sha256="0k6czsbjclgmi7vp5hl50jghkzm573s50993iz3dcv55mv662251"; depends=[coda MCMCglmm mvtnorm Rdpack rgdal spdep]; }; - referenceIntervals = derive2 { name="referenceIntervals"; version="1.1.1"; sha256="04199nxh216msaghkp66zsi96h76a7c42ldml0fm66v2vamcslg8"; depends=[boot car extremevalues outliers]; }; + referenceIntervals = derive2 { name="referenceIntervals"; version="1.2.0"; sha256="0wf8c71z7gq2f91q60dyy7mrxsnhq7x3wdllmzn2lpabgv2wrm85"; depends=[boot car extremevalues outliers]; }; refinr = derive2 { name="refinr"; version="0.3.1"; sha256="0q76sr050pg3ahwzcxj08mjig0k2jq8yh7nv6d914pwg3dhq05sn"; depends=[Rcpp stringdist stringi]; }; refnr = derive2 { name="refnr"; version="0.1.0"; sha256="1gjjzxpyxm1kf1pqk99bd7f2j85rzmww3r1268bccivf19rs881i"; depends=[]; }; refset = derive2 { name="refset"; version="0.1.1"; sha256="1xbwvm9066g3f7pd34z5jh04vph4ddy2lkcgmf4kiwa1k5czpwg1"; depends=[]; }; @@ -12669,7 +12689,7 @@ in with self; { regclass = derive2 { name="regclass"; version="1.6"; sha256="0m974k3yhf0dgv5f1qjs8c53mam0cll3cjn35ywfrmlfla0wlhf5"; depends=[bestglm leaps randomForest rpart rpart_plot VGAM]; }; regexPipes = derive2 { name="regexPipes"; version="0.0.1"; sha256="1hk0rhvmgzcyf5cyl8hjznl3ll25kpasqikfr6nxd6ian2slvmmb"; depends=[]; }; regexSelect = derive2 { name="regexSelect"; version="1.0.0"; sha256="0xnb9qa8l63ang4r40ky4qhlrs5mbzvmj98dgij26j3mq1ys1pa7"; depends=[shiny shinyjs]; }; - reghelper = derive2 { name="reghelper"; version="0.3.5"; sha256="1max91968w5ijnvi4pqhnvzcqj1dxw41cifzgf5mjg63ylpxsarx"; depends=[ggplot2 lme4 nlme]; }; + reghelper = derive2 { name="reghelper"; version="0.3.6"; sha256="0m90q6iq2y5fjdwwplvpjymzhc8kr2cdfb2gghfrzfzxnd3m4fg7"; depends=[ggplot2 lme4 nlme]; }; registr = derive2 { name="registr"; version="1.0.0"; sha256="1ysj2ab69w6g71d1kpcwyq0py71w6h7lfhk4nzgn2dhh6k8whwbn"; depends=[dplyr ggplot2 gridExtra magrittr Rcpp RcppArmadillo tidyr]; }; registry = derive2 { name="registry"; version="0.5-1"; sha256="1k3j6dx350awamr0dwwgkhfs46vsnj4nf08iw5byq0x7n3nkdsnz"; depends=[]; }; reglogit = derive2 { name="reglogit"; version="1.2-6"; sha256="1nnn8n5sqhbd3nzmwnpmcsmaxxxaqwbna7xm7q9vk4cqz9cm9b9s"; depends=[boot Matrix mvtnorm]; }; @@ -12722,7 +12742,7 @@ in with self; { repeated = derive2 { name="repeated"; version="1.1.2"; sha256="19kcsj96i1zpnwfan3gz5vrzc2gqlah0wrdr9vb4vvacz45wcdfq"; depends=[rmutil]; }; repec = derive2 { name="repec"; version="0.1.0"; sha256="0alr9fbmfxmnnnn1qymy65crcycynwz435jj0vangbb4p0qhv8pm"; depends=[jsonlite]; }; repfdr = derive2 { name="repfdr"; version="1.2.3"; sha256="0jpk44arg1jib0h2w90h851bs5cd1ss32fab9bfvf9iir2jk8985"; depends=[Rcpp]; }; - replicateBE = derive2 { name="replicateBE"; version="1.0.13"; sha256="1r5c4gwbwcdkcp1by8n3l4fn54vaxhp9fc5zbmgn43rpwbz1nsma"; depends=[lmerTest nlme pbkrtest PowerTOST readxl]; }; + replicateBE = derive2 { name="replicateBE"; version="1.0.14"; sha256="1x71wpmg1mb53jv150k8cb319rqqwnsbns05ac95hlpnkqp9jcf9"; depends=[lmerTest nlme pbkrtest PowerTOST readxl]; }; replicatedpp2w = derive2 { name="replicatedpp2w"; version="0.1-2"; sha256="0nskwkqm9z2aphpim6pvykhc3fphlsbap3r49nghkwjpngd0qzj8"; depends=[spatstat spatstat_utils]; }; replicationInterval = derive2 { name="replicationInterval"; version="2.0.1"; sha256="1jyvyqr8r2fs1cmbz7zjcc8p116bnkslvx27pqi92y5pxgqvsqvr"; depends=[ggplot2 MASS MBESS pbapply]; }; repmis = derive2 { name="repmis"; version="0.5"; sha256="0z5mjbsl24yjbl0aawr35grcal44rf2xbwv1hy7bdkms94ix79b5"; depends=[data_table digest httr plyr R_cache]; }; @@ -12731,7 +12751,6 @@ in with self; { reportROC = derive2 { name="reportROC"; version="3.4"; sha256="1gcck5ids0prrrbv4hqi76swxjhbx796p4qlxbf63ys3gvdzanxr"; depends=[pROC]; }; reportReg = derive2 { name="reportReg"; version="0.3.0"; sha256="0qwrpn61x69hmgln5fpc58dqfa3pba0lgjjyj0f3fh96wc9jyhq1"; depends=[nlme]; }; reportr = derive2 { name="reportr"; version="1.3.0"; sha256="0zynplxqvbmf23cm2rsz3wz2jx6mv55z94mn1k44ny3lx625cnpw"; depends=[ore]; }; - reports = derive2 { name="reports"; version="0.1.4"; sha256="0r74fjmdqax2x5fhbkdxb8gsvzi6v794fh81x4la9davz6w1fnxh"; depends=[]; }; reporttools = derive2 { name="reporttools"; version="1.1.2"; sha256="1i87xmp7zchcb8w8g7nypid06l2439qyrvpwsjz6qny954w6fa2b"; depends=[xtable]; }; repr = derive2 { name="repr"; version="1.1.0"; sha256="15jz780w4nd9qjd1g3gq8f5lkh60p2v3ig3hm5kl1rg3z4cf0gvl"; depends=[base64enc htmltools jsonlite pillar]; }; represent = derive2 { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; }; @@ -12739,7 +12758,7 @@ in with self; { reprex = derive2 { name="reprex"; version="0.3.0"; sha256="0v7vxzs8alwz8y1cjicpimp5yimf1g9gb8x5wy3zhvrz6kk2lg10"; depends=[callr clipr fs rlang rmarkdown whisker withr]; }; reproducer = derive2 { name="reproducer"; version="0.3.1"; sha256="0clgbwfv24fjx6hj0km1nwy508dqbga8q8lyzqg801yrr8gidizd"; depends=[dplyr GetoptLong ggplot2 gridExtra httr jsonlite lme4 MASS metafor openxlsx readr reshape stringr tibble tidyr xtable]; }; reproducible = derive2 { name="reproducible"; version="1.0.0"; sha256="1zcxdvh3x1h0jcxcv62syl0midj2kk264vkanjj2bfhn4jbbbymi"; depends=[backports crayon data_table DBI digest fastdigest fpCompare gdalUtils glue googledrive httr magrittr memoise qs quickPlot R_utils raster remotes rgdal rlang RSQLite sf sp testthat versions]; }; - reproj = derive2 { name="reproj"; version="0.4.0"; sha256="0liwv4sgxdm42vyykjyc3jihcxk3b5q0d7cwgai8349nn1ah0wdh"; depends=[proj4 tibble]; }; + reproj = derive2 { name="reproj"; version="0.4.2"; sha256="0lxd1vsxcf0r96jkl5jrh3kyklf90wcs4a27cs6ck93x1cxjnnni"; depends=[crsmeta PROJ proj4]; }; repurrrsive = derive2 { name="repurrrsive"; version="1.0.0"; sha256="1nmy88h2bfv2bad282kbrmnkjx9d8klgzv4mm8nspm049s09ydmz"; depends=[tibble]; }; reqres = derive2 { name="reqres"; version="0.2.3"; sha256="0dly09h8dpjlmvrd1wfg1gqcqhm03ax97qr0nd1p0fg9y0pdapya"; depends=[assertthat brotli jsonlite R6 stringi urltools webutils xml2]; }; request = derive2 { name="request"; version="0.1.0"; sha256="1q7zd6q00gdqmgq7s7nq1ixmns8zn2amr5zah9rwnsn8dkllj9yh"; depends=[curl httr jsonlite lazyeval magrittr R6 whisker]; }; @@ -12753,7 +12772,7 @@ in with self; { resemble = derive2 { name="resemble"; version="1.2.2"; sha256="189a6b1y720w9ff8cyqazd2d3v1msbfw8zdqr5rmilxvxmnspccs"; depends=[foreach iterators Rcpp RcppArmadillo]; }; reservoir = derive2 { name="reservoir"; version="1.1.5"; sha256="1qvjq8j2gxp6b8m3k3822f9na8a1kbwzzsmq70m763dcq293rgiz"; depends=[gtools]; }; reshape = derive2 { name="reshape"; version="0.8.8"; sha256="0s6i0sqxg1vldxs6miv8mi0zydxbqzgpmzfiwkj8y7jix3yrfmad"; depends=[plyr]; }; - reshape2 = derive2 { name="reshape2"; version="1.4.3"; sha256="03ki5ka1dj208fc0dclbm0b4xp9d769pah2j9cs34l776p4r9zwa"; depends=[plyr Rcpp stringr]; }; + reshape2 = derive2 { name="reshape2"; version="1.4.4"; sha256="1n0jrajpvc8hjkh9z4g8bwq63qy5vy5cgl2pzjardyih4ngcz3fq"; depends=[plyr Rcpp stringr]; }; reshapeGUI = derive2 { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[gWidgets gWidgetsRGtk2 plyr reshape2]; }; resourcer = derive2 { name="resourcer"; version="1.0.0"; sha256="11abgyk0xs0sb3cw0fn6nh9wzbqnijja1mhj3hsdvz9n8k196b08"; depends=[httr R6]; }; respirometry = derive2 { name="respirometry"; version="1.0.2"; sha256="10dfy1xx2214x4lk0nxxi8c2h8j47gd8w004ic016j3m7a1vp3jd"; depends=[birk lubridate marelac measurements minpack_lm PKNCA seacarb segmented]; }; @@ -12772,6 +12791,7 @@ in with self; { retractcheck = derive2 { name="retractcheck"; version="1.0.0"; sha256="1c4p8afh9g359s560sswcys3manc0lqvk0aqgvd09p4rpzls2dm7"; depends=[httr plyr textreadr]; }; retrodesign = derive2 { name="retrodesign"; version="0.1.0"; sha256="173jrpzasimplv8vbm8gzpl8aibnsjkgvhz1hd75is0b2l8gnbxy"; depends=[]; }; retrosheet = derive2 { name="retrosheet"; version="1.1.1"; sha256="1x9gh9zjb4r1nyfbcb79c656a8hzrfasdir8p968inqmr08b57v0"; depends=[data_table httr lubridate purrr readr rvest stringi stringr tibble xml2]; }; + retry = derive2 { name="retry"; version="0.1.0"; sha256="1yfcfvszfjnvvnjcywgchyiyj3jk9nmvk3h40g6bc24xapfkfl2p"; depends=[later rlang]; }; reutils = derive2 { name="reutils"; version="0.2.3"; sha256="09dhf4s7wz3anrkzqi16abx64gk8ck2142kfd8pv71mjy3x548l7"; depends=[assertthat jsonlite RCurl tibble XML]; }; reval = derive2 { name="reval"; version="2.0.0"; sha256="1yxkyc6wdp5h3cp8i42a9cf0b1cwr4nmpd7svlp7bpfxlcnqqa0d"; depends=[doParallel foreach]; }; revdbayes = derive2 { name="revdbayes"; version="1.3.6"; sha256="15nrmnl3g4l8yn6x1xvbfjn4fznryvgkvaqyxjr929v05rrf3fl0"; depends=[bayesplot Rcpp RcppArmadillo rust]; }; @@ -12782,13 +12802,12 @@ in with self; { revgeo = derive2 { name="revgeo"; version="0.15"; sha256="1ns7d1817475lriss6wwgvdm6lj760p40yxqaifla13c2xb73a55"; depends=[RCurl RJSONIO]; }; revtools = derive2 { name="revtools"; version="0.4.1"; sha256="0nms7rwpdzf3xq2incraxppha4c830gcygpbnhwjs92c836hh2f0"; depends=[ade4 modeltools ngram plotly shiny shinydashboard slam SnowballC stringdist tm topicmodels viridisLite]; }; reweight = derive2 { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; }; - rex = derive2 { name="rex"; version="1.1.2"; sha256="0alsadgjgass3wr8y5d247j12qqzg454sc84vpskclrkmz778g5x"; depends=[lazyeval magrittr]; }; + rex = derive2 { name="rex"; version="1.2.0"; sha256="0m7bq8db3m5dhf01rw7xc7xy1ciq3m7dfgsl80p8cy4h8vqr3d06"; depends=[lazyeval]; }; rexpokit = derive2 { name="rexpokit"; version="0.26.6.6"; sha256="13dxra3s68i499g21z9i93mbn6n8s4xay5zmvslafaccbq3q1ray"; depends=[Rcpp]; }; rfPermute = derive2 { name="rfPermute"; version="2.1.81"; sha256="0mak4r3j5vbjjkcsbxj0yg2xrbipq4rz873b02drkb769nh3d16a"; depends=[abind dplyr ggplot2 gridExtra magrittr randomForest rlang scales swfscMisc tibble tidyr]; }; rfUtilities = derive2 { name="rfUtilities"; version="2.1-5"; sha256="1anwvmxn3xrc1aqxl75rzlk4wby8l54rmkp0bgi8dgbz2l223xr0"; depends=[cluster randomForest]; }; rfVarImpOOB = derive2 { name="rfVarImpOOB"; version="1.0"; sha256="1341bicd65qw3pz1j8d6c9baj9d6s70ljdaaf87xvx8pjnajrfsw"; depends=[binaryLogic dplyr ggplot2 ggpubr magrittr prob randomForest titanic]; }; rfacebookstat = derive2 { name="rfacebookstat"; version="2.0.2"; sha256="0szzrlszjxapn86mk29f1nn39fmkfwjslbbcmqqj2harlnccafr7"; depends=[dplyr httr jsonlite purrr stringr tidyr tidyselect]; }; - rfbCNPJ = derive2 { name="rfbCNPJ"; version="0.1.1"; sha256="0zvpazxi184ia2wql0120kw7665dn9cs8a2kv91n79pncabb4xfg"; depends=[fs glue httr magrittr progress purrr readr stringr tibble xml2]; }; rfigshare = derive2 { name="rfigshare"; version="0.3.7"; sha256="1qgzn0mpjy4czy0pnbi395fxxx84arkg8r7rk8aidmd34584gjiq"; depends=[ggplot2 httpuv httr plyr RJSONIO XML yaml]; }; rfinterval = derive2 { name="rfinterval"; version="1.0.0"; sha256="1z7v0sbql6g2h3fr1268nj79rbx1d33hjfaraxhbikrjgb8mbp0w"; depends=[MASS ranger]; }; rfishbase = derive2 { name="rfishbase"; version="3.0.4"; sha256="1km3xjbf3l81sfmmjs55criq4xw6l3xa74f8g1rxsbr5bci9xlia"; depends=[dplyr gh magrittr memoise purrr readr rlang stringr]; }; @@ -12796,7 +12815,7 @@ in with self; { rfishnet2 = derive2 { name="rfishnet2"; version="0.1.0"; sha256="054cdgffy56yf5i0wy6kkyc68lim3zlk9czi6k5cy87lfjzcjqs9"; depends=[ggplot2 pracma sf]; }; rflexscan = derive2 { name="rflexscan"; version="0.2.0"; sha256="008xpbdqix18lwdqcx0mixwhv8v47kzpkblr53igp5766l04nfyj"; depends=[igraph Rcpp rgdal sp]; }; rflights = derive2 { name="rflights"; version="0.1.103"; sha256="1gxfsc3dhlzy6bpqjdxk5x309jmjgvxr8d9amnhrjdygzj6icf18"; depends=[httr]; }; - rfm = derive2 { name="rfm"; version="0.2.0"; sha256="1d07bms5ykfkw0ynfl21fhs9s6yvs44fn570vzi2dj8h5ywbsz15"; depends=[assertthat dplyr forcats ggplot2 ggthemes lubridate magrittr purrr RColorBrewer rlang tidyr xplorerr]; }; + rfm = derive2 { name="rfm"; version="0.2.1"; sha256="0p3y5pkxlm59jxwzyf6c5x9g8vbgvyn5d8j793szd075m11gk099"; depends=[dplyr ggplot2 ggthemes lubridate magrittr RColorBrewer rlang tibble tidyr xplorerr]; }; rfml = derive2 { name="rfml"; version="0.1.0"; sha256="133adpfjpp14m47841k6ybq9lrvby9bxgr5zs4i3akjr2575nq1j"; depends=[httr jsonlite PKI XML]; }; rfoaas = derive2 { name="rfoaas"; version="2.1.0"; sha256="0w6m3lvfb60a2zfvyc0ksnfllb2ndy45b301vk9f3nr27lxdz6dm"; depends=[httr]; }; rfordummies = derive2 { name="rfordummies"; version="0.1.4"; sha256="03y4kzf18xwk41dm1nzqqqk0aflwh1mcgfnh0lbr0r7hnsy3a77x"; depends=[openxlsx]; }; @@ -12808,13 +12827,14 @@ in with self; { rgdax = derive2 { name="rgdax"; version="1.0.0"; sha256="16ph6n1nyl2v2w51ih6wzkpw0j0hfa3f60q1g6p9zis59j0rh7d9"; depends=[digest httr jsonlite RCurl]; }; rgen = derive2 { name="rgen"; version="0.0.1"; sha256="0gl82v09q1ha58wd1014s46wzkx1yf348bc7jkl6s4qdc6c4vsb8"; depends=[]; }; rgenoud = derive2 { name="rgenoud"; version="5.8-3.0"; sha256="0p93wf6ghgz2nifxbscb6bhahh5jd2ba7nh1c2mb6fmbxnsi3swv"; depends=[]; }; - rgeolocate = derive2 { name="rgeolocate"; version="1.0.1"; sha256="1v9kd71wpxna1war0rbp91pc5wdqlganmj2c2fc5m5176dnxd2v3"; depends=[httr Rcpp]; }; + rgeolocate = derive2 { name="rgeolocate"; version="1.2.0"; sha256="0v83ldn6jh0jg6vnx3i8fc2nxp00vj63bkywr3dhpd11dj9l22hn"; depends=[httr Rcpp]; }; rgeopat2 = derive2 { name="rgeopat2"; version="0.3.9"; sha256="0l0sqkvjkzp4lmyk55l7zc02y04sa43cps47005gq8c38kyks45k"; depends=[readr sf stringr]; }; rgeoprofile = derive2 { name="rgeoprofile"; version="0.1.1"; sha256="0frpipmmhywbahcyj5rhypp9qxqkp6xkdj6sn8w1ipw6gv02zp7b"; depends=[aspace geosphere leaflet pals RANN raster sp splancs]; }; rgeos = derive2 { name="rgeos"; version="0.5-2"; sha256="0ajrrxfwfp184c6rnby3dq54hzp3rrx3px72dn7gbdn6c4li2bqz"; depends=[sp]; }; rgexf = derive2 { name="rgexf"; version="0.16.0"; sha256="1vj5ha1qx0xzflchxf25ycys6clfn9y32m1717afzkvhmkwisrra"; depends=[igraph servr XML]; }; rggobi = derive2 { name="rggobi"; version="2.1.22"; sha256="1g7k4xais9xkjlbvrkadr5d6c5rw4jp9c0gljhm71pa1fc9fcqff"; depends=[RGtk2]; }; - rgl = derive2 { name="rgl"; version="0.100.50"; sha256="165p932ml7dpjkm41zc47p5cdxar69il0m5yvg0avi8q01vr17ay"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; }; + rgho = derive2 { name="rgho"; version="2.0.0"; sha256="18vsd40wrzm8h8xv7mngyndw18wasb5b868ihczvzrqfnf5bq758"; depends=[curl dplyr httr jsonlite lazyeval magrittr memoise readr tibble tidyr]; }; + rgl = derive2 { name="rgl"; version="0.100.54"; sha256="1mgs2d8igmcdzzymfwbqdrypmaidd4pra5n5gnhsn9pm6pqzidqp"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; }; rglobi = derive2 { name="rglobi"; version="0.2.21"; sha256="12v6g1ja4rrw0vcrrzgd1llxfk64g9z4f0c90rkbd9cknvnn0id9"; depends=[curl RCurl readr rjson]; }; rglwidget = derive2 { name="rglwidget"; version="0.2.1"; sha256="0siqxn3gyl98i84p0yha821b4rdrp2i0942mkx819wnf7qwrpqcv"; depends=[rgl]; }; rgoogleslides = derive2 { name="rgoogleslides"; version="0.3.2"; sha256="0h9gws1vcf0zdd21d8b65c2yz9kxppp3218h5lhd5iz879ajwa2i"; depends=[assertthat httr jsonlite R6]; }; @@ -12862,7 +12882,7 @@ in with self; { riskclustr = derive2 { name="riskclustr"; version="0.2"; sha256="0j5gcm9a57yrg5ppqmacdjr16b9d8rwqkhq1mawy1fjpf18d2max"; depends=[aod gtools Matrix mlogit stringr]; }; risksetROC = derive2 { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[MASS survival]; }; riskyr = derive2 { name="riskyr"; version="0.2.0"; sha256="0zq5qybqisbh9k7i57s8yw9xcm7yckcjk17h4ybcx4p8788gg5m3"; depends=[]; }; - ritis = derive2 { name="ritis"; version="0.8.0"; sha256="1ggcchavhxcd3pawcf631ca8w1y4v0ygm1hflvkmzhk4k9ci3g13"; depends=[crul data_table jsonlite solrium tibble]; }; + ritis = derive2 { name="ritis"; version="0.9.0"; sha256="0v0g7zbdx21ia98lb126cq2d1fwx24prng2p2r8lcgpxc34fdfsa"; depends=[crul data_table jsonlite solrium tibble]; }; riv = derive2 { name="riv"; version="2.0-5"; sha256="0n19jlrs12iysq45xyi3zvghkircg0ww5vbsfpnqkw5b22zsv30s"; depends=[MASS quantreg rrcov]; }; riverdist = derive2 { name="riverdist"; version="0.15.0"; sha256="145mvqnhv12dcvss54wdycgb3wwk95phl4kx5z0jnh3kmm1zsdl4"; depends=[rgdal sp]; }; rivernet = derive2 { name="rivernet"; version="1.2.1"; sha256="0p8jyigbxipwds9pdw2gzv3ql5yikg1ik4vbk4drylbp5xhmvyja"; depends=[]; }; @@ -12897,7 +12917,6 @@ in with self; { rlm = derive2 { name="rlm"; version="1.2"; sha256="18y735z05k9pms6iv1739qg3q12w099qhs42icxhqs5gcdhz92fm"; depends=[]; }; rlmDataDriven = derive2 { name="rlmDataDriven"; version="0.4.0"; sha256="1fhh2siafpqmvpxi2piccxvvn5n38s5d6as6iyn43rgpsslswc8g"; depends=[MASS tseries]; }; rlme = derive2 { name="rlme"; version="0.5"; sha256="0p26mw4g12l279lh80vqcjs3pvjr759ap2m622490k1i2ralxzif"; depends=[magic MASS mgcv nlme quantreg Rcpp robustbase stringr]; }; - rlo = derive2 { name="rlo"; version="0.3.2"; sha256="0abq42dhapzmh6hvmildbn8zya29c6p1aqbv8avc03g014dwbrd0"; depends=[PythonInR]; }; rly = derive2 { name="rly"; version="1.6.2"; sha256="1bb55g3rip524dccaxvahjxsi2cimxqvzc897pxplv3bb10pm0r2"; depends=[futile_logger R6]; }; rmRNAseq = derive2 { name="rmRNAseq"; version="0.1.0"; sha256="0hh44bn7z7945aw722haazw8dx7fwzym67jismkygzhnksh59wqi"; depends=[AUC Biobase DESeq2 edgeR limma MASS Matrix nlme reshape rlang splineTimeR statmod]; }; rma_exact = derive2 { name="rma.exact"; version="0.1.0"; sha256="1igs92la79akyqj84ah23lpcay7i33k7zgzcwm7sii782fhirivx"; depends=[abind metafor]; }; @@ -12924,7 +12943,7 @@ in with self; { rmetasim = derive2 { name="rmetasim"; version="3.1.14"; sha256="0rdkhfgyr97r2d1kd9g8ipb2pn563qxm1y4m9z678q0kqan2ddl0"; depends=[ade4 adegenet gtools pegas]; }; rmgarch = derive2 { name="rmgarch"; version="1.3-7"; sha256="108wrbqj4c02c9cyv5m5xlswb1mlfdrhggb005sixr2dcqghb163"; depends=[Bessel corpcor ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; }; rmi = derive2 { name="rmi"; version="0.1.1"; sha256="1y0395l9lhskdrk3x9ps2dmv0sznsba0n6a9fmma33dc9dhywgf9"; depends=[BH Rcpp RcppArmadillo]; }; - rminer = derive2 { name="rminer"; version="1.4.3"; sha256="0x9lzzhhy5zld8fajf4aq1msvck2kg3hvkpaiw4lx7w14znda7kd"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; }; + rminer = derive2 { name="rminer"; version="1.4.5"; sha256="0xwlayzmn4z6g9l93mj0vjsh31mhpxcmccvjm0dr802cjiv3phjj"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; }; rmio = derive2 { name="rmio"; version="0.1.3"; sha256="0zd8kki9wmh4xnabf7nwjw66wb4x5wngn0073pzqcj84ggxgnwqc"; depends=[]; }; rmonad = derive2 { name="rmonad"; version="0.7.0"; sha256="1vjx8kk57xk7c2a05c6kn75n17842ya7j41hqj3wmgq8yvaxrngx"; depends=[digest glue igraph magrittr pryr]; }; rmpw = derive2 { name="rmpw"; version="0.0.4"; sha256="1a49rvdwvmccv4gfir48fw0b9jyrpc2q9zfyk5j9b7nxsx6x7abl"; depends=[gtools MASS]; }; @@ -12941,14 +12960,14 @@ in with self; { rnaturalearthdata = derive2 { name="rnaturalearthdata"; version="0.1.0"; sha256="1z32j5lz2lb8xgpkr73majw22k0b49iazj6jjc7j4w9k4zxxa102"; depends=[sp]; }; rnbp = derive2 { name="rnbp"; version="0.1.0"; sha256="01hx9r7ai42kcj8l7bmqrma8w3l1f9bmg2ingpqxirimxkfwv2k8"; depends=[curl httr jsonlite]; }; rncl = derive2 { name="rncl"; version="0.8.4"; sha256="0ss9jqrvv7bhvl5j74cjrp8r866d9dlavrbbfscwz3mhkgfx06bb"; depends=[progress Rcpp]; }; - rneos = derive2 { name="rneos"; version="0.3-2"; sha256="0m5mmhwnrk9ifv91s5ngmlvqqd7bw1n7glzkgk5i72cw0siiwmh0"; depends=[RCurl XML]; }; + rneos = derive2 { name="rneos"; version="0.4-0"; sha256="07b3vb0h36ilwb8iylgppl8wpi84f583frmscpj236s1aihqwrmx"; depends=[RCurl XML]; }; rnetcarto = derive2 { name="rnetcarto"; version="0.2.4"; sha256="0fk5rym6zp049bl1f7bkl2231mjh3pgnxn0nhvmzpsah08rh4rr6"; depends=[]; }; rngSetSeed = derive2 { name="rngSetSeed"; version="0.3-2"; sha256="00mqjjkhbnvxqkf1kz16gipsf98q62vmhx9v8140qs7c4ljbhc3a"; depends=[]; }; rngWELL = derive2 { name="rngWELL"; version="0.10-6"; sha256="0pjjcs9pqj7mf0mhb2cwd0aanqpwnm65bm86hk6mi2vw8rgnj2vv"; depends=[]; }; rngtools = derive2 { name="rngtools"; version="1.5"; sha256="0xgmg3qb6insc157as47mcm9sdjdpy9jirh7w06bxb7pfcxqfx42"; depends=[digest]; }; rngwell19937 = derive2 { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; }; rnn = derive2 { name="rnn"; version="0.9.8"; sha256="1f1h7x9vff0jrdkv1gpxlmlr5v1c81gsfxy4z83rq3v0drpxahnv"; depends=[shiny sigmoid]; }; - rnoaa = derive2 { name="rnoaa"; version="0.9.5"; sha256="123gzgycv8lnx9dikkqjn2fhnpzlwgxdmzkvdvf3kgwl1gw9170b"; depends=[crul dplyr geonames ggplot2 gridExtra hoardr isdparser jsonlite lubridate rappdirs scales tibble tidyr tidyselect XML xml2]; }; + rnoaa = derive2 { name="rnoaa"; version="0.9.6"; sha256="073w2jadpih9amamwm3arw1d168p69dfhz98gvvmqay3k7dmwg0z"; depends=[crul dplyr geonames ggplot2 gridExtra hoardr isdparser jsonlite lubridate rappdirs scales tibble tidyr tidyselect XML xml2]; }; rnpn = derive2 { name="rnpn"; version="0.1.0"; sha256="10xx8fxgdknv71ks42xxvf38xsmjy6s87y67wi21673v0n07fxb5"; depends=[data_table httr jsonlite plyr]; }; rnr = derive2 { name="rnr"; version="0.2.1"; sha256="1z9bab3qmq8d79bcvjzldbxlah2w8mqp2ifd0cn1348dafwa0dhi"; depends=[assertthat purrr]; }; rnrfa = derive2 { name="rnrfa"; version="2.0.2"; sha256="0sjg04y1s7wfvimwv19ay5qhldsvncy34j0r79ddys7pmzql1aic"; depends=[curl dplyr ggmap ggplot2 httr jsonlite lubridate rgdal sp tibble zoo]; }; @@ -12964,7 +12983,7 @@ in with self; { robin = derive2 { name="robin"; version="1.0.0"; sha256="0g0dzk20z98ygbxs3f8ylfjryxpdz5112jvdiax4iyj890yjp93c"; depends=[DescTools fdatest ggplot2 gprege igraph networkD3]; }; robis = derive2 { name="robis"; version="2.1.8"; sha256="1qi6ay0v3vc2gz5xalgj8vfx7zaiz5726mkkgwawxfj35gmdq0mk"; depends=[dplyr ggplot2 httr jsonlite leaflet]; }; robmed = derive2 { name="robmed"; version="0.6.0"; sha256="1rlfn85nq6dpwwlp3z567vq23i233iwsjb0jss4ahfbnayydq2ir"; depends=[boot ggplot2 quantreg robustbase shiny]; }; - robmixglm = derive2 { name="robmixglm"; version="1.0-3"; sha256="0y8djq3r6c620azja7s0xjphhfdq2sl6zhj711lmb7lm7mpidqnz"; depends=[actuar bbmle boot fastGHQuad MASS numDeriv Rcpp VGAM]; }; + robmixglm = derive2 { name="robmixglm"; version="1.0-4"; sha256="03h79s63wy5mik3ijqqikxczhklrhd50ih9800hpy5h2yy59rlhn"; depends=[actuar bbmle boot fastGHQuad MASS numDeriv Rcpp VGAM]; }; robotstxt = derive2 { name="robotstxt"; version="0.6.2"; sha256="1c1rhiwkdzvbspwa5km6gp3sjhzmb60ljibb2pf26s931lkr5b6l"; depends=[future future_apply httr magrittr spiderbar stringr]; }; robreg3S = derive2 { name="robreg3S"; version="0.3"; sha256="0rv8qh98wws1f40d1kmysyy9qin0ngsvwq63cnxbwi290wsnrvls"; depends=[GSE MASS robustbase]; }; robregcc = derive2 { name="robregcc"; version="1.0"; sha256="159ms69jqjkf8bhi4hkm929hpwqi8qbcfyaahcjlkyximv7qnqaz"; depends=[magrittr MASS Rcpp RcppArmadillo]; }; @@ -13012,7 +13031,7 @@ in with self; { roots = derive2 { name="roots"; version="1.0"; sha256="1ssmmmrg18xmqxs6f7dqv07357iwcvk21j1gxsl8s9njbj2plxai"; depends=[animation igraph rARPACK]; }; rope = derive2 { name="rope"; version="1.0"; sha256="06qp6h8cjnz0yacm4r39k99hrw74iyq16h5mqfcki7sf3zqbfm7r"; depends=[]; }; ropenaq = derive2 { name="ropenaq"; version="0.2.9"; sha256="0lrm5nncybvcl0k4k8pwrdg3115wsi0zcspqscfyw1rd3w2h2yjg"; depends=[crul dplyr jsonlite lubridate magrittr rlang tidyr]; }; - ropenblas = derive2 { name="ropenblas"; version="0.2.2"; sha256="1sbk41nd2hjv93a7xd1jlpcxs7gdrkp6j27x8312zarwla2ra0qd"; depends=[cli fs getPass git2r glue magrittr RCurl rstudioapi stringr XML]; }; + ropenblas = derive2 { name="ropenblas"; version="0.2.4"; sha256="1in91cgm94mdifxgajf4rh1ilj33pgy6cdp63x2wack9ynkpkj4h"; depends=[cli fs getPass git2r glue magrittr pingr RCurl rstudioapi stringr XML]; }; ropendata = derive2 { name="ropendata"; version="0.1.0"; sha256="1bv6y241abs6pb4wq5ybx9x4zh72kf8ffs3vlcgdsmhw4jwrsxdl"; depends=[httr jsonlite]; }; ropensecretsapi = derive2 { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RCurl RJSONIO]; }; roperators = derive2 { name="roperators"; version="1.1.0"; sha256="0klmk1jmh1iysgf345qa6qyjmn1pkz072ha254k90flprgicg7c6"; depends=[]; }; @@ -13032,7 +13051,6 @@ in with self; { rotations = derive2 { name="rotations"; version="1.6.1"; sha256="175bbwj1bf58gwsw3721dsh8lsika5aqv787kfyjx041m4lar4zv"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo rgl sphereplot]; }; rotl = derive2 { name="rotl"; version="3.0.10"; sha256="0fh7fmaylv9490yhw6sknv03xmx5isp29mlr0xypyh6mwagngd1q"; depends=[ape assertthat httr jsonlite rentrez rncl]; }; rotor = derive2 { name="rotor"; version="0.2.4"; sha256="0m947mihnxjzsb64p5dgi4v1y1g3c172xlhdg08nzb2z21qg4r73"; depends=[dint R6]; }; - roughrf = derive2 { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[mice nnet randomForest]; }; round = derive2 { name="round"; version="0.12-1"; sha256="0smvyszxvq5c5p1mhkpcjphnmijjxn05n70xvg5syij200gn60fm"; depends=[]; }; roundhouse = derive2 { name="roundhouse"; version="0.0.1"; sha256="142dw9ky6fyp5n8zf5lymx083gi56q6wxj4jm0m8cjb0khiqw2lq"; depends=[httr jsonlite]; }; routr = derive2 { name="routr"; version="0.4.0"; sha256="1vswq7vm80nwb50grr4cs290kbq5lx9b19dq0c2wlp9d2dxk50si"; depends=[assertthat digest httpuv R6 reqres stringi uuid]; }; @@ -13057,7 +13075,7 @@ in with self; { rpicosat = derive2 { name="rpicosat"; version="1.0.1"; sha256="1zj2d6jairmvya91vhv9kpkf34zmzl9vlha5yvfjj0j0apmqc0li"; depends=[]; }; rpinterest = derive2 { name="rpinterest"; version="0.3.1"; sha256="0kkf73byhgzqxw85wda3nh7qsq81pc035vi6z3fhnvb9ssszwakc"; depends=[httr magrittr rjson]; }; rpivotTable = derive2 { name="rpivotTable"; version="0.3.0"; sha256="0ndhsw4nnz6wf0v8dh4sz8867m01jjkzw6aq7f490z1ypa3d9fv5"; depends=[htmlwidgets]; }; - rplos = derive2 { name="rplos"; version="0.8.6"; sha256="1i5dzlv57bpddf9qsnq0azc0fsbmzqz9bkrijabp2qwxg0w76mcx"; depends=[crul dplyr ggplot2 jsonlite lubridate plyr reshape2 solrium whisker]; }; + rplos = derive2 { name="rplos"; version="0.9.0"; sha256="104vwyf9lz2d07dlxpg1ivvp8q6bqq4jszrhdsy0y2qbi97424br"; depends=[crul dplyr ggplot2 jsonlite lubridate plyr reshape2 solrium whisker]; }; rplotengine = derive2 { name="rplotengine"; version="1.0-7"; sha256="1bbciq84l0h6g4qajlcqg3v66g2rspflv6k7x5h5qzwlcb4p4dps"; depends=[xtable]; }; rpls = derive2 { name="rpls"; version="0.4.0"; sha256="1dhnm8z6cn316p7mnnpc7l3acs2rq0bwc29amqg0fy4wyy54nrgc"; depends=[pcaPP robustbase]; }; rpmodel = derive2 { name="rpmodel"; version="1.0.4"; sha256="1rbygxk6dbi3pqxri5myc7f3y04haa0slpiaa330malg3dw5a9gc"; depends=[rlang]; }; @@ -13078,7 +13096,7 @@ in with self; { rptR = derive2 { name="rptR"; version="0.9.22"; sha256="0vvjc6qiq71d5wckl77z606q1fp43mgrfzp1bxcab96n5whb2r9k"; depends=[lme4 pbapply]; }; rpubchem = derive2 { name="rpubchem"; version="1.5.10"; sha256="06j9ir65ykky5hdbyv74fnddwqd39jxvr6jig0kjqisc75k4spjz"; depends=[base64enc car data_table fingerprint iterators itertools RCurl RJSONIO stringr XML]; }; rpubs = derive2 { name="rpubs"; version="0.2.2"; sha256="18cnzhcvm7gx4k01ysqay53smrf8xqlbaszq41mny5c7qqh1fvpz"; depends=[rvest xml2]; }; - rqPen = derive2 { name="rqPen"; version="2.2.1"; sha256="0k6vk4gvhqjg8am6i48zbhbb6fzlhwy5xi0dmnszm6dhbfv7jvmx"; depends=[quantreg regpro]; }; + rqPen = derive2 { name="rqPen"; version="2.2.2"; sha256="077kdvfdyp5h8630k8jigbz8mfyby8vkjiqxpqv0wfi6cqcjlaf2"; depends=[quantreg regpro]; }; rqdatatable = derive2 { name="rqdatatable"; version="1.2.7"; sha256="1p41nc54h4fq57ps1ilm3sq3qr3xhi0bxxhl80ylai0qmb445jd4"; depends=[data_table rquery wrapr]; }; rquery = derive2 { name="rquery"; version="1.4.4"; sha256="1ccy9pmgbm4q3kljgx1pjhg2059pnb6jbnxq63z1fhnb59rm4nya"; depends=[wrapr]; }; rr = derive2 { name="rr"; version="1.4"; sha256="1c2h6ibjfwrjfqh1if3c90pdh0g2rf3p71j4p9w23xbbrx2l80pl"; depends=[arm coda magic MASS]; }; @@ -13115,13 +13133,13 @@ in with self; { rsconnect = derive2 { name="rsconnect"; version="0.8.16"; sha256="05ii0p0p7xpf8z0c1594s5q7wpwcs7lmlddrd67s5p2ka5m8qwiz"; depends=[curl digest jsonlite openssl packrat rstudioapi yaml]; }; rscontract = derive2 { name="rscontract"; version="0.1.1"; sha256="1s19p9cga0qm1diblqf3rmcbm3agiimq4lhfgk004cg7rhaa1lyh"; depends=[]; }; rscopus = derive2 { name="rscopus"; version="0.6.6"; sha256="0kl6rv0j2396b8izvy0lp1f588il6w3yhq6d4swv8x8z14rsgcpw"; depends=[dplyr glue httr jsonlite plyr tidyr]; }; - rscorecard = derive2 { name="rscorecard"; version="0.14.0"; sha256="0r951j0n841ihlig2aw76vxdd31zbx98k4sz92nmi8zb69669d5w"; depends=[dplyr httr jsonlite lazyeval magrittr purrr tidyr tidyselect]; }; + rscorecard = derive2 { name="rscorecard"; version="0.15.0"; sha256="1pjzgsd9g0prbzkhm99bbd5kbqbygvxpr3flcdn8dj3fmgh21m1y"; depends=[dplyr httr jsonlite lazyeval magrittr purrr tidyr tidyselect]; }; rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; }; - rsdmx = derive2 { name="rsdmx"; version="0.5-13"; sha256="1lgy5nbrl4frfn805lghyx1gl2h8lkvgk07365jyvb8rzfcl43av"; depends=[plyr RCurl XML]; }; + rsdmx = derive2 { name="rsdmx"; version="0.5-14"; sha256="1b4x87h8kfw8yhmfsjf9l1i0afr7bgvyp5a369m5gn6m07dvlbp9"; depends=[plyr RCurl XML]; }; rseedcalc = derive2 { name="rseedcalc"; version="1.3"; sha256="18zmpjv6g8f7pmvqlp6khxyys9kdnq5x4zxwb6gwybsh4jxrymkp"; depends=[]; }; - rsem = derive2 { name="rsem"; version="0.4.6"; sha256="16nsbp4s20396h2in0zymbpmsn24gqlbik0vgv86zhy1yg1rz9ia"; depends=[lavaan MASS]; }; - rsf = derive2 { name="rsf"; version="0.2.1"; sha256="0bmx9c8cxnn46bwr2za74kn6z2hyjdhj0i3c58c25pqhggyymxkb"; depends=[bookdown knitr magrittr rlang usethis yaml ymlthis]; }; - rsimsum = derive2 { name="rsimsum"; version="0.8.0"; sha256="0nszqffzh9lnds6grjpjyvv78ykvk4aj3s1dwabxi43qqk1p02f1"; depends=[checkmate ggplot2 ggridges rlang scales]; }; + rsem = derive2 { name="rsem"; version="0.5.0"; sha256="1xlk83ivmk8wm6mdmmwvv2z39r6scswgmsmy6dd4qbc3kiqn8cqm"; depends=[lavaan MASS]; }; + rsf = derive2 { name="rsf"; version="0.2.2"; sha256="016q6yly2vl6q9mkff2krri2rmzsm9gc9gippd8l38h5c8ri6cdl"; depends=[bookdown knitr magrittr rlang usethis yaml ymlthis]; }; + rsimsum = derive2 { name="rsimsum"; version="0.9.0"; sha256="02bnb6rr5dzvbywp88sp81lb6ibxlfqiba5vsgp5manx1zmbgjy0"; depends=[checkmate ggplot2 ggridges knitr rlang scales]; }; rsinaica = derive2 { name="rsinaica"; version="0.6.1"; sha256="1ba19b2fgnnl50qp6hgjppgxbadghq68qap9f0m51k2k3ijgfiwn"; depends=[dplyr httr jsonlite lubridate stringr]; }; rskey = derive2 { name="rskey"; version="0.4.1"; sha256="0l9z5zbii4wi7da6cl9mr62zn72pc3dgfhk6dp8sjx4jbzpa94s3"; depends=[berryFunctions miniUI rstudioapi shiny]; }; rsleep = derive2 { name="rsleep"; version="1.0.1"; sha256="0kjb5sgv1y50cqg54dy5cx9ngr64hx2bhfav314vm2alnxsk19jh"; depends=[edfReader ggplot2 jsonlite phonTools signal]; }; @@ -13150,6 +13168,7 @@ in with self; { rstpm2 = derive2 { name="rstpm2"; version="1.5.1"; sha256="0p1zqqjss8i5wca4qvr56d6p9ak20ki4cfbxja1wrhkp4kii29r6"; depends=[bbmle deSolve fastGHQuad mgcv Rcpp RcppArmadillo survival]; }; rstream = derive2 { name="rstream"; version="1.3.6"; sha256="1mr869hff5wdpw6a7x71366y8dxf9vljbb11fssfkhcf7hm2ipnj"; depends=[]; }; rstudioapi = derive2 { name="rstudioapi"; version="0.11"; sha256="0srh0m4mw4k6s7spwb84l4cx4xnn04cp5cjxi0fwza7bwavpzq0k"; depends=[]; }; + rsubgroup = derive2 { name="rsubgroup"; version="1.0"; sha256="1151w8lzsj3w7k56gdry44g9a8a1iqh5m0srd6mydzdxaj90q2pc"; depends=[foreign rJava]; }; rsurface = derive2 { name="rsurface"; version="1.1.0"; sha256="1pymbgvr72nqd66wap5wrcizzx2k9bfr6vkxv6dkvjmi8q7jl2gv"; depends=[plotly rsm]; }; rsurfer = derive2 { name="rsurfer"; version="0.2"; sha256="14zd8fhak12yha6miwb84085722v5ipk8lagijhc6af291kp70i9"; depends=[gdata stringr]; }; rsvd = derive2 { name="rsvd"; version="1.0.3"; sha256="1fvrw46fl5xb2akaa4mp8nja4h7nn4bdhnjdrk22fsdfqc7hwmhk"; depends=[Matrix]; }; @@ -13176,7 +13195,7 @@ in with self; { rtop = derive2 { name="rtop"; version="0.5-14"; sha256="1wwllckginnzisapbklpsizy47db24r83xahq4qsd8zhqvv9yj33"; depends=[gstat sp]; }; rtrek = derive2 { name="rtrek"; version="0.3.0"; sha256="0nfkmcyrb1gbgjjy62ffjlg6x93zy4s4qg6ii98gjbn0jp6pcj1j"; depends=[downloader dplyr ggplot2 jpeg jsonlite magrittr memoise purrr rvest tibble tidyr xml2]; }; rtrends = derive2 { name="rtrends"; version="0.1.0"; sha256="04xdggf36m294drb9z8khdjr6fgsg4bwkb4mmbbvqfzjpq4mq4y1"; depends=[dplyr lubridate tidyr]; }; - rtrim = derive2 { name="rtrim"; version="2.0.6"; sha256="18fvi8zbf9dqwi5x0sgy2aay5565ldvqpispqqb5gx2lwb9qra2r"; depends=[]; }; + rtrim = derive2 { name="rtrim"; version="2.1.1"; sha256="1l2ijkm4p3nd7n4q1b4y9pdyafgyf76zizpi7hhzw1rr9zkxhff2"; depends=[]; }; rts = derive2 { name="rts"; version="1.0-49"; sha256="086zlmcjsv7a38k1jfzq2vhlmx7nivhffcz83i57hl6wbkjl7gv2"; depends=[raster RCurl sp xts zoo]; }; rtsdata = derive2 { name="rtsdata"; version="0.1.2"; sha256="0h0zk8vy21xh0n6pcipgml0b0f4pfi94q6hjdqkxd3xsa6a5scra"; depends=[alfred anytime brotli curl data_table mongolite Quandl quantmod xts zoo]; }; rtson = derive2 { name="rtson"; version="1.3"; sha256="1gwvk7nmq9bz90jy1zh7lhr735iw804pmwxykdpaigcsnxk7zx03"; depends=[R6]; }; @@ -13194,7 +13213,7 @@ in with self; { runes = derive2 { name="runes"; version="0.0.1"; sha256="0aq4wlxwc00a39lgfvr2pyhh7hcrb3n19mm83qvr8kyz30dhghx9"; depends=[]; }; runittotestthat = derive2 { name="runittotestthat"; version="0.0-2"; sha256="15zdcvqkr5ivq6wk6dw8k6diginc6z7mdc18pswim90d99j2g9sm"; depends=[assertive RUnit]; }; runjags = derive2 { name="runjags"; version="2.0.4-6"; sha256="0w97s1j5v05fn4nclqwg56hl9vz6vi2l6sp042r6iyh024fsyg22"; depends=[coda lattice]; }; - runner = derive2 { name="runner"; version="0.3.2"; sha256="0m2xaj2w0186frzg29jwivf7gxfikvy14w53qpcybgnd1ng54l3a"; depends=[Rcpp]; }; + runner = derive2 { name="runner"; version="0.3.5"; sha256="0x73bza6dgi52f33hy94pqbbwwy1pmw8dzifrsfkz3kca2hgprzr"; depends=[Rcpp]; }; runstats = derive2 { name="runstats"; version="1.1.0"; sha256="0n9348af60j8a2mwgbafabspb4nm45ry92zlzmynja06zyx8lb2d"; depends=[fftwtools]; }; rusda = derive2 { name="rusda"; version="1.0.8"; sha256="0xx72jjf1pyixwpnvvgx5n2vc5gl46bam1caav043iqki68wb338"; depends=[foreach httr plyr RCurl stringr taxize testthat XML]; }; rusk = derive2 { name="rusk"; version="0.1.1"; sha256="0a6vbcnfzlfq9fmibiy0cwcfix65qhxq4f7wc7d53riga82s00lk"; depends=[dplyr ggforce ggplot2 reshape2 shiny tidyr]; }; @@ -13212,14 +13231,12 @@ in with self; { rvest = derive2 { name="rvest"; version="0.3.5"; sha256="0r0a5jic09xw5pk0x42pr99r3zab5m9s4x85ymx1sl769jz42zqf"; depends=[httr magrittr selectr xml2]; }; rvg = derive2 { name="rvg"; version="0.2.4"; sha256="12ghjppq5igic2mw8k3p5cnywm26c615ll3j3a9fasyyzkxx6i05"; depends=[gdtools officer Rcpp rlang xml2]; }; rvgtest = derive2 { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; }; - rviewgraph = derive2 { name="rviewgraph"; version="1.2"; sha256="0qw1fdfwg2763a1k1qmryblw5rpagsi5p70rs7fj256zfcjvwrz8"; depends=[rJava]; }; rvinecopulib = derive2 { name="rvinecopulib"; version="0.5.1.1.0"; sha256="1616xqchjyqqf2nmgx5rlpnw8g4696lvlpmrx7jav2cnvkff7s2i"; depends=[assertthat BH kde1d lattice Rcpp RcppEigen RcppThread wdm]; }; rvkstat = derive2 { name="rvkstat"; version="2.6.3"; sha256="0vh5gsvfs01f7mw0cl1wap1w1nsgr4fyv9fdays8b8ad3gc17a2r"; depends=[httr jsonlite RCurl tidyr]; }; rwalkr = derive2 { name="rwalkr"; version="0.5.2"; sha256="1661vg5mdizgynlniq6pibmhn0spnh3d4w6bh08nyjwwchkagrxi"; depends=[dplyr hms httr tidyr]; }; - rwars = derive2 { name="rwars"; version="1.0.0"; sha256="0kmwpr6gn3xsf0pqx153vblpjbhc34mzlgyv8xb2nw78nf8znfij"; depends=[httr]; }; rwavelet = derive2 { name="rwavelet"; version="0.4.0"; sha256="0wb3kd97inyh985q1hspnzwxfawfdps43r3zzdpw0jd8sgd7zqxp"; depends=[signal]; }; rwc = derive2 { name="rwc"; version="1.11"; sha256="1qhgkbkp4nz0wq5c4x8232xiszpiyzcdklfgvpnx4cbp3bbfdi4g"; depends=[MASS Matrix mvtnorm raster]; }; - rwebstat = derive2 { name="rwebstat"; version="1.0.2"; sha256="14mzqs4qjb3qgpci1a1c4sj803mjnzv9j910zmhkg5l8bx9nj5xw"; depends=[dplyr getPass httr readr]; }; + rwebstat = derive2 { name="rwebstat"; version="1.1.0"; sha256="106dkhlr33ii17q45c1hrmbslwsj1qlmx325skch2q71mv7ii0lj"; depends=[dplyr getPass htmltools httr jsonlite readr stringr]; }; rwfec = derive2 { name="rwfec"; version="0.2"; sha256="0wmalfms59zi8jdn2s2qbcdckfkifl9vg19hzx4389mm5gk6qsbh"; depends=[Rcpp]; }; rwhatsapp = derive2 { name="rwhatsapp"; version="0.2.2"; sha256="00cgczgim3ls5jjaklpwfyf24794zhpdjj9pl9fkw20fxhz91bpd"; depends=[stringi tibble]; }; rworldmap = derive2 { name="rworldmap"; version="1.3-6"; sha256="1q1h0n9qr0m5pdx10swrh9ddsvdj8kv5nqngrf3lnx9rg9iwivjk"; depends=[fields maptools sp]; }; @@ -13291,6 +13308,7 @@ in with self; { sand = derive2 { name="sand"; version="1.0.3"; sha256="0h7djria9v75gqcygjcfznpchqgxjqc6b43arvq9ni1xjrq8sszf"; depends=[igraph igraphdata]; }; sandwich = derive2 { name="sandwich"; version="2.5-1"; sha256="1mk685b9wq7k566pbml52rj96i5h6b3vf215k9picgmq296nzvyv"; depends=[zoo]; }; sanitizers = derive2 { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; }; + sanityTracker = derive2 { name="sanityTracker"; version="0.1.0"; sha256="0y041x840sg5c05ksljb1y4xag1cib19q5ygp443k13ryfbcgs9k"; depends=[checkmate data_table]; }; sankey = derive2 { name="sankey"; version="1.0.2"; sha256="0jvcr2bn69aklfbgj4hbsrc047mymrx0jmsg26m0g6w7n1igqvcw"; depends=[simplegraph]; }; sankeywheel = derive2 { name="sankeywheel"; version="0.1.0"; sha256="1sigj4jz13qj4s8vxk0dl2xsddqgyfxabj8yggkasawm7pryvbyy"; depends=[htmlwidgets]; }; santaR = derive2 { name="santaR"; version="1.0"; sha256="10g4z951mpxw9d21s5f6zwfch5xs9vx812fb0wyrbw9s8drmlbkh"; depends=[doParallel foreach ggplot2 gridExtra iterators pcaMethods plyr reshape2 shiny shinythemes]; }; @@ -13304,6 +13322,7 @@ in with self; { sarima = derive2 { name="sarima"; version="0.8.2"; sha256="0fyfba017p35g16b8xp9zvqp9dalhlgr7x5hpk10y29qh7k12z69"; depends=[dplyr FitAR FitARMA FKF Formula KFAS lagged ltsa numDeriv PolynomF Rcpp RcppArmadillo Rdpack]; }; sars = derive2 { name="sars"; version="1.2.1"; sha256="10j2cz66qpdicarxy2mx2hlmkvby3j83qrjm2irmfnwmscafg5f4"; depends=[cli crayon dplyr nortest numDeriv]; }; sas7bdat = derive2 { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; }; + sasLM = derive2 { name="sasLM"; version="0.1.2"; sha256="0d7vklzqsdfg7rg8d3186ka0iqggyhksj0xlzd3rdm8wjd6h5839"; depends=[]; }; sasMap = derive2 { name="sasMap"; version="1.0.0"; sha256="11vhhxhakqm1gsb3p4s4966sapmrqfyw79zfppbx5lnqi3xr0ngn"; depends=[readr stringi stringr]; }; sass = derive2 { name="sass"; version="0.2.0"; sha256="0qzrncsnp0zd8jyp4whss92m7llqsfccmp9p9r3gdc7hlq1amp3z"; depends=[digest fs htmltools rlang]; }; sate = derive2 { name="sate"; version="1.1.0"; sha256="0d1b0gp5abh5g7a25ff40xdnncrl2afjnlcc56dbhqkk43gjah17"; depends=[MASS]; }; @@ -13320,15 +13339,14 @@ in with self; { sbmSDP = derive2 { name="sbmSDP"; version="0.2"; sha256="1sl46lqi6w0s7ghv4bywhic56cm2vib3kawprga760m6igargx4y"; depends=[Rcpp RcppArmadillo]; }; sboost = derive2 { name="sboost"; version="0.1.1"; sha256="126rqvpqwvwjxvsg1v04nkmd6af55j7sgx43jg2vnggyrlli9j9q"; depends=[dplyr Rcpp rlang]; }; sbpiper = derive2 { name="sbpiper"; version="1.9.0"; sha256="0pjq88ixk494wlz4nh5anbsn59mmh9wg564qh3vzwwqgxf1k61cg"; depends=[colorRamps data_table factoextra FactoMineR ggplot2 Hmisc reshape2 scales stringr]; }; - sbrl = derive2 { name="sbrl"; version="1.2"; sha256="1d0f2mlzzcghhvqagrr954qa69b5v47milw3iazxihh8q1qlird2"; depends=[arules Rcpp]; }; - sbtools = derive2 { name="sbtools"; version="1.1.10"; sha256="0pn4rp8cfvdjbfn4xgzhm5x5r73v11djksh6jdw7mv7nrci9rqpb"; depends=[curl httr jsonlite stringr]; }; + sbtools = derive2 { name="sbtools"; version="1.1.11"; sha256="06b27cxrfqps0lfgjcwxcal36dkf05y2lcmwrzjrm333zgnvcy6g"; depends=[curl httr jsonlite stringr]; }; sbw = derive2 { name="sbw"; version="1.0"; sha256="07lr2sh681q0wvyaf7ixif5riw9kfxv4hraxj8hzqaxcsip743vq"; depends=[MASS Matrix quadprog slam spatstat]; }; scBio = derive2 { name="scBio"; version="0.1.5"; sha256="12wch9dp7n9vigv7rp7i5b5sckn9vvckpclylinnbi1mhawxprv9"; depends=[doSNOW fields foreach LiblineaR limma raster sp]; }; scMappR = derive2 { name="scMappR"; version="0.1.1"; sha256="1mfbjv7gpj63q5gwqcajjrnbhr918nvl41hk8ggk1l30wqg4k4r1"; depends=[downloader ggplot2 gProfileR gprofiler2 GSVA limSolve pcaMethods pheatmap Seurat]; }; scModels = derive2 { name="scModels"; version="1.0.1"; sha256="0n2sc2l3wy08i0xq7jwigkr42wz9gyhlirmjmma9plnmkbrx0rp4"; depends=[Rcpp]; }; scPDSI = derive2 { name="scPDSI"; version="0.1.3"; sha256="00z5qk14c1ndrd63rhvknkp3dn3ad8z8mf00p9sb8wbsi908md44"; depends=[Rcpp]; }; scRNAtools = derive2 { name="scRNAtools"; version="1.0"; sha256="0x0lniqhq6q87y08kkkyvmk1g5b8i73hm3h86ba8rcv0v0n7ap9a"; depends=[ALL ConsensusClusterPlus corrplot edgeR foreach ggplot2 ggthemes Hmisc igraph lattice limma PerformanceAnalytics plyr reshape2 Rmisc Rtsne scatterplot3d survival TPEA]; }; - scTenifoldNet = derive2 { name="scTenifoldNet"; version="1.2.0"; sha256="1n86fcvx0a34xd2h9d9kmyn991lqh6573rrkicql946pm697g4vz"; depends=[MASS Matrix pbapply reticulate RSpectra]; }; + scTenifoldNet = derive2 { name="scTenifoldNet"; version="1.2.1"; sha256="091fczz5vjj8cq53dik229vrscsj68p6vpaqr8gdknjgc9nsc1ka"; depends=[MASS Matrix pbapply RSpectra]; }; scaRabee = derive2 { name="scaRabee"; version="1.1-3"; sha256="1yap3hi36f8hk93jn59nxrbgq8iw0xwkkm3pc2gb50cpcpaq41pd"; depends=[deSolve lattice neldermead]; }; scaffolder = derive2 { name="scaffolder"; version="0.0.1"; sha256="1va1mlhqv5qn0hm81ypdir9llr68222qxjp3jink69zpaskfbdib"; depends=[reticulate]; }; scagnostics = derive2 { name="scagnostics"; version="0.2-4.1"; sha256="1azg1xlid63l9mcyns9yyl3a3hykbl0sl0h5jhyvzjzahfyanq53"; depends=[rJava]; }; @@ -13350,7 +13368,7 @@ in with self; { scclust = derive2 { name="scclust"; version="0.2.2"; sha256="0w0qwz8wfdprs2bgv1cjvd2yb6g12jylad21a9rr3w5bkgxprcrp"; depends=[distances]; }; sccr = derive2 { name="sccr"; version="2.0"; sha256="1r5hmkij73l0z19smq080gr66nnlqk4v5sq0wcmidbxxsjpzwb45"; depends=[dplyr]; }; scdensity = derive2 { name="scdensity"; version="1.0.2"; sha256="173xm3bf8vxl30zk4n451al7m003byg9q4d1l1pfyfa4xnv8qdg9"; depends=[lpSolve quadprog]; }; - scdhlm = derive2 { name="scdhlm"; version="0.3.1"; sha256="1b5x4kqvmkpb8wbgfhnwqakisw6hfnvama2bsnd8kvw4alfanxhm"; depends=[nlme]; }; + scdhlm = derive2 { name="scdhlm"; version="0.3.2"; sha256="1im2z8bfslvrk3y8hqk4snf42fb2iw6yh6nrhijih8qx3jmpwlmb"; depends=[nlme]; }; scenario = derive2 { name="scenario"; version="1.0"; sha256="0v1b00kiny21yx4qkk2x51cy1zqibdnd68z76qia7h5py28yhxsi"; depends=[]; }; scgwr = derive2 { name="scgwr"; version="0.1.0"; sha256="1pyq6qnfhnzbkla1yp49sfkx5y4g26ccgi803axivyjyp5zvwc1b"; depends=[dplyr FNN spData]; }; schoRsch = derive2 { name="schoRsch"; version="1.7"; sha256="19h721v4a7rb1dlkbpb9s24x87fvz3q449ndi0rn0yc0m6mhmcvi"; depends=[]; }; @@ -13371,7 +13389,7 @@ in with self; { scoper = derive2 { name="scoper"; version="0.2.0"; sha256="1b4kyrml5yk46fw9hrp21i6w6ylck5qs64y0mzkbqr2wf1x4ncvs"; depends=[alakazam data_table doParallel dplyr foreach ggplot2 Rcpp rlang seqinr shazam stringi stringr]; }; scopr = derive2 { name="scopr"; version="0.3.3"; sha256="1j45l5zcrpc4dnb6ik1v0jlqizpkijl0p656s869jhhvv55r6v2i"; depends=[behavr data_table memoise readr RSQLite stringr]; }; score = derive2 { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; }; - scorecard = derive2 { name="scorecard"; version="0.2.9"; sha256="0zafis8f4v9mw9l52v0d286fms5q3rgl7dvlz60f3sz41sl1y1gz"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx stringi]; }; + scorecard = derive2 { name="scorecard"; version="0.3.0"; sha256="08zf99xxvl27lin5xqf781l3lr4cjlr8gyw5vw4ps1fnsn844c63"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx stringi]; }; scorecardModelUtils = derive2 { name="scorecardModelUtils"; version="0.0.1.0"; sha256="09znaxrv14m58hsk5pac458xbpcsidc6ygcsw4q9j0p4yd80qbvl"; depends=[car e1071 gbm ggplot2 partykit randomForest reshape2 sqldf stringr]; }; scorepeak = derive2 { name="scorepeak"; version="0.1.2"; sha256="1g9n7kjqb9qk5b7hw8ysrc069w9dzc4z29ay6z1kbm0v4kkzp7bi"; depends=[checkmate Rcpp]; }; scorer = derive2 { name="scorer"; version="0.2.0"; sha256="1mc4hxcrqzh4dmz5fy40740bnrp4fxia81fj3cdw9382p67ivhim"; depends=[Rcpp]; }; @@ -13388,7 +13406,7 @@ in with self; { scriptuRs = derive2 { name="scriptuRs"; version="0.1.0"; sha256="1wbvfqcc0raazhdc6pyp93q859ilxfz9rz338p3sb7fjyxvparbl"; depends=[]; }; scrm = derive2 { name="scrm"; version="1.7.3-1"; sha256="090gsa23l9s4x92q4n7ggp491fc8ghgnjw5p7j67gd1i1iwr55n8"; depends=[Rcpp]; }; scrobbler = derive2 { name="scrobbler"; version="0.2.15"; sha256="079ms94q2h8ciqi9b4w9i1md57x844jz464hk7rr564n9wcfp4gj"; depends=[httr jsonlite]; }; - scrubr = derive2 { name="scrubr"; version="0.3.0"; sha256="0kc8m7b18l4nd84kqf0ibv2mchpm9w1bjwwpyjzg0zkkl7k3grs9"; depends=[crul curl data_table fastmatch hoardr jsonlite lazyeval magrittr Matrix qlcMatrix tibble]; }; + scrubr = derive2 { name="scrubr"; version="0.3.2"; sha256="1grh6gljxad2iig6vldv2j0wk83cj6v1pdqsldb6gp4kqyzbikq9"; depends=[crul curl data_table fastmatch hoardr jsonlite lazyeval magrittr Matrix qlcMatrix tibble]; }; scrypt = derive2 { name="scrypt"; version="0.1.3"; sha256="14iblgbp9v2by8fjbrpsd59iknp5babcz7j3yv1yxxzcwyb6wrrm"; depends=[Rcpp]; }; scs = derive2 { name="scs"; version="1.3-2"; sha256="10z5619gbnnygk8pkdx2qji56jlv1q6c1z4581pdkd9sfnhg1yp3"; depends=[]; }; sctransform = derive2 { name="sctransform"; version="0.2.1"; sha256="07v3lzccsrkh1glfxd1q20r8f8gl9ls5az0s1dvxm4vcls0hlhyn"; depends=[future_apply ggplot2 gridExtra MASS Matrix Rcpp RcppEigen reshape2]; }; @@ -13426,12 +13444,13 @@ in with self; { seasonalview = derive2 { name="seasonalview"; version="0.3"; sha256="1l705yc7ssldsfckbgnvd95sh3zzhpkmf1rr6ar2s60s3wsyly4n"; depends=[dygraphs htmlwidgets openxlsx seasonal shiny shinydashboard xtable xts zoo]; }; seastests = derive2 { name="seastests"; version="0.14.2"; sha256="04kx4sijnpsarq4iaclxvckgr5y0gmz5a0fmkkqjmfi3hm1kvw3d"; depends=[forecast xts zoo]; }; seawaveQ = derive2 { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[lubridate NADA survival]; }; - secr = derive2 { name="secr"; version="4.2.0"; sha256="008yiv1dq5i1wnjpfb288v60yn58bn54n06rksvmbhppvpg9p4pd"; depends=[abind MASS mgcv nlme raster Rcpp RcppEigen RcppNumerical RcppParallel sp stringr]; }; - secrdesign = derive2 { name="secrdesign"; version="2.5.10"; sha256="14pi5k3iz8xzm832ms82hgzdg8sh9nfsns3dw7mm81n7p03014dd"; depends=[abind openCR secr]; }; + secr = derive2 { name="secr"; version="4.2.2"; sha256="09wf6dzssmcaa51s3c61k2n3z1xs5q981apzv03kbq6v0gbmisil"; depends=[abind MASS mgcv nlme raster Rcpp RcppEigen RcppNumerical RcppParallel sp stringr]; }; + secrdesign = derive2 { name="secrdesign"; version="2.5.11"; sha256="02fysbx6w1iw2ig54f9sgr74c40wfjwiwpdmxdjymsaynqnm9anl"; depends=[abind openCR secr]; }; secret = derive2 { name="secret"; version="1.0.0"; sha256="09b28f7ndc167bbanbdydralykq718fixnrgs5xr9d3fbdhz1vdl"; depends=[assertthat curl jsonlite openssl rprojroot]; }; secrettext = derive2 { name="secrettext"; version="0.1.0"; sha256="129v524yyb464mcij7hvzv05cxliaz5nm7v30g9g9ppskcdqhsx2"; depends=[dplyr magrittr rlang stringr testthat tidyr]; }; secrlinear = derive2 { name="secrlinear"; version="1.1.1"; sha256="0jcvraypkss1gphh4cjb0b4v9460fj4dw80yd057ah11p9942ggs"; depends=[igraph maptools MASS rgdal secr sp]; }; secsse = derive2 { name="secsse"; version="2.0.0"; sha256="0qsbn56vc6y19hmc94bimv1mf86ayxa8rj38qvvsxjfm9czmw2ac"; depends=[ape apTreeshape DDD deSolve doParallel foreach geiger phylobase]; }; + secuTrialR = derive2 { name="secuTrialR"; version="1.0.3"; sha256="06lmm3hpspi3vd5wvzpj9skay823z4km5jbxg11sv4xqh16sh4qh"; depends=[dplyr haven igraph lubridate magrittr purrr readr readxl rlang stringr tibble tidyr]; }; secure = derive2 { name="secure"; version="0.5"; sha256="16pv5m7rrcs8hcjj3kylq7smyzf2qk8rkg9m1b421w0ac7lg04x1"; depends=[MASS Rcpp RcppArmadillo]; }; securitytxt = derive2 { name="securitytxt"; version="0.1.1"; sha256="0yrydcc68qcsq5wrdfgwfi347pdd0zc8hp2ikmw3iz31anm3b4yw"; depends=[Rcpp]; }; see = derive2 { name="see"; version="0.4.1"; sha256="0w32jqs9b7bqm27ld21pmlwxsbhwpwwa5bv6w15p1lx56gzi5smi"; depends=[bayestestR dplyr effectsize ggplot2 ggridges insight magrittr parameters rlang]; }; @@ -13468,9 +13487,9 @@ in with self; { semPLS = derive2 { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; }; semPlot = derive2 { name="semPlot"; version="1.1.2"; sha256="0l1v9yi1pv59iwfknw4dh9qskk5y8r347jq1vq13gnfd3bmd71xr"; depends=[colorspace corpcor igraph lavaan lisrelToR OpenMx plyr qgraph regsem rockchalk sem XML]; }; semPower = derive2 { name="semPower"; version="1.0.0"; sha256="0wciz5qrd40q4mxq96pibnya11ac42n37c9xhjd4zfhznhjz06bb"; depends=[]; }; - semTable = derive2 { name="semTable"; version="1.6"; sha256="125dhdyy4idyxnn8j2ijbj9ikvz78hymr3m3x122ydsln89phsy1"; depends=[kutils lavaan plyr stationery xtable]; }; + semTable = derive2 { name="semTable"; version="1.7"; sha256="1zrp4iqdv9hlqicy5mqlvjrd6w9q8542hvdxs95l951xm2n4jp3z"; depends=[kutils lavaan plyr stationery xtable]; }; semTools = derive2 { name="semTools"; version="0.5-2"; sha256="1zj841pszfsikzp82cmh463qyc4xhdrqjqcnhc2r8mcflv12irv6"; depends=[lavaan]; }; - semantic_dashboard = derive2 { name="semantic.dashboard"; version="0.1.1"; sha256="0fd5qnw5jcmf5akkv59z1zjizsczwlmnpkfd8bfminhpa89sgp1y"; depends=[shiny shiny_semantic]; }; + semantic_dashboard = derive2 { name="semantic.dashboard"; version="0.1.5"; sha256="0bazaznmxmks11zgb9npvkblhy0ym554fnvgqsa02rlxxzzzljib"; depends=[glue htmltools shiny shiny_semantic]; }; semdiag = derive2 { name="semdiag"; version="0.1.2"; sha256="0kjcflw7dn907zx6790w7hnf5db6bf549whfsc0c2r173kf13irp"; depends=[sem]; }; semdrw = derive2 { name="semdrw"; version="0.1.0"; sha256="16hm1ifgspnxnlf3rfg5ylmql2fq91ig8nc5953ggyhfrjwbqx15"; depends=[dplyr lavaan psych semPlot semTools shiny shinyAce]; }; semds = derive2 { name="semds"; version="0.9-6"; sha256="10kvcmcy6qa2r5sram6azqgzl528rghfxgw2f2bq2fvhhq127dzq"; depends=[minpack_lm pracma]; }; @@ -13481,14 +13500,14 @@ in with self; { semtree = derive2 { name="semtree"; version="0.9.14"; sha256="1gyjrvqvqmm0dcbddjq90v3gsniiz9rl66nxiayvfbkhs4pih39z"; depends=[bitops cluster digest expm ggplot2 MASS matrixcalc matrixStats mvtnorm OpenMx plotrix rpart rpart_plot sets stringr tidyr]; }; semver = derive2 { name="semver"; version="0.2.0"; sha256="10wpkyms2cix3bsin2q0qhkbl445pwwpa5gm2s4jjw1989namkxy"; depends=[assertthat Rcpp]; }; semverutils = derive2 { name="semverutils"; version="0.1.0"; sha256="0y3zh8n8bgs3ag8yy9cnp0i0xrn0iqflcbrya70glyb40148w9sw"; depends=[foreach R6]; }; - sen2r = derive2 { name="sen2r"; version="1.3.3"; sha256="1wm6n1mqbrp7h25j0vjjdr2k8qc44hnkrwnnp7zlqmwwdn5iwnkd"; depends=[data_table doParallel foreach geojsonio httr jsonlite leaflet leaflet_extras mapedit raster RcppTOML sf shiny shinydashboard shinyFiles shinyjs shinyWidgets stars XML]; }; + sen2r = derive2 { name="sen2r"; version="1.3.4"; sha256="0cbrw7cjj555gclvhrf3ghz7i5qy6prba205pw6k8zf8fd8r8f0v"; depends=[data_table doParallel foreach geojsonio httr jsonlite leaflet leaflet_extras mapedit raster RcppTOML rgdal sf shiny shinydashboard shinyFiles shinyjs shinyWidgets stars XML]; }; sendmailR = derive2 { name="sendmailR"; version="1.2-1"; sha256="0z7ipywnzgkhfvl4zb2fjwl1xq7b5wib296vn9c9qgbndj6b1zh4"; depends=[base64enc]; }; sendplot = derive2 { name="sendplot"; version="4.0.0"; sha256="0ia2xck94nwirwxi38nv0viz5wb8291yiak6f0wgwh84irsrfp1h"; depends=[rtiff]; }; sensR = derive2 { name="sensR"; version="1.5-2"; sha256="073za0z6dawba2nd45hs20m0143kckxn3iglkyqz9vdfqwyv7wlq"; depends=[MASS multcomp numDeriv]; }; sensemakr = derive2 { name="sensemakr"; version="0.1.2"; sha256="0p5rh511fymbh8vkfwdv62xxwflkmrqwas1b16m0hlzjwyzdn03m"; depends=[]; }; sensiPhy = derive2 { name="sensiPhy"; version="0.8.5"; sha256="1kjkdklva5wzmw071gbn1v9g5cf0wzmvwgy5y0dgi530v6byaw8j"; depends=[ape caper geiger ggplot2 phylolm phytools]; }; sensibo_sky = derive2 { name="sensibo.sky"; version="1.0.0"; sha256="0s8gbj7qrcbcnflp7v0s93ykh2xgk7jwpyvzndj1f90hjy20x3bc"; depends=[glue httr jsonlite]; }; - sensitivity = derive2 { name="sensitivity"; version="1.18.0"; sha256="100hrr5yd5fg13gbg7mv5amny3igw8zra8pcl97vwfdxykqqjk5c"; depends=[boot ggplot2]; }; + sensitivity = derive2 { name="sensitivity"; version="1.18.1"; sha256="1dad2c2ckvb86izb1xsa12298sx9ywnpvb3h25x67y4jygcnhzjg"; depends=[boot ggplot2]; }; sensitivity2x2xk = derive2 { name="sensitivity2x2xk"; version="1.01"; sha256="1r829k939zzmi0j4chdaniajchcflmmjrl3a9hwnkg0wkfnjbvdl"; depends=[BiasedUrn mvtnorm]; }; sensitivityCalibration = derive2 { name="sensitivityCalibration"; version="0.0.1"; sha256="1fn07dra7dhpsg6f1yn1ayfpmvwaxma8cps94070nrpfwmdvi04g"; depends=[ggplot2 ggrepel plotly relaimpo splitstackshape stringi]; }; sensitivityPStrat = derive2 { name="sensitivityPStrat"; version="1.0-6"; sha256="0rfzvkpz7dll3173gll6np65dyb40zms63fkvaiwn0lk4aryinlh"; depends=[survival]; }; @@ -13520,7 +13539,6 @@ in with self; { sequence = derive2 { name="sequence"; version="2.0"; sha256="0r5h96gcp18lwgrl2pjlr71xqspkf6qmm1m0xjq5vadalfa7y294"; depends=[]; }; sequences = derive2 { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp]; }; sequenza = derive2 { name="sequenza"; version="3.0.0"; sha256="13l16lacdcf7fn96yj3xqxap0l19ma9ppkxxx5qk9f5abbvdk303"; depends=[copynumber iotools pbapply readr seqminer squash]; }; - sequoia = derive2 { name="sequoia"; version="1.3.3"; sha256="0k0vl7rz9jylry80w8lbqyg3ws3bhkg8axpzy0rrd8xw1lxbpf93"; depends=[plyr]; }; sergeant = derive2 { name="sergeant"; version="0.5.2"; sha256="02chkyvmwd4nimw62v82rfbid1xqw5b1335na44pdi675g904250"; depends=[DBI dbplyr dplyr htmltools httr jsonlite purrr readr scales]; }; serial = derive2 { name="serial"; version="2.1.4"; sha256="1wvs3aa9h1dff2jrxszqwrfv2b281zap1dj2mhlx2w4k8hnggas0"; depends=[]; }; seriation = derive2 { name="seriation"; version="1.2-8"; sha256="1zbdxq0s5rc5v307b69fw9k52m0654ls7pf22lh35ggirig6lwsk"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; }; @@ -13540,7 +13558,7 @@ in with self; { setter = derive2 { name="setter"; version="0.0-1"; sha256="10fwrx8yysp99rrkbnn3rbz79vyzr2h3p7zxxlqapw1k2lllp0r5"; depends=[assertive_base]; }; settings = derive2 { name="settings"; version="0.2.4"; sha256="092sv6nccm6p2d695l9w0zfi2xgymk12c8p8lhl9nb86mxrb3nry"; depends=[]; }; severity = derive2 { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; }; - sf = derive2 { name="sf"; version="0.9-1"; sha256="1qghrskqwwlwxmmvkv7knhlr1a32ngyimycasy5gfazgviljsfn4"; depends=[classInt DBI magrittr Rcpp units]; }; + sf = derive2 { name="sf"; version="0.9-2"; sha256="01xplgy5nlwy3ajfch4h1ssa1xhm7q0jzscpz04dmvgqfzwhhdfh"; depends=[classInt DBI magrittr Rcpp units]; }; sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; }; sfadv = derive2 { name="sfadv"; version="1.0.1"; sha256="1rfpm6km5pckwhqgpvidm6qsj5sjdaqqj5b0sgvpslivfa4c80cr"; depends=[gmm minpack_lm]; }; sfc = derive2 { name="sfc"; version="0.1.0"; sha256="0cm4mfcfd9bhf2j5fppsihzrfipnldb6q3xradd88z9pwgrkfx2a"; depends=[dplyr sna tidyr triangle zoo]; }; @@ -13550,7 +13568,6 @@ in with self; { sfsmisc = derive2 { name="sfsmisc"; version="1.1-6"; sha256="04fvjdab6vyyghyqy0abxvfbyr1myz6yib7ibwiyjw9yf7fjrcjp"; depends=[]; }; sft = derive2 { name="sft"; version="2.2-1"; sha256="0fxz64ba58n6ghfqsgq64n1c7qkvi8c3lsa86732mil9w71yxw33"; depends=[fda SuppDists]; }; sgPLS = derive2 { name="sgPLS"; version="1.7"; sha256="1jk2j1zn5vq82rcjflnk7g6y2q0v5jl14k804dmigqg013gbykql"; depends=[mixOmics mvtnorm]; }; - sgRSEA = derive2 { name="sgRSEA"; version="0.1"; sha256="0vyypnq81l36x0j44q2l9wbf3x4krz4fzypi7vyqhaq97mkzaw5j"; depends=[]; }; sgd = derive2 { name="sgd"; version="1.1.1"; sha256="055khw3jr7kr8la3jpzq1q25gk0qcclkv7g0q1sylhyqq2qdriwb"; depends=[BH bigmemory ggplot2 MASS Rcpp RcppArmadillo]; }; sgee = derive2 { name="sgee"; version="0.6-0"; sha256="055iydainzywb1s5id5rl9i94dj5arr9b6qz15p8wps49vm2mlp3"; depends=[copula mvtnorm]; }; sgeostat = derive2 { name="sgeostat"; version="1.0-27"; sha256="1iq9p2jk8bpv1h853a1l91d5c5dxnhkk3cmkd01siqqvj04hv4vb"; depends=[]; }; @@ -13593,7 +13610,7 @@ in with self; { shinyEffects = derive2 { name="shinyEffects"; version="0.1.0"; sha256="03fm2i1ydlp90w299nvz7dqs9724g0m2f0bc44ni8m2gz9cfpccs"; depends=[htmltools shiny shinydashboard]; }; shinyEventLogger = derive2 { name="shinyEventLogger"; version="0.1.1"; sha256="1piycfg9j0dg3fgq9f88gs7zvhldmrzn7ggy2ijbh6r7iwipwgdm"; depends=[bupaR jsonlite mongolite purrr R_utils shiny stringr]; }; shinyFeedback = derive2 { name="shinyFeedback"; version="0.1.0"; sha256="01qp75c5dsvc4xs1id1yhn81gmjl0hnjz8msf8mkvf4ifqal563f"; depends=[digest shiny]; }; - shinyFiles = derive2 { name="shinyFiles"; version="0.7.5"; sha256="1143m941hma9hc77c3xcw26c0ygfhn9ii2sbp9wrydxv4gc7mr8a"; depends=[fs htmltools jsonlite shiny tibble]; }; + shinyFiles = derive2 { name="shinyFiles"; version="0.8.0"; sha256="0gwyx37f2r86cldsyknws9pafpj8g5mg3mchlyl9ymgnk5f4b88w"; depends=[fs htmltools jsonlite shiny tibble]; }; shinyHeatmaply = derive2 { name="shinyHeatmaply"; version="0.2.0"; sha256="1n7c7dvvb9kqay2phcf0bkwi990x1cjl7js6pq05xx7rli5bc5h4"; depends=[dplyr heatmaply htmltools plotly readxl rmarkdown shiny xtable]; }; shinyKGode = derive2 { name="shinyKGode"; version="1.0.5"; sha256="004zwz4kqfijzvvwkq8v1gi25w1wrdlg8230g93w36gbi6cl2vk1"; depends=[ggplot2 gridExtra KGode mvtnorm pracma pspline reshape2 shiny shinyjs XML]; }; shinyKnobs = derive2 { name="shinyKnobs"; version="0.1.3"; sha256="1rxlvq4vr87krf7d6mpx0y53hyz8q1jnx6nv7mlhc1ck13q6fgac"; depends=[htmltools shiny]; }; @@ -13640,6 +13657,7 @@ in with self; { shock = derive2 { name="shock"; version="1.0"; sha256="11m52al591xjznl62q1waxsg5m1a1afmd0yqcc5zsjlrplykg4lp"; depends=[capushe GGMselect glasso igraph mvtnorm]; }; shopifyr = derive2 { name="shopifyr"; version="1.0.0"; sha256="05hih1v5vvr7vmwarizsdx8517g74s96fdsz3klcz3g12idx1nqn"; depends=[curl jsonlite R6]; }; shortcuts = derive2 { name="shortcuts"; version="1.4.0"; sha256="0y77napfz1v3s667cmyn8357xg5lncbw1hc3hm5kra6nalhq1jps"; depends=[rstudioapi]; }; + shorts = derive2 { name="shorts"; version="0.0.1"; sha256="17dsdf5byby0whpfv14dq22q51q1icfcdc4ww6hfjvbkfw23vy71"; depends=[LambertW nlme]; }; shotGroups = derive2 { name="shotGroups"; version="0.7.5.1"; sha256="0il6hlv2hnfx5rmj3vk3q9p24xqii77z6hdz5fsgyh4i3kgcyrjy"; depends=[boot coin CompQuadForm KernSmooth robustbase]; }; showimage = derive2 { name="showimage"; version="1.0.0"; sha256="1c0x3iqjdjsz3cdhc02b3qm2pwxjr1q2k87jwvxj9lnzzw81f1pl"; depends=[png]; }; showtext = derive2 { name="showtext"; version="0.7-1"; sha256="0a5gg72bfrc7wm0phj1aflj1wc08kfi81ac32na6ya9s2ivyimw5"; depends=[showtextdb sysfonts]; }; @@ -13673,7 +13691,8 @@ in with self; { signs = derive2 { name="signs"; version="0.1.2"; sha256="0dzf5pydvs93rvj6idw9l2asv1bxwz20df7qis2db84hfww2kc6m"; depends=[rlang scales]; }; sigora = derive2 { name="sigora"; version="3.0.5"; sha256="1240q42kpb4l1idanywzal7c85kp3ncdl5m2irh8qs5xrs02gdc7"; depends=[]; }; sigr = derive2 { name="sigr"; version="1.0.6"; sha256="01crx8r9bcq1kwlq66vypnv1r48fp3hbl06ykd8g2k5zm06w0yyi"; depends=[wrapr]; }; - silicate = derive2 { name="silicate"; version="0.3.0"; sha256="08d731pprz3y6r0pdww2vn02q506kjzkgg5y2kbjb11d276ffwzf"; depends=[crsmeta decido dplyr gibble gridBase magrittr purrr rlang tibble tidyr unjoin]; }; + siland = derive2 { name="siland"; version="2.0"; sha256="0g06adzydvrw7vq2a78m4lw1vc2k28mp2pj5q20629yknpv54ffr"; depends=[fasterize ggforce ggplot2 lme4 raster reshape2 sf sp]; }; + silicate = derive2 { name="silicate"; version="0.4.0"; sha256="1bvwdrmnrcnyq21sz50g9aksqhd5xkcqhd305mr606mgm183x5rn"; depends=[crsmeta decido dplyr gibble gridBase magrittr purrr rlang tibble unjoin]; }; sim1000G = derive2 { name="sim1000G"; version="1.40"; sha256="1avq6xfc34izavvp9vb5ccc2b9nc4m7cwr06ygnsmpgwi5nswbb8"; depends=[hapsim MASS readr stringr]; }; sim2Dpredictr = derive2 { name="sim2Dpredictr"; version="0.1.0"; sha256="0q1l75h1dcxnd60lcmf4sny1ywidfmm0yv9ylkb3yc13v469167i"; depends=[car dplyr ggplot2 magrittr MASS matrixcalc Rdpack spam tibble tidyverse]; }; simEd = derive2 { name="simEd"; version="1.0.3"; sha256="1yq0qblrz0zddx682rzwdaa0k0r223i123la7wbp73spnn38g4br"; depends=[rstream]; }; @@ -13701,7 +13720,7 @@ in with self; { simfinR = derive2 { name="simfinR"; version="0.2.1"; sha256="1png4cz92vnql2j2b5dlji8b6662ildj05lj1y1bw8xawv9i1i9b"; depends=[crayon dplyr jsonlite lubridate magrittr memoise purrr]; }; simglm = derive2 { name="simglm"; version="0.7.4"; sha256="0lgzbcfqqw94jib6vxl2cv8xcnjjikvdy8qlhq874g0h8spg0l5i"; depends=[broom dplyr future_apply Matrix purrr rlang]; }; simhelpers = derive2 { name="simhelpers"; version="0.1.0"; sha256="0imrp8zqdpyl466fywkjr4g3h9jzxfk96xrw8prlsvw1xlg6qrmm"; depends=[dplyr furrr future magrittr purrr Rdpack rlang rstudioapi tibble tidyr]; }; - simmer = derive2 { name="simmer"; version="4.4.0"; sha256="0kq13ly33hgnwcd53mm372cqcd8glpgdb1jn4q22gd6pbk6j7cjg"; depends=[BH codetools magrittr Rcpp]; }; + simmer = derive2 { name="simmer"; version="4.4.1"; sha256="1w7mzs7z0pczfdwn4xn3rq5jvymbhhz6sv1rdhcq71m3qymicdi2"; depends=[BH codetools magrittr Rcpp]; }; simmer_bricks = derive2 { name="simmer.bricks"; version="0.2.1"; sha256="1s73mfmpjz91n932kjk50aai5j3p1sjibq73yxrjdhlyhiy4d8lp"; depends=[simmer]; }; simmer_plot = derive2 { name="simmer.plot"; version="0.1.15"; sha256="0g13d6qw6cl7bzmpkckiswvg9n4mrrdbs195r3pyljaw5c5bmvhp"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; }; simml = derive2 { name="simml"; version="0.1.0"; sha256="0j3vv3kp8rl4an6r0vzzn6syzi9h058v9040pshz0hldkhi21pby"; depends=[mgcv plyr]; }; @@ -13715,7 +13734,7 @@ in with self; { simpleboot = derive2 { name="simpleboot"; version="1.1-7"; sha256="0769dmrk8rw5v9598p7xlpawybwsdxnrqkxhavqpzy1vwg885575"; depends=[boot]; }; simplecolors = derive2 { name="simplecolors"; version="0.1.0"; sha256="08xsha7v9k55fqi9f49j2sh2yz8dm5g99rqcjfd1yrlw2mkcrq6a"; depends=[colorspace dplyr forcats ggplot2 magrittr stringr]; }; simplegraph = derive2 { name="simplegraph"; version="1.0.0"; sha256="1gcpbljp1fgaprxnmq23izf1h2x3p5dnxlylwqsnlcj50bvm46gq"; depends=[]; }; - simplevis = derive2 { name="simplevis"; version="1.0.0"; sha256="1vkf2cmfhsci5z0njyy1xrilycjjr2j9k1vqmw5am5dvqaj7nwda"; depends=[dplyr DT forcats ggplot2 janitor leaflet leaflet_extras leafpop lubridate magrittr plotly readr rgdal rlang rmarkdown scales sf shiny shinycssloaders stars stringr tibble tidyr viridis]; }; + simplevis = derive2 { name="simplevis"; version="1.1.0"; sha256="1kwsxa2w74z92z4a7a82nkc62jna9y9z718kasvp91h5f40mz0zr"; depends=[dplyr DT forcats ggplot2 janitor leaflet leaflet_extras leafpop lubridate magrittr plotly readr rgdal rlang rmarkdown scales sf shiny shinycssloaders stars stringr tibble tidyr viridis]; }; simplexdesign = derive2 { name="simplexdesign"; version="0.1.0"; sha256="139c1c2vpn2rf0q7ldciii3x18f5r62x0l7i6hdk25qwr9sp08k8"; depends=[DiceDesign GGally ggplot2 progress Rfast]; }; simplexreg = derive2 { name="simplexreg"; version="1.3"; sha256="1zkh00xbddhgz0qn0a5pj12n0hpx4f5kihpfj71x92pmxpzglcxh"; depends=[Formula plotrix]; }; simputation = derive2 { name="simputation"; version="0.2.4"; sha256="16adh97hfszvf934lf8mvwxvx71s7gwhzzhsbqz24zqik20pd6fq"; depends=[gower MASS rpart]; }; @@ -13748,7 +13767,7 @@ in with self; { sitools = derive2 { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; }; sitree = derive2 { name="sitree"; version="0.1-7"; sha256="08yamivn2vxgrizh5gvvr9cn3cn1657r0p2nrkwbqljqrhmzi7qd"; depends=[data_table lattice latticeExtra]; }; sitreeE = derive2 { name="sitreeE"; version="0.0-5"; sha256="16m8w0rxb40pimzd06znqskz74jk4rrki4gjy8nk24r1zih2cjq1"; depends=[data_table sitree]; }; - sizeMat = derive2 { name="sizeMat"; version="1.1.0"; sha256="1pxb99gd0zfrpbq2ndmhciv2bc8xdfgm0q1y771f6ji5665qxgfw"; depends=[MASS matrixStats MCMCpack]; }; + sizeMat = derive2 { name="sizeMat"; version="1.1.1"; sha256="1afkc5mcih4zva70fifx65wjm5ndi80hvlq23dvfrmhk4z94nnlx"; depends=[MASS matrixStats MCMCpack]; }; sjPlot = derive2 { name="sjPlot"; version="2.8.3"; sha256="0ip1rkjlhyf3axlc8qqss1qq1f0xrda890c1jmcbhm98wwjw264f"; depends=[bayestestR dplyr effectsize ggeffects ggplot2 insight knitr MASS parameters performance purrr rlang scales sjlabelled sjmisc sjstats tidyr]; }; sjdbc = derive2 { name="sjdbc"; version="1.6.0"; sha256="17ncgj2s2pjn3w3c1dgxv8g7y17h4p78iic86gsj2ahn0xpsmkcc"; depends=[rJava]; }; sjlabelled = derive2 { name="sjlabelled"; version="1.1.3"; sha256="1amq7i9sxf0pkxhskqc53xq5wvc9rdxm7cxyb4b6xh6qsskjnlsj"; depends=[haven insight]; }; @@ -13760,7 +13779,7 @@ in with self; { skellam = derive2 { name="skellam"; version="0.2.0"; sha256="0r5wbs5h7xc3k2vjxd4axwnxr9cmwm008fcyj1vyixkg8fa680gx"; depends=[]; }; skewlmm = derive2 { name="skewlmm"; version="0.1.0"; sha256="158nxycjg8bmx653nc57gdw02hf5szqbl2hgcb10yrmpssk15qbs"; depends=[dplyr ggplot2 moments mvtnorm nlme numDeriv purrr]; }; skewt = derive2 { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; }; - skimr = derive2 { name="skimr"; version="2.1"; sha256="18c86bzw8y08yg7gz4c5drxb33jd31iywbwzna2y246qijlsyvi5"; depends=[cli crayon dplyr knitr magrittr purrr repr rlang stringr tibble tidyr tidyselect withr]; }; + skimr = derive2 { name="skimr"; version="2.1.1"; sha256="0p2syjaz5f5p5d684j8kpv8hqhp9xcffjqqlblzgvj6n56h5h1sh"; depends=[cli crayon dplyr knitr magrittr purrr repr rlang stringr tibble tidyr tidyselect vctrs withr]; }; skm = derive2 { name="skm"; version="0.1.5.4"; sha256="06g3bdncq2r56d8k3dr87gqnibypbsps0gj4jxkw9q1sq1yaff3v"; depends=[data_table magrittr plyr Rcpp RcppArmadillo RcppParallel]; }; skmeans = derive2 { name="skmeans"; version="0.2-11"; sha256="1a8nwlym6pf0z13nnw1id2wls9lq788860yhjaqd56c3slzfsymn"; depends=[clue cluster slam]; }; skpr = derive2 { name="skpr"; version="0.64.2"; sha256="07fchgv0aqgw0hvcav08zzfzqg8nbw8ibbpd3bd11jx1fikx4vyr"; depends=[base64enc car crayon doParallel doRNG foreach future iterators kableExtra knitr lazyeval lme4 lmerTest magrittr nlme promises Rcpp RcppEigen rintrojs shiny shinyjs shinythemes survival viridis]; }; @@ -13784,7 +13803,7 @@ in with self; { slouch = derive2 { name="slouch"; version="2.1.4"; sha256="09ffx657hs913prv0rifhsz60h39lk0h4z28myx6yzxcfdk4f48d"; depends=[ape crayon memoise]; }; slowraker = derive2 { name="slowraker"; version="0.1.1"; sha256="0glc3ldvbqkvzfvhs4s5mzx1kfz05px4k7rx5jfp9dm9d0gfpvsx"; depends=[NLP openNLP SnowballC]; }; slp = derive2 { name="slp"; version="1.0-5"; sha256="0i9iv0s1wdp9cyzr8qixh6c7qvrj025vll13gyf8dfbidrp6hryl"; depends=[mgcv]; }; - slurmR = derive2 { name="slurmR"; version="0.3-0"; sha256="0301h8fzkghk41afkfprkbf3nia07apgjly0njan07vhk144k0qr"; depends=[]; }; + slurmR = derive2 { name="slurmR"; version="0.4-1"; sha256="00ihaq2f86spl4ra41lyszrgn52vgpfw0bv0px23gc6qngxzxd6y"; depends=[]; }; sm = derive2 { name="sm"; version="2.2-5.6"; sha256="0c4whcx879gb4lwvqnzxl5n9xgpcqh2c54ip9ami3mwfprzcv45q"; depends=[]; }; smaa = derive2 { name="smaa"; version="0.3-0"; sha256="0y7j4q147fdk7fffyinc803mfzzsmcdfx8bp695w3wkq1wwy9kyl"; depends=[]; }; smacof = derive2 { name="smacof"; version="2.1-0"; sha256="0bylwa9dwr0q8saifh4fag0srs84g6chvfmslhs8vx42alkq94pz"; depends=[candisc colorspace doParallel e1071 ellipse foreach Hmisc MASS nnls plotrix polynom weights wordcloud]; }; @@ -13888,7 +13907,6 @@ in with self; { somebm = derive2 { name="somebm"; version="0.1"; sha256="1iwwc94k6znh4d3bbjnvwp4chc4wg0iy4v2f99cs4jasrsimb4p8"; depends=[]; }; sommer = derive2 { name="sommer"; version="4.0.9"; sha256="0nrfra6n2rmgh1kxvsyxxxdy4fy6b2092lfmy5551l3l3hq5q3a2"; depends=[crayon lattice MASS Matrix Rcpp RcppArmadillo]; }; somplot = derive2 { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; }; - somspace = derive2 { name="somspace"; version="1.0.0"; sha256="1cp7mprapidzfphis697r3jipm1ig5198580mmdygvbajxcjib75"; depends=[data_table ggplot2 kohonen maps]; }; sonar = derive2 { name="sonar"; version="1.0.2"; sha256="1f0f5iqi3y9vnxyym14nm8dqxw0vcpnxmvvkx4sm612i4fclg1f9"; depends=[]; }; sonicLength = derive2 { name="sonicLength"; version="1.4.6"; sha256="0jh9zk908afqxacccsph6477cc8sbcc1vxbv7jz8ppgc20imw932"; depends=[]; }; sonicscrewdriver = derive2 { name="sonicscrewdriver"; version="0.0.1"; sha256="03v53blb8f67ybhqys4n0zxf7pk9g024ncq0g9rnj9qpr740zclb"; depends=[ggplot2 seewave tuneR]; }; @@ -13903,7 +13921,7 @@ in with self; { sotkanet = derive2 { name="sotkanet"; version="0.9.48"; sha256="1jw9agj92zzgad5kk9z6smjacimwinci6aaqlzmshivb8g8rv8zp"; depends=[RCurl rjson]; }; sotu = derive2 { name="sotu"; version="1.0.2"; sha256="0aqwkawaydsm91hz13msjg1a5llg7xmv6hxmfmsaganrl7iaym3c"; depends=[]; }; sound = derive2 { name="sound"; version="1.4.5"; sha256="1kbbb614d0fmj9l0yjiwf5yqnl7sby4xklp7qwp6rwjvq9bnm0ab"; depends=[]; }; - soundcorrs = derive2 { name="soundcorrs"; version="0.1.0"; sha256="1q02ll4yw7dlz3cmxb7i1svhpjmhxqglsswv1drlkzm8i3gfp9dk"; depends=[]; }; + soundcorrs = derive2 { name="soundcorrs"; version="0.1.1"; sha256="06d57ici4538mfw804vnqaf59n2zglqlxhdlmn9694v9q1xw24p6"; depends=[]; }; soundecology = derive2 { name="soundecology"; version="1.3.3"; sha256="16h6gbdlyav7wbfisdv1f2zsqhr45liidgj7qqk8giwjxgan8q97"; depends=[ineq oce pracma seewave tuneR vegan]; }; soundgen = derive2 { name="soundgen"; version="1.6.2"; sha256="093i8v2i3np1gny0dsnw3i20n5x67w312sslgabgmibak66cdb37"; depends=[dtw mvtnorm phonTools reshape2 seewave shiny shinyBS shinyjs tuneR zoo]; }; source_gist = derive2 { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; }; @@ -13925,7 +13943,7 @@ in with self; { spTDyn = derive2 { name="spTDyn"; version="2.0"; sha256="0wandd5iqyqb474096lky04rrgj31gnyqnlmgw8ypxsypd0gqdy0"; depends=[coda sp spacetime spTimer]; }; spThin = derive2 { name="spThin"; version="0.2.0"; sha256="0j10j1cbbwp3baqm3b59rxlnd643mkx1mirlxpnr1ad2g7xpm69f"; depends=[fields knitr spam]; }; spTimer = derive2 { name="spTimer"; version="3.3"; sha256="0vzqig9dq4k6p5s2gbm5arqiih28ghzjx0fs7ml70vx2f181jrxi"; depends=[coda extraDistr sp spacetime]; }; - spaMM = derive2 { name="spaMM"; version="3.1.27"; sha256="1a84nklxipaacndsyd87b8hb5908006416rkcpv60bzinnh1vnrn"; depends=[crayon gmp MASS Matrix minqa nlme nloptr pbapply proxy Rcpp RcppEigen]; }; + spaMM = derive2 { name="spaMM"; version="3.2.0"; sha256="1699zx097i20asf0yy7p7w45fbh4fqg8wj0ym8xz6fa85kalmma0"; depends=[crayon gmp MASS Matrix minqa nlme nloptr pbapply proxy Rcpp RcppEigen ROI ROI_plugin_glpk]; }; spaa = derive2 { name="spaa"; version="0.2.2"; sha256="163iipz1knxx1lzby9a3n1f014yqkf25z1wpwwy4gbx7sia499d5"; depends=[]; }; space = derive2 { name="space"; version="0.1-1.1"; sha256="09dpksbda4lg5hax47a9h9shjmggza6583slvdj0fldblykpyxck"; depends=[]; }; spaceNet = derive2 { name="spaceNet"; version="1.2"; sha256="1s2672icxs0qvdhl52xhllgvh1i9mjfrn5j3icyw6h61ljbnhy11"; depends=[MASS mclust permute RcppTN Rfast sna vegan]; }; @@ -13940,14 +13958,14 @@ in with self; { spam64 = derive2 { name="spam64"; version="2.5-1"; sha256="0fni9lwn51n0ax4qk1l1wslhbkfl44ryp5hgjprkql5a26nmv0nq"; depends=[]; }; spanel = derive2 { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; }; spanish = derive2 { name="spanish"; version="0.4.2"; sha256="15drc11lh0qxpww50p0smi8qxfbln82bx0yd74jqf71irhk5jxyp"; depends=[magrittr xml2]; }; - spant = derive2 { name="spant"; version="1.3.0"; sha256="0bcd733llz81vb4f5bjhf0230qjh9ix0y5bbg3dar48kr380fsba"; depends=[abind complexplus fields foreach irlba lsei magrittr MASS matrixcalc miniUI minpack_lm mmand nloptr nnls numDeriv oro_dicom plyr pracma ptw readr RNifti RNiftyReg shiny signal smoother stringr tibble viridisLite]; }; + spant = derive2 { name="spant"; version="1.4.0"; sha256="0376ynqpjl2g4caskkrw0z1mcd495fiyalpb30fvhh1k0zwg2a8s"; depends=[abind complexplus fields foreach irlba lsei magrittr MASS matrixcalc miniUI minpack_lm mmand nloptr nnls numDeriv oro_dicom plyr pracma ptw readr RNifti RNiftyReg shiny signal smoother stringr tibble viridisLite]; }; sparcl = derive2 { name="sparcl"; version="1.0.4"; sha256="138krflvfdlx4hlh90mswds51i8aw2vv00gm5lgkfsvxj4w324jg"; depends=[]; }; spark_sas7bdat = derive2 { name="spark.sas7bdat"; version="1.2"; sha256="1kvzfjhf1q5jzlq5d04s7d96j63vnvqqrh8s03rwkl79h1dhqhhp"; depends=[sparklyr]; }; sparkavro = derive2 { name="sparkavro"; version="0.3.0"; sha256="0g6ac9msfbx8f8j8rj0hvlxjsn317zyam207q7i8kf0hshs1r58f"; depends=[DBI dplyr sparklyr]; }; sparkbq = derive2 { name="sparkbq"; version="0.1.1"; sha256="0gccm8q5a45k9zm8f90r7fhcmriq8d038p022k7cikbr6rqsrmyh"; depends=[sparklyr]; }; sparkhail = derive2 { name="sparkhail"; version="0.1.1"; sha256="1a9p9i7fs6l9rx5ha6akjjl7qhfak01xsjg28ysv0imikmwp6hy7"; depends=[dplyr sparklyr sparklyr_nested]; }; sparkline = derive2 { name="sparkline"; version="2.0"; sha256="0lrr1lm7603di7x3mf53cp13d9ssjh9gmb43wa6z9yqapis2djm2"; depends=[htmltools htmlwidgets]; }; - sparklyr = derive2 { name="sparklyr"; version="1.1.0"; sha256="19dgfj76nammj1di9bsn7s6k82ksj46jpqd6c309axxlly6grhj0"; depends=[assertthat base64enc config DBI dbplyr digest dplyr ellipsis forge generics httr jsonlite openssl purrr r2d3 rappdirs rlang rprojroot rstudioapi tibble tidyr withr xml2]; }; + sparklyr = derive2 { name="sparklyr"; version="1.2.0"; sha256="1bj9ndyz6nb7mw1pq0gksmw3xpwfjrj0mfmiiazzs3rvp91ap47c"; depends=[assertthat base64enc config DBI dbplyr digest dplyr ellipsis forge generics globals httr jsonlite openssl purrr r2d3 rappdirs rjson rlang rprojroot rstudioapi tibble tidyr withr xml2]; }; sparklyr_nested = derive2 { name="sparklyr.nested"; version="0.0.3"; sha256="0lva7fbjp253kxq3970h52cr8s52xycbi03d5shsyna8grhkbczj"; depends=[dplyr jsonlite listviewer purrr rlang sparklyr]; }; sparktex = derive2 { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; }; sparktf = derive2 { name="sparktf"; version="0.1.0"; sha256="0jd018n7553q0ldv6whxbj2s38myig0m8zq4fbp8fsv34q5wnsx4"; depends=[sparklyr]; }; @@ -13978,17 +13996,18 @@ in with self; { sparsio = derive2 { name="sparsio"; version="1.0.1"; sha256="181kzs9x3h497c7shfalbzrjz05bkj7mmjh9nyphxyi2jjrr6y1q"; depends=[Matrix Rcpp]; }; spate = derive2 { name="spate"; version="1.7"; sha256="1cr5jjrycfj9larsqgzfakk4qgfz8m5djg4ddzk6s3lg2iw06y43"; depends=[mvtnorm truncnorm]; }; spatgraphs = derive2 { name="spatgraphs"; version="3.2-1"; sha256="0n7f3r4ahv1w5mwx5mnib3g4263kz73rh1fcfk5wb12y52x8n1iz"; depends=[Matrix Rcpp]; }; - spathial = derive2 { name="spathial"; version="0.1.1"; sha256="1ki56j5hgf2yc80gw1a71xapkqksfmza6mnfwphkcljh973vqyxr"; depends=[class igraph knitr MASS matrixStats pracma rmarkdown Rtsne]; }; + spathial = derive2 { name="spathial"; version="0.1.2"; sha256="1vwzcwpmx8kwv821vjf940qd5am3k0shf1s14jva71mgxs70ddmb"; depends=[class igraph irlba knitr MASS matrixStats pracma rmarkdown Rtsne]; }; spatial = derive2 { name="spatial"; version="7.3-11"; sha256="04aw8j533sn63ybyrf4hyhrqm4058vfcb7yhjy07kq92mk94hi32"; depends=[]; }; spatial_tools = derive2 { name="spatial.tools"; version="1.6.2"; sha256="18x935ly2jpnah2dik44nsbin1wyy9v27galyf176bzmjhm029bb"; depends=[abind doParallel foreach iterators mmap raster rgdal sp]; }; spatialClust = derive2 { name="spatialClust"; version="1.1.1"; sha256="042yrmh1rb0hxynxlbdpcissgy9zazs5aqx7vj388ibynzijck3r"; depends=[ggplot2 maptools rgeos sp]; }; spatialCovariance = derive2 { name="spatialCovariance"; version="0.6-9"; sha256="1m86s9a059spp97y37dcirrgjshcqzpdj11cq92vji624w4nrhlb"; depends=[]; }; spatialEco = derive2 { name="spatialEco"; version="1.3-1"; sha256="075z9ggbm7kdl8aslpq5x0bniklnbmv9jb3ipx7r7xxvq5nf44pz"; depends=[cluster dplyr EnvStats exactextractr maptools MASS mgcv RANN raster RCurl readr rgeos rms sf sp SpatialPack spatstat spdep yaImpute]; }; spatialfil = derive2 { name="spatialfil"; version="0.15"; sha256="01fbn9zblz7rjsgqy3ikdqpf0p0idvb6m96mf7m7qi2ps5f48vzj"; depends=[abind fields]; }; + spatialfusion = derive2 { name="spatialfusion"; version="0.6-2"; sha256="1vqv4424m8rnmyg463mvnk26q7dis4wd47swyyc8f8r4qd85agnz"; depends=[fields Rcpp rstan SDraw sp]; }; spatialnbda = derive2 { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[mvtnorm SocialNetworks]; }; spatialprobit = derive2 { name="spatialprobit"; version="0.9-11"; sha256="1cpxxylc0pm7h9m83m2cklrh4jni5x79r5m5gibxi6viahwxn9kc"; depends=[Matrix mvtnorm spdep tmvtnorm]; }; spatialreg = derive2 { name="spatialreg"; version="1.1-5"; sha256="0zdj67rvfvssjch5hwyi4gvyr7pjgfjrkbhnc4q9psfjp9rhggyx"; depends=[boot coda expm gmodels LearnBayes MASS Matrix nlme spData spdep]; }; - spatialrisk = derive2 { name="spatialrisk"; version="0.6.6"; sha256="0sdabbjd6d3r2qicq7brbfhayr0dqcfv3wpvw2kgm9zl7xymwaar"; depends=[automap classInt dplyr fs ggplot2 gstat lubridate mgcv Rcpp RcppProgress sf sp tmap viridis vroom]; }; + spatialrisk = derive2 { name="spatialrisk"; version="0.6.7"; sha256="1vd90v55wy7b1aqhlr2b6x445nwghn94qyz39439pcmp5y9n8zb8"; depends=[automap classInt dplyr fs ggplot2 gstat lubridate mgcv Rcpp RcppProgress sf sp tmap viridis vroom]; }; spatialsegregation = derive2 { name="spatialsegregation"; version="2.45"; sha256="04ibvk6shs15b8piln2lcnlj8s5gy6r7wraz6591dbc31grzaa36"; depends=[spatstat]; }; spatialwarnings = derive2 { name="spatialwarnings"; version="1.3.1"; sha256="139m6jaw6f5gglwqrd4f5mzr4vkqk2r1a069971y7ap2klzzbhns"; depends=[ggplot2 plyr Rcpp RcppArmadillo reshape2 tidyr VGAM]; }; spatialwidget = derive2 { name="spatialwidget"; version="0.2.2"; sha256="082w44i9is0cn4kgbqlnzclyp4fj2is0r5kla29nvm4m2y83bdjj"; depends=[BH colourvalues geojsonsf jsonify rapidjsonr Rcpp sfheaders]; }; @@ -14000,7 +14019,7 @@ in with self; { spatstat_local = derive2 { name="spatstat.local"; version="3.6-0"; sha256="19kv85smy8jp2bx1mgppav50k07xm8zvmf7snzj29rrspiws7sig"; depends=[spatstat spatstat_utils tensor]; }; spatstat_utils = derive2 { name="spatstat.utils"; version="1.17-0"; sha256="08h9kzkkxvlnngxnv5mdylfali5jj4yhgbr8kvf8l7glswz6ik9r"; depends=[]; }; spatsurv = derive2 { name="spatsurv"; version="1.4"; sha256="0sw5a532p3bbbh3pxvscmmmg6jw126ncpihxiv01bpwmf85ld4z2"; depends=[fields geostatsp iterators lubridate Matrix RandomFields raster RColorBrewer rgeos sp spatstat stringr survival]; }; - spbabel = derive2 { name="spbabel"; version="0.5.0"; sha256="0jwv3mirm5wkfqja0nwy25nfndis8px4awpjh4hk9bi77dfy14bf"; depends=[dplyr sp tibble]; }; + spbabel = derive2 { name="spbabel"; version="0.5.1"; sha256="1q4y5has7yrsn1hv5nzm4imciv5sw5ycsvy5mpikrs1i670rbp6b"; depends=[dplyr rlang sp tibble]; }; spc = derive2 { name="spc"; version="0.6.3"; sha256="0ik5qmf0f0l77rbg78rp8v606h0d1qp4kccl6j3vqfb2hjsqb7r0"; depends=[]; }; spc4sts = derive2 { name="spc4sts"; version="0.5.2"; sha256="039z6dnry5c2brmh7jsnb6cvb7a8nig1rrf4d4i5bpifi2x1hf06"; depends=[gridExtra LS2Wstat rpart]; }; spcadjust = derive2 { name="spcadjust"; version="1.1"; sha256="016i3zaaq800x4niz4fixa57nfj1m10sz5xskff4vq4v9fjn2sl0"; depends=[]; }; @@ -14035,7 +14054,7 @@ in with self; { spelling = derive2 { name="spelling"; version="2.1"; sha256="1j92brq29za3di1723xhmx240ya2v351dvcg0r1xr5yclw1kh3jp"; depends=[commonmark hunspell knitr xml2]; }; spemd = derive2 { name="spemd"; version="0.1-1"; sha256="1aw8dg2fm8qd95bgim2kjwp7ax4b2g78521llsxv7fhdj9hl7rgw"; depends=[MBA sp spdep]; }; sperich = derive2 { name="sperich"; version="1.5-8"; sha256="0v4mnv9nl0dvmmfx10w03k02pwjjnip9526m3j1kpgn6c4wk1h93"; depends=[foreach rgdal sp]; }; - sperrorest = derive2 { name="sperrorest"; version="2.1.5"; sha256="126vwk3bxs27gblakc5nplj0k90a21gks9d0kbyanlxc2ihsy243"; depends=[doFuture foreach future future_apply gdata glue magrittr pbapply pbmcapply purrr ROCR rpart stringr]; }; + sperrorest = derive2 { name="sperrorest"; version="3.0.0"; sha256="0hhab72aqhjcznsghhxwnlxhmqr4wpnrndmy12b2cp5zbb0ca6q5"; depends=[future future_apply ROCR stringr]; }; spex = derive2 { name="spex"; version="0.6.0"; sha256="1m56vmp1zacipr8kw4pwh0rpc0jhi8a59351g9c6gpx48ysj9sbk"; depends=[quadmesh raster reproj sp]; }; spfrontier = derive2 { name="spfrontier"; version="0.2.5"; sha256="1vnvwcjbhvbmyn5rp4760amzy8k3y156q629fjymw9rw6zy45pbf"; depends=[ezsim moments mvtnorm numDeriv optimx spdep tmvtnorm]; }; spftir = derive2 { name="spftir"; version="0.1.0"; sha256="07vw8igy698jx671cj6hmf6ll9xvaq81fb6la7j95pqbd6jl284z"; depends=[pracma]; }; @@ -14065,7 +14084,7 @@ in with self; { splinetree = derive2 { name="splinetree"; version="0.2.0"; sha256="0gqb3kwca42crrx6fj42ryl5pkxvankhp1chdlvi5lgg8mzmqsnl"; depends=[ggplot2 mclust mosaic nlme rpart treeClust]; }; splitFeas = derive2 { name="splitFeas"; version="0.1.0"; sha256="1cfiis32h5kkp8r1mndmj4xss9gw96vdzk7q68q3jhbwqiaxp9rp"; depends=[corpcor matrixStats]; }; splitSelect = derive2 { name="splitSelect"; version="1.0.0"; sha256="044pmsdq1kvs3qjglrdpwq5kxvxfybpaqmqhnmwpw4xlql4afvyc"; depends=[caret doParallel foreach glmnet multicool mvnfast]; }; - splitTools = derive2 { name="splitTools"; version="0.2.0"; sha256="1wbssmlm0k261bk8a1x4zqfprsl0gp38a9asfa8iidsgw3yd9lf5"; depends=[]; }; + splitTools = derive2 { name="splitTools"; version="0.2.1"; sha256="09dpkrdfkhh7hqgf0r4c5qx74aghs2gqy47dyakkb19fbx66glhl"; depends=[]; }; splitfngr = derive2 { name="splitfngr"; version="0.1.2"; sha256="0cf9y68m72j890a732m0n784nr12ydljr6s8i80f0in6q8lmw8ls"; depends=[lbfgs]; }; splithalf = derive2 { name="splithalf"; version="0.7.1"; sha256="0mpg6i6zh4s9sz10gs0h3y1cc1zva7vs805sb3qkghx857psgyw3"; depends=[dplyr ggplot2 patchwork plyr Rcpp robustbase tidyr]; }; splithalfr = derive2 { name="splithalfr"; version="1.0.10"; sha256="08gl60dbjb4nq6ab0w7yj7ac0gnj0zxbvzlg3rkqczvx4r3gwkip"; depends=[dplyr rlang]; }; @@ -14102,7 +14121,7 @@ in with self; { spselect = derive2 { name="spselect"; version="0.0.1"; sha256="02aiml4dh40n6yl52ypramn4847ykdi4y5lhsmchnnp4nnnqycsn"; depends=[magic pracma tester]; }; spsh = derive2 { name="spsh"; version="1.1.0"; sha256="1rmsgp0mrb4153v5f5xby7r3izvgz1a0vi63g5p9q5jd6z0gd2i1"; depends=[DEoptim FME hypergeo lhs pracma Rdpack]; }; spsi = derive2 { name="spsi"; version="0.1"; sha256="0q995hdp7knic6nca0kf5yzkvv8rsskisbzpkh9pijxjmp1wnjrx"; depends=[plot3D]; }; - spsur = derive2 { name="spsur"; version="1.0.0.4"; sha256="0av0bay2dyfavsckqzjqr490k05fwfncr0yk1wxv741w35ww9mpx"; depends=[Formula MASS Matrix minqa numDeriv sparseMVN spdep]; }; + spsur = derive2 { name="spsur"; version="1.0.1.3"; sha256="0zhgj5vlc52j1mr1dkh08gfy0l2s9lqrqjraqsyx6p94gc4by1hv"; depends=[Formula gmodels MASS Matrix minqa numDeriv sparseMVN spatialreg spdep]; }; spsurv = derive2 { name="spsurv"; version="1.0.0"; sha256="11jlbzvzxv3d1d0nwpbii46ddvphglrxv25rw7pvxbybcx2i7k6x"; depends=[BH coda loo MASS Rcpp RcppEigen rstan rstantools StanHeaders survival]; }; spsurvey = derive2 { name="spsurvey"; version="4.1.2"; sha256="1lijys90x2s7xxx16bm6h9320kbldgpb1hnyij6s4fkrmqksk8mh"; depends=[crossdes deldir foreign Hmisc MASS rgeos sf sp]; }; spt = derive2 { name="spt"; version="2.5.1"; sha256="04j38d2b35p4798znnc49vqrg8r8bygwi07vybfj3nzimlp2mkrn"; depends=[]; }; @@ -14126,7 +14145,7 @@ in with self; { ssc = derive2 { name="ssc"; version="2.1-0"; sha256="1lq71p8hbjfg4a52009810k5dmhak9ddk1dywvhy7v2gjmxqnadw"; depends=[proxy]; }; sscor = derive2 { name="sscor"; version="0.2"; sha256="1kcrr90cxg6k4qkc3pidhkwf4dsnlgbxczxigr2afwpd9cpf104c"; depends=[mvtnorm pcaPP robustbase]; }; ssd = derive2 { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13jsb4k4575b7c424ci2p6gy"; depends=[]; }; - ssdtools = derive2 { name="ssdtools"; version="0.1.1"; sha256="1vamc0b325i1jmzkqyjp7hym3x66pj9yflvplqa64m5nxr3q1anz"; depends=[abind actuar chk fitdistrplus ggplot2 lifecycle scales VGAM]; }; + ssdtools = derive2 { name="ssdtools"; version="0.2.0"; sha256="1nyym23q1f4v71g3rb5p59vdzylg8n90z2x2hkb7d6dycxjsyc8k"; depends=[abind actuar chk fitdistrplus ggplot2 lifecycle scales tibble VGAM]; }; sse = derive2 { name="sse"; version="0.7-16"; sha256="1kxdgbskw7v48jnif4dpmwxpsdznfx8d9q5nkf3ynw9xl38rzv23"; depends=[lattice]; }; ssev = derive2 { name="ssev"; version="0.1.0"; sha256="1iw07gw9vhg073s5kkxh5f1si6p998rc1i2zglnpk5c3pi3l55wp"; depends=[MESS pwr]; }; ssfa = derive2 { name="ssfa"; version="1.1"; sha256="0fkyalhsjmx2sf8xxkppf4vd272n99nbkxh1scidrsgp4jk6z7fx"; depends=[Matrix maxLik sp spdep]; }; @@ -14151,13 +14170,13 @@ in with self; { st = derive2 { name="st"; version="1.2.5"; sha256="0dnyfjcz37gjjv87nrabb11gw2dlkqhq3mrxdpkzahx0w0g0q0pb"; depends=[corpcor fdrtool sda]; }; stR = derive2 { name="stR"; version="0.4"; sha256="120k8k1l8cfy8x746808jym7lnaplgh4s3lycgyq2wia2c35r0rc"; depends=[foreach forecast Matrix quantreg rgl SparseM]; }; stUPscales = derive2 { name="stUPscales"; version="1.0.3.4"; sha256="0a6b38lhi1p0n2hjq2j8aw2vkasdv50cpgllxfxla7ddwbhbk3nk"; depends=[data_table doParallel EmiStatR foreach ggplot2 hydroGOF lattice lmom mAr moments msm xts zoo]; }; - staRdom = derive2 { name="staRdom"; version="1.1.10"; sha256="17827w3kmj0ggap465q4chlh045ggvarik795c74sl5ldwc74ad8"; depends=[cdom data_table doParallel dplyr drc eemR foreach GGally ggplot2 gtools matrixStats MBA multiway pracma R_matlab readr stringr tibble tidyr zoo]; }; + staRdom = derive2 { name="staRdom"; version="1.1.11"; sha256="071irc8bam5rk72db0s7si2mmzq29245qk63q78fdn3ll2lb6gpf"; depends=[cdom data_table doParallel dplyr drc eemR foreach GGally ggplot2 gtools matrixStats MBA multiway pracma R_matlab readr stringr tibble tidyr zoo]; }; staTools = derive2 { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[magicaxis Rcpp VGAM]; }; stability = derive2 { name="stability"; version="0.5.0"; sha256="0mz7ikfhpfbdcp72klq7fi4zfmx2w18gz46yhwywcc4dyi277m11"; depends=[dplyr ggfortify ggplot2 lme4 magrittr matrixStats reshape2 rlang scales tibble tidyr]; }; stable = derive2 { name="stable"; version="1.1.4"; sha256="01azqg4yi5wl6wfdpjq57w41x5z2b4dsp5n3vpkz24b9avk6rm8s"; depends=[rmutil stabledist]; }; stableGR = derive2 { name="stableGR"; version="1.0"; sha256="1glxrxqd3gr7npwlzcr2nmsmakydyxg7hswvb85gz1jvc6c6254f"; depends=[mcmcse mvtnorm]; }; stabledist = derive2 { name="stabledist"; version="0.7-1"; sha256="0scar396wiq6wkbkvwp4qrxqc1m075y56p37i6iry5rw796p1i86"; depends=[]; }; - stablelearner = derive2 { name="stablelearner"; version="0.1-1"; sha256="19mvk6dzg8zg0nj1q4sraqg6h3zj8xvnfc0jql1xiqas9wcypx7d"; depends=[e1071 MASS partykit]; }; + stablelearner = derive2 { name="stablelearner"; version="0.1-2"; sha256="18yrx2h71b857j0xyh68pj80p2xk6yhbfzhd3mdhiqw0irmc5755"; depends=[e1071 MASS party partykit randomForest ranger]; }; stablespec = derive2 { name="stablespec"; version="0.3.0"; sha256="0m143cq0baj2lyakhr31mqk2lg78jzpdlpv2bhwz6bzzip7mqi22"; depends=[foreach ggm graph matrixcalc nsga2R polycor Rgraphviz sem]; }; stabm = derive2 { name="stabm"; version="1.1.2"; sha256="01fg6zn6i710xfa9g15q4ca7vfgkfrk0iz6fvn8qp6y3dfrpm1sj"; depends=[BBmisc checkmate Matrix]; }; stabreg = derive2 { name="stabreg"; version="0.1.2"; sha256="1jrxyv0d33vd9vdlj1cv1a2qdz8iqgr726f54dgazwsz3cpyy2ia"; depends=[numDeriv]; }; @@ -14173,8 +14192,10 @@ in with self; { stapler = derive2 { name="stapler"; version="0.7.1"; sha256="1bzhahn72fzm2bjpis76hphv8whnkp2jq8bm1qldadhng4z1nsak"; depends=[matrixStats RNifti]; }; staplr = derive2 { name="staplr"; version="2.9.0"; sha256="1m1rikd1ijw9svdfm7nn9fnc9pycymbnnv2dq7ygs40jkq2mr4zp"; depends=[assertthat glue stringr]; }; stargazer = derive2 { name="stargazer"; version="5.2.2"; sha256="1pij76r60hkjlvxw6zw1v7gkib81smiqmjq7mwszn6xclq9lmsvh"; depends=[]; }; + starm = derive2 { name="starm"; version="0.1.0"; sha256="0y580c6inmfix6agwd5nr340l3hjk2xxs95s468j5pghpjpb8rmv"; depends=[Matrix]; }; starma = derive2 { name="starma"; version="1.3"; sha256="07r0kyabhgbm2v39fcrw0qhxcxj9a9cb45g9chzcnn9qmvramcwx"; depends=[ggplot2 Rcpp RcppArmadillo scales]; }; - stars = derive2 { name="stars"; version="0.4-0"; sha256="1wby9mkqybq17aakplhz22xp3xkpih9y5b2kc5mhgsl7s07glh42"; depends=[abind classInt lwgeom rlang sf units]; }; + stars = derive2 { name="stars"; version="0.4-1"; sha256="14f0qky7578g61rqjdvpkpr4393pxgqbmh5hycxrxcq0mc2aiqq3"; depends=[abind classInt lwgeom rlang sf units]; }; + starsExtra = derive2 { name="starsExtra"; version="0.0.3"; sha256="0zcz6jjs57k3vq2rdqf91ngcsl0qmdswpisp9zfj9af7f9i7bmm5"; depends=[mgcv nngeo sf stars units]; }; startR = derive2 { name="startR"; version="0.0.1"; sha256="12y57n3yip5rz4rln41896a15zv5b4c67k164282fh1p6ww9gr3r"; depends=[abind bigmemory future]; }; startup = derive2 { name="startup"; version="0.14.1"; sha256="0nvmhfar53yi3wsvhv4idx849psdj46qhkvkxjn52fa7yflkrwz8"; depends=[]; }; startupmsg = derive2 { name="startupmsg"; version="0.9.6"; sha256="0vkqxir4ady4dn9s70dfg1fxck2xg8vnmrmxjzvk01i6pc9zyq0x"; depends=[]; }; @@ -14195,11 +14216,11 @@ in with self; { statnet = derive2 { name="statnet"; version="2019.6"; sha256="17dj6vjnjyqrfhzjq1lys5b29j942kd15zffb69jidni3slf20q9"; depends=[ergm ergm_count network networkDynamic sna statnet_common tergm tsna]; }; statnet_common = derive2 { name="statnet.common"; version="4.3.0"; sha256="0ng90i0wm9wlyhjbnmnylc1bbqw396p1dr7f402dyry9x9ck6jl3"; depends=[coda]; }; statnetWeb = derive2 { name="statnetWeb"; version="0.5.5"; sha256="1v2zgbfl975gqhkhxvgdfhgbw7yf9y3p6kqqxldr9zskhmrn7p1x"; depends=[ergm lattice latticeExtra network RColorBrewer shiny sna]; }; - statnipokladna = derive2 { name="statnipokladna"; version="0.5.6"; sha256="1i5n0am5571b3q1x9rnf87shj9zjc829707wf7gxihfnlmzvrssd"; depends=[curl dplyr httr jsonlite lifecycle lubridate magrittr purrr readr rlang stringi stringr tibble tidyr usethis xml2]; }; + statnipokladna = derive2 { name="statnipokladna"; version="0.5.7"; sha256="0mj2dxianpd78127ggn0cml5nwwf6l26sds36qvfwbicaj7bk5jg"; depends=[curl dplyr httr jsonlite lifecycle lubridate magrittr purrr readr rlang stringi stringr tibble tidyr usethis xml2]; }; statprograms = derive2 { name="statprograms"; version="0.2.0"; sha256="0m7px7fmpz2zzlfdi7rbllcjvcjp8iy94f6fa1w4xinh7vz3y6vq"; depends=[]; }; statquotes = derive2 { name="statquotes"; version="0.2.2"; sha256="1xzc3ndddjrlyld0p4zcwwxkj7i3m3adj7c78x9l4lhlw9mxbbqg"; depends=[stringr tidytext wordcloud]; }; stats19 = derive2 { name="stats19"; version="1.2.0"; sha256="0956s8z8qrkij52fq15ydl15zi3kg5czcx7kjcg20nmby5dqmd34"; depends=[readr sf]; }; - statsExpressions = derive2 { name="statsExpressions"; version="0.3.1"; sha256="0wjqz9ybg95i95hxvasq8igdw8faqlj3pgcvg8n368v165x529kl"; depends=[BayesFactor boot broomExtra dplyr ez ipmisc metaBMA metafor metaplus psych purrr rcompanion rlang sjstats tibble tidyr WRS2]; }; + statsExpressions = derive2 { name="statsExpressions"; version="0.4.1"; sha256="0pzxl1w1ibcwcrzc4p8rc439s30hmcf8xwq7d9hq31vkf6kywpin"; depends=[boot broomExtra correlation dplyr effectsize ez ipmisc metafor metaplus purrr rcompanion rlang tidyBF tidyr WRS2]; }; statsguRu = derive2 { name="statsguRu"; version="0.1.0"; sha256="0pqz0la86mk6zp65zzbfwhxyrqqx040p8mrm2j9wqb53r8fbnmqc"; depends=[devtools htmltab plotrix]; }; statsr = derive2 { name="statsr"; version="0.1-0"; sha256="1z0wfj1jxz02x7vl6sr651v85k88wg8rx0k2kkrwzc4ynim8shms"; depends=[BayesFactor broom cubature dplyr ggplot2 gridExtra knitr rmarkdown shiny tidyr]; }; stcos = derive2 { name="stcos"; version="0.2.1"; sha256="1vjz7x9jign82h5kwqcy4jxqjdnhrsgf00dj5m51f6hvvzh3wv5s"; depends=[dplyr Matrix R6 Rcpp RcppArmadillo sf]; }; @@ -14239,7 +14260,7 @@ in with self; { stocks = derive2 { name="stocks"; version="1.1.4"; sha256="0b6rl7pfkgzbpwnv7zzkr36hs5f1zb60d16ijslf7g9m25vvcyg6"; depends=[dvmisc Hmisc lubridate quantmod rbenchmark RColorBrewer Rcpp TTR zoo]; }; stoichcalc = derive2 { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; }; stokes = derive2 { name="stokes"; version="1.0-5"; sha256="0xbjkrm9g7r2xnj629i5cfmmqkw60iq4k6lk3skmkj3xh20lcd5x"; depends=[magrittr partitions permutations spray]; }; - stopwords = derive2 { name="stopwords"; version="1.0"; sha256="1nmi0bpd0c238g5b8ch1v034m5ng9llhs519cgxdrj3sh9fplwlv"; depends=[ISOcodes]; }; + stopwords = derive2 { name="stopwords"; version="2.0"; sha256="155g00ansyqfpp1mzd2q6mn0k214xinf78nww2368h24kz761jjw"; depends=[desc ISOcodes usethis]; }; stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.3"; sha256="0bh2avblcai49kz8v2i1awqvmzd8gpmla342xdb0siwfpd0caid3"; depends=[dplyr ggplot2 lubridate maps plyr rlang stringr tidyr weathermetrics]; }; storr = derive2 { name="storr"; version="1.2.1"; sha256="0409gb6wji3cjxkdcd0wc3jvsx61h3rxd8a3nr018y8rh1rpsaj6"; depends=[digest R6]; }; stosim = derive2 { name="stosim"; version="0.0.14"; sha256="10k8j7manskjsrjc1l44yhy682b1qh0k2jx3cs5k69j2z42mnhmk"; depends=[Rcpp]; }; @@ -14251,7 +14272,7 @@ in with self; { strat = derive2 { name="strat"; version="0.1"; sha256="1axxrp750kjzcgxjdqfscjmryv1mkv4l23zk8k23z8l4ymhd2f5w"; depends=[Hmisc Rcpp RcppArmadillo]; }; stratEst = derive2 { name="stratEst"; version="0.1.2"; sha256="045wmvkv9jxmazvy0p2dkf3200vy5gf124cv78132ysrnh2vcd4v"; depends=[Rcpp RcppArmadillo]; }; strataG = derive2 { name="strataG"; version="2.4.905"; sha256="0mxhrnqqdgwmv2lqs2sgwa95lq5v4dl6vdqyasknbbfd8vddf393"; depends=[adegenet ape apex copula data_table dplyr DT genepop ggplot2 gridExtra Hmisc magrittr pegas phangorn purrr RColorBrewer Rcpp readr rlang rmetasim stringi swfscMisc tibble tidyr]; }; - stratamatch = derive2 { name="stratamatch"; version="0.1.4"; sha256="0dnwlxz3cw66ww4j7fws6qx1na3ngvkw76bv5igra3lxnzkg217q"; depends=[dplyr Hmisc magrittr rlang survival]; }; + stratamatch = derive2 { name="stratamatch"; version="0.1.5"; sha256="12yk738acsdgn8n7brgl2pnha7ii91mzrksihv2rgks820rdjxip"; depends=[dplyr Hmisc magrittr rlang survival]; }; stratbr = derive2 { name="stratbr"; version="1.2"; sha256="15vkymmc61yz9szhfhc5663hfyqvh499ahwhr9mv1lhv5bikk0kb"; depends=[Rglpk snowfall stratification]; }; strategicplayers = derive2 { name="strategicplayers"; version="1.0"; sha256="19vijrlzawd701vvk9ig7yhzbirh39dxxcwfz8ywwvxxiaky5x55"; depends=[sna]; }; stratification = derive2 { name="stratification"; version="2.2-6"; sha256="1jlks3g8wpqlpci6v0ryyv93agiabdiklmk6ij0pc5icrfiynbhw"; depends=[]; }; @@ -14286,7 +14307,7 @@ in with self; { studyStrap = derive2 { name="studyStrap"; version="1.0.0"; sha256="0lvzqnq40j0xn74qrj0pqhr8zz34mbhfd7dg8bnadscsvj5ffm4c"; depends=[caret CCA dplyr MatrixCorrelation nnls pls tibble tidyverse]; }; styler = derive2 { name="styler"; version="1.3.2"; sha256="1waglhsy2c53qjgd2qhlzda3z0lbzbwx9fkrfhac41y6h91mgkrz"; depends=[backports cli magrittr purrr R_cache rematch2 rlang rprojroot tibble withr xfun]; }; stylest = derive2 { name="stylest"; version="0.1.0"; sha256="0dr7j9fh8kp6wsqql38s3rk596xl6m9nx0w1l5v25hv2bphidxzr"; depends=[corpus Matrix]; }; - stylo = derive2 { name="stylo"; version="0.7.1"; sha256="0l7z4d8q4kp9m0di0hch2zpbxmf7im4h0n95mrylqw93w768z76s"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; }; + stylo = derive2 { name="stylo"; version="0.7.2"; sha256="0s49das1f9svg3grw6faivfxc33y3679z7qiib68fm8ckma94mj9"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; }; suRtex = derive2 { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; }; subcopem2D = derive2 { name="subcopem2D"; version="1.3"; sha256="06wwd847g9pxd0z2a8494h3nc9s280a3s1510bir24m3z7w1pqf3"; depends=[]; }; subdetect = derive2 { name="subdetect"; version="1.1"; sha256="1bcc13avs5w9vmwyf71cnjd2kwmcavmzpwyv8gvsn61n7b4j8wlk"; depends=[]; }; @@ -14309,7 +14330,7 @@ in with self; { sudoku = derive2 { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; }; sudokuAlt = derive2 { name="sudokuAlt"; version="0.2-1"; sha256="1y3li64xqag2ia8dg7q49jmlb1awl92rz6xa9zsbf0s9jman9wj9"; depends=[magrittr]; }; sugarbag = derive2 { name="sugarbag"; version="0.1.2"; sha256="0aikbcdnwvrwvhcchjic9x1r4xh00z8hzq7dc93ykg4wlggs5rx7"; depends=[dplyr geosphere lwgeom purrr rlang rmapshaper sf tibble tidyr]; }; - sugrrants = derive2 { name="sugrrants"; version="0.2.6"; sha256="125v8g36215hyil7vavdz27ng6709nh45m3zp9wwdqb6m4g36smy"; depends=[dplyr ggplot2 gtable lubridate rlang]; }; + sugrrants = derive2 { name="sugrrants"; version="0.2.7"; sha256="1clad4pafj3cf9ra48zf4bm6vvgb3ys7jg4m4qp5k3w4v81qdrnj"; depends=[dplyr ggplot2 gtable lubridate rlang]; }; sumFREGAT = derive2 { name="sumFREGAT"; version="1.1.0"; sha256="1ycdnf5ghrv3czi4lh5yc8n8690m3b8i85s46k7lya2k0rasvac4"; depends=[GBJ Matrix seqminer]; }; summariser = derive2 { name="summariser"; version="2.3.0"; sha256="0zliqy8dlcr2yy4ky8k68qn256xvpla8fcv7via19y40bmla37ic"; depends=[dplyr]; }; summarytools = derive2 { name="summarytools"; version="0.9.6"; sha256="03pcb2ild1rb9f15yq8b68p9bg10z5wk2x7ahgyzkwdh5f81vbq2"; depends=[base64enc checkmate dplyr htmltools lubridate magick matrixStats pander pryr rapportools tibble tidyr]; }; @@ -14328,7 +14349,7 @@ in with self; { superpc = derive2 { name="superpc"; version="1.09"; sha256="1p3xlg2n7p57n54g2w4frfrng5vjh97kp6ax4mrgvj3pqmd1m69z"; depends=[survival]; }; supervisedPRIM = derive2 { name="supervisedPRIM"; version="2.0.0"; sha256="1j5gsy119pvrhkkg048lyk6hjvn9x1bhmfy5g824gj3k1w5slrib"; depends=[prim]; }; suppdata = derive2 { name="suppdata"; version="1.1-1"; sha256="1sysd5w59y9hkm1ab8m9i1d976dv6cxchssc86s27bsibhsj2blc"; depends=[httr jsonlite rcrossref xml2]; }; - support_BWS = derive2 { name="support.BWS"; version="0.4-0"; sha256="09dd8nxfb0snsvq30z494i9pdkfl2vbhajlsxiib57h5jr0rc0ng"; depends=[]; }; + support_BWS = derive2 { name="support.BWS"; version="0.4-1"; sha256="0lfjcwgq74zmgrzybrxj4prvdy2qjlflxsqli7kslymfc653g5qa"; depends=[]; }; support_BWS2 = derive2 { name="support.BWS2"; version="0.3-0"; sha256="0k9yvg0n4lzsq43r53r9f70hq1q3zfljjafj9ds2p3c6qzgs9chi"; depends=[]; }; support_BWS3 = derive2 { name="support.BWS3"; version="0.2-0"; sha256="012kcvscz7m2is92r71731zc7xnp7pwyx30vivwjazrigp9bq1kl"; depends=[]; }; support_CEs = derive2 { name="support.CEs"; version="0.4-1"; sha256="1rbyl7v6m07dsp08kkk9020bh39rhx89q7d05rc5kxb6f7y66jyz"; depends=[DoE_base MASS RCurl simex XML]; }; @@ -14359,20 +14380,19 @@ in with self; { survexp_fr = derive2 { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; }; survey = derive2 { name="survey"; version="4.0"; sha256="1q9x0s86s72gl43zj49gypg6jj2b78xjvxr4lmy5147s9h7z8lxh"; depends=[lattice Matrix minqa mitools numDeriv survival]; }; surveybootstrap = derive2 { name="surveybootstrap"; version="0.0.1"; sha256="13rp6gj1dgdzcjbi2403pldygp1dyqx8zj0r1nvyghpi06x5gpb7"; depends=[dplyr functional plyr Rcpp RcppArmadillo stringr]; }; - surveydata = derive2 { name="surveydata"; version="0.2.4"; sha256="1nhpy40ibl1iirbc6np94mddsws2hn77zfqcaydfzd12i0jqg3gy"; depends=[assertthat dplyr DT ggplot2 magrittr purrr rlang scales tidyr]; }; + surveydata = derive2 { name="surveydata"; version="0.2.5"; sha256="07k54282y69sl4z85v0in6v4f3dpk3i807n5ysyb54p6j1gy95al"; depends=[assertthat dplyr DT ggplot2 magrittr purrr rlang scales tidyr]; }; surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; }; surveyoutliers = derive2 { name="surveyoutliers"; version="0.1"; sha256="03nqw0zir3x57gg23hgsr2s99pv958kfsygqfwly96rvfdhr5p3v"; depends=[]; }; surveyplanning = derive2 { name="surveyplanning"; version="3.0"; sha256="1wnjizd5n5lyp8nw6srplrw7swrrivmbcphdvgaa9q1y8lkpq5w0"; depends=[data_table laeken]; }; surveysd = derive2 { name="surveysd"; version="1.2.0"; sha256="1w4cd52gdl65p16rza50n7pk2xfx3kxd1k16pr67j0pnyl7h2fqk"; depends=[data_table dplyr ggplot2 laeken matrixStats Rcpp]; }; survidm = derive2 { name="survidm"; version="1.2.0"; sha256="0dgcxhf8x1aavr4n4aqanfc23zd62dyk3h05sa04611h6n9l8j9c"; depends=[doParallel doRNG foreach KernSmooth np survival TPmsm]; }; - survival = derive2 { name="survival"; version="3.1-11"; sha256="1fbhbm3bnpg1nmj37h1d76x813ggvwk0cp51ixmmgb3pz47i5xj4"; depends=[Matrix]; }; - survivalAnalysis = derive2 { name="survivalAnalysis"; version="0.1.1"; sha256="0y4hgskc36jrriy6577bnkvg1gmxs0x3pxiv3lma38a9lj71ivwf"; depends=[cowplot dplyr forcats ggplot2 gridExtra magrittr purrr rlang scales stringr survival survminer tibble tidyr tidytidbits]; }; + survival = derive2 { name="survival"; version="3.1-12"; sha256="07zj3gpwncw89hbiwjb6ih9axv5zwdqnbgz9yw9xzws6nrpdcbmn"; depends=[Matrix]; }; + survivalAnalysis = derive2 { name="survivalAnalysis"; version="0.1.2"; sha256="17pywrb10ql4li2jb3y3j0wy0x7wicq1x395a6igxy257kmblw18"; depends=[cowplot dplyr forcats ggplot2 gridExtra magrittr purrr rlang scales stringr survival survminer tibble tidyr tidytidbits]; }; survivalMPL = derive2 { name="survivalMPL"; version="0.2"; sha256="05bfa9fx841kh9g2jcs1dimsxkjnf4bxgamcnjpisx3a644c1gkn"; depends=[MASS survival]; }; survivalROC = derive2 { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; }; survivalsvm = derive2 { name="survivalsvm"; version="0.0.5"; sha256="1b4hrdrqq1z0kfn8vpdwg54388m25df2s6w9i574x3mkxkmkjkga"; depends=[Hmisc kernlab Matrix pracma quadprog survival]; }; survminer = derive2 { name="survminer"; version="0.4.6"; sha256="0c5q5pp78wsv00rrbhbfl1yrdng8n7z1mgqlrqzgb0pswlvv2w3z"; depends=[broom dplyr ggplot2 ggpubr gridExtra magrittr maxstat purrr scales survival survMisc tibble tidyr]; }; survsim = derive2 { name="survsim"; version="1.1.5"; sha256="0194w1h3v4p546wibp3xyhy2r84w3p9r6ggzhlf11v8467mjy0l9"; depends=[eha statmod]; }; - survsup = derive2 { name="survsup"; version="0.0.2"; sha256="0q41hn8iqib2w6gkz2mll4h46vr9ca25jrg0g5jr9wgrzsnf5jci"; depends=[broom colorspace dplyr ggplot2 gridExtra survival]; }; survtmle = derive2 { name="survtmle"; version="1.1.1"; sha256="1l13rvwq4915ij2a55fxdj3b3wkgjca1fbqzcgkjlpzkcn97k1nj"; depends=[dplyr ggplot2 ggsci Matrix plyr speedglm stringr SuperLearner tidyr]; }; survutils = derive2 { name="survutils"; version="1.0.2"; sha256="1ws4r5chz0cbf6vjmlj2xv9hmr968xyw8dc5g3j937xpbz40i75h"; depends=[broom dplyr ggplot2 glue lazyeval magrittr purrr survC1 survival]; }; survxai = derive2 { name="survxai"; version="0.2.0"; sha256="09sk7i0bsk5ql8dibqyykyv95i945bf43xpr4gv22w73zwc0n8hh"; depends=[breakDown ggplot2 pec prodlim scales survival survminer]; }; @@ -14387,7 +14407,7 @@ in with self; { svSocket = derive2 { name="svSocket"; version="0.9-57"; sha256="0id93b500iybza6sbn60ybm91mkh5cjpvhypqs4f3dv13m6blb9j"; depends=[svMisc]; }; svSweave = derive2 { name="svSweave"; version="0.9-8"; sha256="0zkng8lwdpjdbic9f6jnk2ndxbch2kjyz71ds1bksvd3kmk03lks"; depends=[knitr]; }; svTools = derive2 { name="svTools"; version="0.9-5"; sha256="040wr8cr2p35x6pr515bprmsw8ysajx4df5f2njz3ily61xf9szi"; depends=[codetools svMisc]; }; - svUnit = derive2 { name="svUnit"; version="0.7-12"; sha256="16iiryj3v34zbnk1x05g30paza7al1frqx52fkw8ka61icizsrf5"; depends=[]; }; + svUnit = derive2 { name="svUnit"; version="1.0.3"; sha256="0awz9ks0y1n98y9nq6rq65yj7y22z5q4a5w5qhkszkgc9669q1dw"; depends=[]; }; svWidgets = derive2 { name="svWidgets"; version="0.9-45"; sha256="08cpsy4abypjnv33arsgxk5i0gpdvdzj60wa1b22ca1n7d35mc80"; depends=[svMisc]; }; svapls = derive2 { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22zmsnachsydr5vlz38s664d2lplbg"; depends=[class pls]; }; svars = derive2 { name="svars"; version="1.3.3"; sha256="1npjnxbxpidcpifgh2k6xs7drhc075cnzd7mb7wnxi9yz0v10fmr"; depends=[clue copula DEoptim expm ggplot2 pbapply Rcpp RcppArmadillo reshape2 steadyICA strucchange vars zoo]; }; @@ -14419,8 +14439,9 @@ in with self; { swirl = derive2 { name="swirl"; version="2.4.5"; sha256="0cqyn2rnqfkb2wza4zdr1kcms5l0igbq79xh5i7765agdday2z9w"; depends=[digest httr RCurl stringr testthat yaml]; }; swirlify = derive2 { name="swirlify"; version="0.5.3"; sha256="1bpg6yz2adgspjlwsf2q83j1bq0iyvp9938smgc41861nsclngwr"; depends=[base64enc readr rmarkdown shiny shinyAce stringr swirl whisker yaml]; }; swissMrP = derive2 { name="swissMrP"; version="0.62"; sha256="1vy6h6c4v49zlsli77ilj4df8cfh67rqmki71v6j1aqw6kf3b649"; depends=[arm blme lme4 maptools sp]; }; + swissparl = derive2 { name="swissparl"; version="0.2.1"; sha256="0181ls1gw68kfz3yqf8m2nwhah87i9m164rlbycy1kxq9adi93cs"; depends=[crayon dplyr ggplot2 httr jsonlite lubridate magrittr purrr stringr tibble tidyr]; }; switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; }; - switchr = derive2 { name="switchr"; version="0.14.2"; sha256="1a1yq12h5km42gp7gki7p215rnbwrs87xa2p0qndwqpvnaxgv6a4"; depends=[RCurl RJSONIO]; }; + switchr = derive2 { name="switchr"; version="0.14.3"; sha256="1aw9n6hh62qvggl1flpxfyqgp4sj6vj1mlfqfhx923hl53c7cr31"; depends=[RCurl RJSONIO]; }; swmmr = derive2 { name="swmmr"; version="0.9.1"; sha256="140sx0y00ngxsyn7n1l0aay7vk2jk8hf81aiwh46k761cpc5y28d"; depends=[dplyr purrr Rcpp readr tibble tidyr xts zoo]; }; sybil = derive2 { name="sybil"; version="2.1.5"; sha256="1biy1cc87g7adfglzp2mq6ca5sfp1ljq087id0xqdmrwz0650maq"; depends=[lattice Matrix]; }; sybilDynFBA = derive2 { name="sybilDynFBA"; version="1.0.1"; sha256="1zyhvlzkcwnq3sh6gvi0v1crq94mr16bc5jnh0g9c8rbdl4v8r4x"; depends=[sybil]; }; @@ -14451,7 +14472,7 @@ in with self; { sysid = derive2 { name="sysid"; version="1.0.4"; sha256="0fr9gf5yjin3zvz850z4r4pqc1r4mwx8d46sl64i4csdm9qnqagy"; depends=[bitops ggplot2 polynom reshape2 signal tframe zoo]; }; syslognet = derive2 { name="syslognet"; version="0.1.2.1"; sha256="0nwni2mn7w43pfasqa2dwy1l6r0ymlkwlsyd5q47fajdr8v1ir0q"; depends=[]; }; systemfit = derive2 { name="systemfit"; version="1.1-24"; sha256="180ah91i98gjswpbkkdjgnc2c9rz3pl5bw035iks92nd5vl6w5wz"; depends=[car lmtest MASS Matrix sandwich]; }; - systemfonts = derive2 { name="systemfonts"; version="0.1.1"; sha256="0m0ljid683xcam2f14x7k2zv1yx4npac38a3gfv11vhxfbnpgp0z"; depends=[]; }; + systemfonts = derive2 { name="systemfonts"; version="0.2.0"; sha256="1aba07djvxqdmnsdbwvzcsbm2fddnhrssa54xyrlviiwsv2c1qsd"; depends=[]; }; systemicrisk = derive2 { name="systemicrisk"; version="0.4.2"; sha256="021ypw9fag5kmk2q041pj2jfzgfg640yda7wvh0yzdmg73p6fvsw"; depends=[lpSolve Rcpp]; }; syt = derive2 { name="syt"; version="0.1.0"; sha256="1qagd67wznyc6sfvs22lw2lwnwap1hlpf92i0ck5aif514ysi886"; depends=[Matrix partitions]; }; syuzhet = derive2 { name="syuzhet"; version="1.0.4"; sha256="0wf4rls7v7h7zkq2k550d16aqvaij27iim85cwif7dkbinajfngi"; depends=[dplyr dtt NLP textshape tidyr zoo]; }; @@ -14474,7 +14495,7 @@ in with self; { tabr = derive2 { name="tabr"; version="0.4.2"; sha256="0c3814dnz1vzgbmm3vp0icnzyaqs1kimqnsp4n8id7zn8vlmp21p"; depends=[crayon dplyr ggplot2 magrittr purrr tibble tidyr]; }; tabuSearch = derive2 { name="tabuSearch"; version="1.1.1"; sha256="0396a8hla508na1hmyyhfbl8w10dbg810cln2xyhhvxi7rr223dj"; depends=[]; }; tabula = derive2 { name="tabula"; version="1.5.1"; sha256="0mm08rgqdhc3b68xh9hk4rw4i69gb2c45679zni9kkv48pbxvrh7"; depends=[arkhe ca ggplot2 rlang]; }; - tabularaster = derive2 { name="tabularaster"; version="0.5.0"; sha256="0cqax6hq0pbxmqls3cs21cc86662wdzjyx4lkxw42dbw4v13f728"; depends=[dplyr fasterize gibble magrittr raster rlang sp spatstat spbabel spex tibble viridis]; }; + tabularaster = derive2 { name="tabularaster"; version="0.6.0"; sha256="0yaadc4774jwrp38ri6mfnw2x94yhb9kq50bf25naw05g5z6b1d0"; depends=[dplyr fasterize gibble magrittr raster rlang silicate spatstat tibble]; }; tabulizer = derive2 { name="tabulizer"; version="0.2.2"; sha256="0zd5cfqwgirqchw1mvziscxvzl8pb1y6rbfywkn9i9pxfydkm5vi"; depends=[png rJava tabulizerjars]; }; tabulizerjars = derive2 { name="tabulizerjars"; version="1.0.1"; sha256="005n2gyzzmq8h0mpj8xs6ri6llzwag7nqzpm4vnzp81vwy8kmf92"; depends=[rJava]; }; tabulog = derive2 { name="tabulog"; version="0.1.1"; sha256="0n6qjd7kmvxx5na71f358pw3bbwa69vh8qjkrs5mkb3izxabcq67"; depends=[yaml]; }; @@ -14486,17 +14507,14 @@ in with self; { tailr = derive2 { name="tailr"; version="0.1.3"; sha256="0agm83zwj6f3bpicbn2pcwira05v2pbv0g7myc1x06jxbw1qbfwp"; depends=[foolbox glue rlang]; }; taipan = derive2 { name="taipan"; version="0.1.2"; sha256="192sy5pgq74vs31p7jfn6svdzf9mk9ybppzhp1rlki1bagmm5f1r"; depends=[shiny]; }; takos = derive2 { name="takos"; version="0.1.0"; sha256="0a26jmxccpyk36sah9nz7pqpkc1rd9kbwrvwh0r0zp7lwvxbjb8w"; depends=[baseline broom colorRamps data_table devEMF MASS minpack_lm pracma segmented sfsmisc smoother]; }; - tanaka = derive2 { name="tanaka"; version="0.1.2"; sha256="17847xijmb6rv2vzvzx7piga1ihzsmdq4harjccm6qx0nfwij4vs"; depends=[isoband lwgeom raster sf]; }; + tanaka = derive2 { name="tanaka"; version="0.1.3"; sha256="1x5czib9vqpxbr61if1rnlyrld6gx2zf22jz5rcagb8x3bxmd5g6"; depends=[isoband raster sf]; }; tangles = derive2 { name="tangles"; version="0.8.1"; sha256="06a5hn5hkvgr6pcjz3n0vi1zwmv00wypi5f62agqh8mas80v44vh"; depends=[digest raster sp]; }; - tangram = derive2 { name="tangram"; version="0.4"; sha256="1yj5vwc8jkiic4zjag9k7w3j6dibqw5zsi78q6gssshsi9z0zbgy"; depends=[base64enc digest htmltools magrittr R6 stringi stringr]; }; tapkee = derive2 { name="tapkee"; version="1.1"; sha256="1s8710m4drhnycfv27bv1w7vqc99dvbcn8zxkahq0lrsx7q8i5mz"; depends=[]; }; tashu = derive2 { name="tashu"; version="0.1.0"; sha256="04xvmbcwi84zg1pqw21nmrbnkyx184wc200vl1vhmwxggq1i60np"; depends=[dplyr drat ggplot2 lubridate plyr randomForest RColorBrewer reshape2]; }; tatest = derive2 { name="tatest"; version="1.0"; sha256="1yd9pdpdhxwpllnj5wxa7ly29qiw8qywx9lx0w3nizczlx35fgjy"; depends=[]; }; tatoo = derive2 { name="tatoo"; version="1.1.1"; sha256="0w9rm6cnc1mpfyklb8njzjwph2c38niinzxiflrqjqfdp7nd8281"; depends=[assertthat colt crayon data_table magrittr openxlsx stringi withr]; }; tau = derive2 { name="tau"; version="0.0-21"; sha256="08wfl0pv865clpcvzmzb3rw3hl76f16n3j61fbmrzi50xf2diyx7"; depends=[]; }; tauturri = derive2 { name="tauturri"; version="0.3.0"; sha256="014301f5mzy6vblqzb61bxjv46kdynmmrxjpxyvk01w1k8wkwfcn"; depends=[httr magrittr plyr purrr tibble]; }; - tawny = derive2 { name="tawny"; version="2.1.7"; sha256="1b2v0cgkmhzxy36dcdn6hnbqk6l5ac5c3myvwryf7wlp19xi786d"; depends=[futile_logger futile_matrix lambda_r lambda_tools PerformanceAnalytics quantmod tawny_types xts zoo]; }; - tawny_types = derive2 { name="tawny.types"; version="1.1.5"; sha256="1vg0hv91dif6cfqfzrf7m1qbk57fp8v97fp88whwmvs83yd521hq"; depends=[futile_logger futile_options lambda_r lambda_tools quantmod xts zoo]; }; taxa = derive2 { name="taxa"; version="0.3.3"; sha256="11x28mxpza0cckj9cf4zizrsz87h48vlxxan8kn8lwzdpy1xn8j8"; depends=[crayon dplyr jsonlite knitr lazyeval magrittr R6 rlang stringr taxize tibble tidyr]; }; taxadb = derive2 { name="taxadb"; version="0.1.0"; sha256="0nns9jpjawla90f12gi90562llb2j0pdhwlvy62mgcg0ghr39fgr"; depends=[arkdb curl DBI dbplyr dplyr jsonlite magrittr memoise progress rappdirs readr rlang RSQLite stringi tibble]; }; taxize = derive2 { name="taxize"; version="0.9.94"; sha256="0ig8x3pkfawjk7x3hkrm4n94askhqk71sa5bbbp2l6dirqbfmism"; depends=[ape bold cli crayon crul data_table foreach jsonlite natserv phangorn R6 ritis rotl rredlist tibble wikitaxa worrms xml2 zoo]; }; @@ -14510,7 +14528,7 @@ in with self; { tbl2xts = derive2 { name="tbl2xts"; version="0.1.3"; sha256="0yy0cpsflwx7fbql3vh0l87cvqgn0ghdqal4m7l9aplqhzdwxs3r"; depends=[dplyr lazyeval PerformanceAnalytics xts zoo]; }; tbm = derive2 { name="tbm"; version="0.3-2.1"; sha256="0srdcla6m5vlid27i793yynm3r2fg3nzr7zn6j923fcmnpdg2jcg"; depends=[basefun coneproj mboost mlt sandwich variables]; }; tbma = derive2 { name="tbma"; version="0.1.0"; sha256="066p3szfayyimwblghm1lipjf21xgscq1fzbzpqz16lqjpb99ni1"; depends=[data_table ranger RcppRoll zoo]; }; - tbrf = derive2 { name="tbrf"; version="0.1.4"; sha256="11b61h8ivjcmnx6jqm6a6b3hs7pwg5plfj4rnd3s6aibjwsa6l1w"; depends=[boot dplyr lubridate purrr rlang tibble tidyr]; }; + tbrf = derive2 { name="tbrf"; version="0.1.5"; sha256="1mxfvgb18a62igdh3af4m8x6fl69s25j4x7isd70w744w6jvch3h"; depends=[boot dplyr lubridate purrr rlang tibble tidyr]; }; tcR = derive2 { name="tcR"; version="2.2.4.1"; sha256="1m68wxbxwhiadav4mfcidsa1hgwy7k9x60gfbs4zn6az9ix827m6"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; }; tcensReg = derive2 { name="tcensReg"; version="0.1.6"; sha256="052mlmkxxyqg2xm484srx2dx02bl69s6fqffwyn7758s34jwbcxl"; depends=[maxLik Rdpack]; }; tcgsaseq = derive2 { name="tcgsaseq"; version="1.8.1"; sha256="1v5b3qghygb81lqc2h1fijgw856b1778xndppq7r4b0zhhvb81ac"; depends=[CompQuadForm ggplot2 GSA KernSmooth statmod]; }; @@ -14523,6 +14541,7 @@ in with self; { tdr = derive2 { name="tdr"; version="0.13"; sha256="0i0hnb3fc4d1mbbxcpzmyfh1w2rahfjabg5iyxym3yjd6377al15"; depends=[ggplot2 lattice RColorBrewer]; }; tdsc = derive2 { name="tdsc"; version="1.0.3"; sha256="1h46cflxj27i9bkl7iqxn7kzccl9b8r3fa9f5ska3a9p57algfyv"; depends=[data_table moments]; }; tdthap = derive2 { name="tdthap"; version="1.1-11"; sha256="15qlj2bivvz3pizd8dq34wczbkbxhzqh3cqp1ixkdkprlyvcxj5k"; depends=[]; }; + tea = derive2 { name="tea"; version="1.1"; sha256="0ql7lrxk0ihm49kqsvz79ig8i54rwiy9nxav4v9hy72j9kj5bgjn"; depends=[Matrix]; }; teachingApps = derive2 { name="teachingApps"; version="1.0.4"; sha256="0wi25wdpkz7kh8r1s42wa9kiky8ilmcg8kgw0j1caygwg0bml2fa"; depends=[actuar BH d3heatmap data_table devtools diagram DiagrammeR dplyr DT dygraphs ggplot2 knitr leaflet magrittr markdown metricsgraphics miniUI networkD3 pacman plotly radarchart Rcpp RcppEigen RcppNumerical rprojroot scales shiny shinyAce shinydashboard shinythemes threejs tidyr visNetwork yaml]; }; tealeaves = derive2 { name="tealeaves"; version="1.0.0"; sha256="0hzih93h8c9gqvsmfaldq9jaw8hgvd4kmrlqlaqr6xhi6zhjqhf1"; depends=[crayon dplyr furrr future ggplot2 glue magrittr purrr rlang stringr tidyr units]; }; teamcolors = derive2 { name="teamcolors"; version="0.0.4"; sha256="0mqrjnkpxzv7armgbl9nwz42pjb9l94yml5lp41rhjj9414b2729"; depends=[dplyr ggplot2 tibble tidyr]; }; @@ -14553,7 +14572,7 @@ in with self; { tergmLite = derive2 { name="tergmLite"; version="2.1.7"; sha256="0djf7k0svdq4bnc84zxmxjns2fqggf0bs4h59jcl0yc36ka9k94n"; depends=[ergm network Rcpp statnet_common tergm]; }; term = derive2 { name="term"; version="0.1.0"; sha256="16nphv6kysjjd523ypwdsw6f7l4zvqa6z62012lv71wdkhkfvgnr"; depends=[chk lifecycle]; }; ternvis = derive2 { name="ternvis"; version="1.2"; sha256="057i6i3ygxrin0npc18gsg3dpdldzafyb5sr6lix5mhy6b09lkxf"; depends=[dichromat maps quadprog]; }; - terra = derive2 { name="terra"; version="0.5-2"; sha256="1zc2j5a3jgv8ld1wrqq03yllddyq1ljvnyq71ivcj8y6bc4alqma"; depends=[raster Rcpp]; }; + terra = derive2 { name="terra"; version="0.5-8"; sha256="0m2bfbjs4gz9mqzrris15b2p8mnb5skr96mpha7jkz3h9ybyzxm9"; depends=[raster Rcpp]; }; tesseract = derive2 { name="tesseract"; version="4.1"; sha256="1a7cf48n7hdd6inqz23ifqhq6kx6wxri34a79ns2vxaj6f4llxf0"; depends=[curl digest pdftools rappdirs Rcpp]; }; test2norm = derive2 { name="test2norm"; version="0.1.1"; sha256="11by5a1j6613akxj1nc16r07jfwxr1izkpvymr9yycnddiqyp42c"; depends=[mfp]; }; testDriveR = derive2 { name="testDriveR"; version="0.5.1"; sha256="0wjdqvsyv33fsg1lljp9m0bhz38mpfgpgickgj4zdspc9x6lbnv6"; depends=[]; }; @@ -14565,12 +14584,12 @@ in with self; { testforDEP = derive2 { name="testforDEP"; version="0.2.0"; sha256="1mgzhj8b35r5cm4bl0nnyxj0h7rwd28d17qvgvaky2kvm2r83cf9"; depends=[Hmisc minerva Rcpp]; }; testit = derive2 { name="testit"; version="0.11"; sha256="13iq4p8xzng88miizf04yv6z8vk7zhg1c8kd2h6swcmhqzq29yqj"; depends=[]; }; testthat = derive2 { name="testthat"; version="2.3.2"; sha256="0v70v2fs0f2ir962z9csbjlj8snrq9mbjfyhhb9dhz3zy26qs9hs"; depends=[cli crayon digest ellipsis evaluate magrittr pkgload praise R6 rlang withr]; }; - testthis = derive2 { name="testthis"; version="1.1.0"; sha256="1ci7q25f8lq7mvigdj48gvpi75j08s0kll72kwa88xyfx9q8m3yl"; depends=[assertthat devtools fs magrittr pkgload rprojroot stringi testthat usethis]; }; + testthis = derive2 { name="testthis"; version="1.1.1"; sha256="0csragn695698dpkr9d3md0g81bzpy5mybd0jik669q9cs8sdzh2"; depends=[assertthat devtools fs magrittr pkgload rprojroot stringi testthat usethis]; }; tetraclasse = derive2 { name="tetraclasse"; version="0.1.21"; sha256="1cl2cah0xi6x3rvvdy56iszai6rkbxc1w3x13v0l1z1nryff7c6a"; depends=[dplyr FactoMineR ggplot2 ggrepel magrittr reshape2 tibble tidyr]; }; texPreview = derive2 { name="texPreview"; version="1.4.4"; sha256="1a80ld5j7419nqxvg1nq0kiv7ls262n6bk6pkj3cyqjq6z2y01j0"; depends=[base64enc details fs htmltools knitr lifecycle magick magrittr rematch2 rstudioapi svgPanZoom whisker xml2]; }; texmex = derive2 { name="texmex"; version="2.4.5"; sha256="13wsrp418cgvma7a7hfhbs6ywp3j1j2sig7x60zh8v29pjcxic2n"; depends=[ggplot2 mvtnorm Rcpp]; }; texreg = derive2 { name="texreg"; version="1.36.23"; sha256="0yxaqimd7cyfrfpia6fnqm15lgs0bf5zyjzmnfm1v4qmf8kj8x6v"; depends=[]; }; - text_alignment = derive2 { name="text.alignment"; version="0.1.0"; sha256="0gss64x3z7n5jpqp4ypsrmkamcd1c7jknysmndsxqs35p2ansppn"; depends=[Rcpp]; }; + text_alignment = derive2 { name="text.alignment"; version="0.1.1"; sha256="0gf4rpk6l77v9fl7pbmyzq1jmb9kmzzdrpr8bsq05n9vv5lhaqqf"; depends=[Rcpp]; }; text2speech = derive2 { name="text2speech"; version="0.2.10"; sha256="08sg17avqdb7wl68hc6caljwsv4wziw7w0csc8ga4k7bh7r53h8l"; depends=[aws_signature dplyr googleAuthR googleLanguageR httr knitr magrittr mscstts tuneR]; }; text2vec = derive2 { name="text2vec"; version="0.6"; sha256="0r75cv77x2zm1z66s95hic71dpbqmybz39n48q6mz7gfd3m7312y"; depends=[data_table digest lgr Matrix mlapi R6 Rcpp rsparse stringi]; }; textTinyR = derive2 { name="textTinyR"; version="1.1.3"; sha256="0z9k978yk54zxrrjajcb0nanfhfpxm2bq2vbmk6w5s194da6y3xl"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; }; @@ -14583,14 +14602,13 @@ in with self; { textile = derive2 { name="textile"; version="0.1.2"; sha256="067zli6sl7bp9843spgx47hmw55aq61yinqw1lqifmrpk7b0ywk5"; depends=[]; }; textir = derive2 { name="textir"; version="2.0-5"; sha256="0ban5qiinlxizqpcgafv4b5gwxlil6jdfarjd6l1m48awxh3mlnb"; depends=[distrom gamlr Matrix]; }; textmineR = derive2 { name="textmineR"; version="3.0.4"; sha256="1388blqxziqzjipys6icdifnnzgxvm0w3yr9jihl32ldd701rvvw"; depends=[gtools magrittr Matrix Rcpp RcppArmadillo RcppProgress RSpectra stopwords stringr text2vec]; }; - textmining = derive2 { name="textmining"; version="0.0.1"; sha256="16wiykhrjs4djwa7q2wm4g8b3mrhh6hq9d9876w1j7c2s6zx69gd"; depends=[caret dplyr koRpus mallet networkD3 NLP rJava slam SnowballC stylo tm topicmodels wordcloud]; }; textometry = derive2 { name="textometry"; version="0.1.4"; sha256="17k3v9r5d5yqgp25bz69pj6sw2j55dxdchq63wljxqkhcwxyy9lh"; depends=[]; }; textrank = derive2 { name="textrank"; version="0.3.0"; sha256="1sjzllz3ixxr043hbmbvwkwvj5wzh3m08x9z7h6hvy8ld8nzmn74"; depends=[data_table digest igraph]; }; textreadr = derive2 { name="textreadr"; version="0.9.0"; sha256="04nyjrfxgwq8g3bdj12nnkia2xn2zngk1rprlkpyicrisgq36agk"; depends=[antiword curl data_table pdftools readxl rvest striprtf textshape xml2]; }; - textrecipes = derive2 { name="textrecipes"; version="0.1.0"; sha256="05ib5j1bphninc2v0bpaxdn2bnkj5ak6ldm6z3dvj7gmxk7p5cjc"; depends=[dplyr generics magrittr Matrix purrr recipes rlang SnowballC stopwords stringr tibble tidyr tokenizers]; }; + textrecipes = derive2 { name="textrecipes"; version="0.2.0"; sha256="1wibykc1ix2l6wimczqi30z63cidvpq2b5hfj6irf2myhbz5cyv2"; depends=[dials dplyr generics magrittr Matrix modeldata purrr Rcpp recipes rlang SnowballC stopwords stringr tibble tidyr tokenizers vctrs]; }; textreg = derive2 { name="textreg"; version="0.1.5"; sha256="0h44z5hyndnvzd9axix7gpmhbdx347dfgxw9r8w38kyw6dklbjy6"; depends=[NLP Rcpp tm]; }; textreuse = derive2 { name="textreuse"; version="0.1.4"; sha256="0qfp7ffzb5p3k3wiw8i1zjskni8f38rzkjnss97j9f3vhhb8j4r7"; depends=[assertthat BH digest dplyr NLP Rcpp RcppProgress stringr tidyr]; }; - textshape = derive2 { name="textshape"; version="1.6.0"; sha256="1pl85wjq5rl25gdlh4cp0l14hn76rrmpl7l1fn7kq9lwj9yfpcs8"; depends=[data_table slam stringi]; }; + textshape = derive2 { name="textshape"; version="1.7.1"; sha256="02111kj3kka84mpx7s19bjna9cas8diw5fxz51v5ggz0ldswa5pa"; depends=[data_table slam stringi]; }; textstem = derive2 { name="textstem"; version="0.1.4"; sha256="1pbhi5ia3w16vsix2x3if51zd2v9bcv0j4lj9hfikgq1yz9zxmw2"; depends=[dplyr hunspell koRpus koRpus_lang_en lexicon quanteda SnowballC stringi textclean textshape]; }; textutils = derive2 { name="textutils"; version="0.2-0"; sha256="06w0d12l7g4z3m278x5ap0jxm2y1h6ssj4igfcxk7j8k5hy89l80"; depends=[]; }; tfCox = derive2 { name="tfCox"; version="0.1.0"; sha256="06mbiz1jwp8mv5dbwyvdvy1wpp8s3xp9hhsm94vrbvjaxg680g28"; depends=[Rcpp survival]; }; @@ -14614,12 +14632,11 @@ in with self; { thankr = derive2 { name="thankr"; version="1.0.0"; sha256="089ikp85d5ia6a1qzmw8dkgcmz628cibmwfzcpk7m3ii8acxq91w"; depends=[]; }; thectar = derive2 { name="thectar"; version="1.0.0"; sha256="1qh0qzg0ybb38kzm56xxlvhm201pdjm16aky5f1fdflcsszgy8mx"; depends=[proxy smacof]; }; theiaR = derive2 { name="theiaR"; version="0.3.0"; sha256="0z3i6dgf2mv954llb6vk6g09gdk1hi0fjygk09jp8p9cygn7r941"; depends=[askpass httr R6 raster XML]; }; - themetagenomics = derive2 { name="themetagenomics"; version="1.0.0"; sha256="1wchvbqlp6kkpahqdrc52pjn79c9xkr6qzfm6vpzc07lp6l05iji"; depends=[ggplot2 lda lme4 Matrix plotly Rcpp rstan scales shiny stm]; }; + themetagenomics = derive2 { name="themetagenomics"; version="1.0.1"; sha256="09hr351s5qqmiyv77fbf71yp2jx7b00s1j2afss3rbrvmcznkdma"; depends=[ggplot2 lda lme4 Matrix plotly Rcpp rstan scales shiny stm]; }; themis = derive2 { name="themis"; version="0.1.0"; sha256="1hsrm8z9fh8smzw9yda8j32zq9warnpy6rihyni0zwchgp3iyawq"; depends=[dials dplyr generics purrr RANN recipes rlang ROSE tibble tidyselect unbalanced withr]; }; thermocouple = derive2 { name="thermocouple"; version="1.0.2"; sha256="1rlvhw3i83iq1vibli84gj67d98whvgkxafwpmisva1m4s1bmij4"; depends=[]; }; - theseus = derive2 { name="theseus"; version="0.1.0"; sha256="1f6vl0m8fcchafn78vrfw610d0sp9rf8kd3q5n7b0zd2yby10dq0"; depends=[dplyr ggplot2 gridExtra magrittr phyloseq ShortRead splancs tidyr tidyverse vegan viridis]; }; thgenetics = derive2 { name="thgenetics"; version="0.4-2"; sha256="1314gry3xs9v4jy13g08q16qy4ax3s0bc7d74gi0wbpkgdrk3lql"; depends=[]; }; - thickmatch = derive2 { name="thickmatch"; version="0.3.0"; sha256="0j5wajrc0ngmal01hnfw6vbqvmnqfrgii68ws8ypig934h2kv05g"; depends=[DiPs liqueueR mvnfast plyr rcbalance]; }; + thickmatch = derive2 { name="thickmatch"; version="0.3.1"; sha256="0q7wpilbk8jm3q7m5hb114jpbv4ri1745v9sbdf222l6ymds6pia"; depends=[DiPs MASS plyr rcbalance]; }; thief = derive2 { name="thief"; version="0.3"; sha256="12ymkkisg5p0g1gmvlczhp4dc7mirjg55fqqmz2d90673vlg6rfq"; depends=[forecast ggplot2 hts]; }; thinkr = derive2 { name="thinkr"; version="0.13"; sha256="1j43mjznriq8d5ki50rb41vgmzj2gq8sahvhj11742ggxd0bzvdb"; depends=[assertthat devtools dplyr ggplot2 lazyeval lubridate magrittr officer rvg stringi stringr tidyr]; }; thor = derive2 { name="thor"; version="1.1.1"; sha256="1hkv7xd633qqcgfm16ws6hn26ab0mv5gqs6n8g7cq1qv57dsqjmm"; depends=[R6 storr]; }; @@ -14633,13 +14650,12 @@ in with self; { thriftr = derive2 { name="thriftr"; version="1.1.5"; sha256="1s8fn0imja6gh5bb0h2g1pmvkwk5v0dmpml9yvcd5dhz9lxy6vdj"; depends=[R6 rly stringi]; }; thsls = derive2 { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; }; thurstonianIRT = derive2 { name="thurstonianIRT"; version="0.9.0"; sha256="0jjrdx5f581h8vh0fw4p85mlqfym467azp7cln48wzi1s28m9mn2"; depends=[BH dplyr lavaan magrittr MplusAutomation mvtnorm Rcpp RcppEigen rlang rstan rstantools StanHeaders tibble tidyr]; }; - tibble = derive2 { name="tibble"; version="3.0.0"; sha256="0s84h8ls5qwixbs1n5safr3xqmg3p0llzdrd9sp4vs2572mwzqzi"; depends=[cli crayon ellipsis fansi lifecycle magrittr pillar pkgconfig rlang vctrs]; }; - tibbleOne = derive2 { name="tibbleOne"; version="0.1.1"; sha256="1cdk0m6g187kj836jh1n0picpaaybr5dxwiks5ppj5bpybw7x3xc"; depends=[dplyr flextable forcats glue kableExtra knitr labelled lifecycle magrittr officer purrr rlang stringr tibble tidyr tidyselect vctrs]; }; + tibble = derive2 { name="tibble"; version="3.0.1"; sha256="17m7xvn423snq9dmr0bhx42j5rbc53w1viizxx4bvq37nz7m4i8m"; depends=[cli crayon ellipsis fansi lifecycle magrittr pillar pkgconfig rlang vctrs]; }; tibbletime = derive2 { name="tibbletime"; version="0.1.3"; sha256="0p42g73cmw460v372317as50ijvsg49avg9cf222ypf1v0ls3ig1"; depends=[assertthat dplyr glue hms lifecycle lubridate purrr Rcpp rlang tibble tidyselect vctrs zoo]; }; tibbrConnector = derive2 { name="tibbrConnector"; version="1.5.1"; sha256="1r58myi7x4hqqvyrphxy4ppa1lnad6x2ginfq2j52ax53zr07ajp"; depends=[RCurl rjson]; }; tictactoe = derive2 { name="tictactoe"; version="0.2.2"; sha256="1fx8plj5zr04xwk5hfj3zqhcknidxlzya2q14cf0m3y33a86lx42"; depends=[hash]; }; tictoc = derive2 { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; }; - tidyBF = derive2 { name="tidyBF"; version="0.1.0"; sha256="1yxm0qrc0mbpidz5gdyann5xsc7arz21cfvfx29xgpgpidlgr3y8"; depends=[BayesFactor broomExtra dplyr ipmisc metaBMA rlang tibble tidyr]; }; + tidyBF = derive2 { name="tidyBF"; version="0.2.0"; sha256="0pl5h7zqs7gap4pzch0f7m58lgwdvgp0zlp6l328j3z9h46amh9y"; depends=[BayesFactor dplyr ipmisc metaBMA rlang tidyr]; }; tidyHeatmap = derive2 { name="tidyHeatmap"; version="0.99.9"; sha256="04vx1ck1s6v4fzxxd4cpm5z3f0dzx3b9262xabnq75swng90w03r"; depends=[circlize ComplexHeatmap dplyr magrittr purrr RColorBrewer rlang tidyr viridis]; }; tidyLPA = derive2 { name="tidyLPA"; version="1.0.6"; sha256="1c3v7zljs6isbxzmyqx065pb31hl15sma00wh7pv3wgzacibbgmx"; depends=[dplyr ggplot2 gtable mclust mix MplusAutomation tibble]; }; tidyMicro = derive2 { name="tidyMicro"; version="1.43"; sha256="1y399khg85979lh9s528y5qab711qybd1vfw5kvyy7253ikmcb3p"; depends=[ade4 broom car cowplot dplyr Evomorph factoextra ggplot2 ggrepel gridExtra latex2exp lme4 lsr magrittr MASS Matrix plotly plyr png purrr rlang scales scatterplot3d shapes stringr ThreeWay tibble tidyr tidyverse vegan VGAM]; }; @@ -14655,14 +14671,15 @@ in with self; { tidycwl = derive2 { name="tidycwl"; version="1.0.4"; sha256="1f3lrdl73lx0a0y6kz33i6s8nkcwdjdmc6mvnkqp3n8r851q46lg"; depends=[dplyr htmlwidgets jsonlite magrittr visNetwork webshot yaml]; }; tidydice = derive2 { name="tidydice"; version="0.0.6"; sha256="1g0x426gri1s0fyn2srl7ni0zvrnx1wvg5zcr19fxgdw9m8rxxp2"; depends=[assertthat dplyr ggplot2 magrittr purrr tibble]; }; tidyfast = derive2 { name="tidyfast"; version="0.2.1"; sha256="1bfs2wma705nx1lpndq75ama5dr9kkg8hwpklb20csnccnfrlvf6"; depends=[data_table Rcpp]; }; - tidyfst = derive2 { name="tidyfst"; version="0.9.4"; sha256="1nq37pa1hn2m9ijfd8c3h3h2d4vhcjhzyhspvm5xkm9r0cbgxwl3"; depends=[data_table fst stringr]; }; + tidyfst = derive2 { name="tidyfst"; version="0.9.5"; sha256="0dl7s04s1vgssvay05sjlp4z2ccivzjspqd7wvv50ncv5zrnlw8s"; depends=[data_table fst stringr]; }; + tidyft = derive2 { name="tidyft"; version="0.4.5"; sha256="0l6ixaqj356q319ms0bf655f530cgiia9saqdx9lryaf0b6i2hxb"; depends=[data_table fst stringr]; }; tidygapminder = derive2 { name="tidygapminder"; version="0.1.1"; sha256="1m6bynwnw1msrzvdmy12w3ympinqpd8j3may3rwmg9941nndjv2d"; depends=[data_table dplyr readxl tidyr]; }; tidygenomics = derive2 { name="tidygenomics"; version="0.1.2"; sha256="1cnwmmmzp9kg4k7iy2kgb22bdllpnz257pv1ahy3l11zy6bl48fc"; depends=[dplyr fuzzyjoin IRanges purrr Rcpp rlang tidyr]; }; tidygeocoder = derive2 { name="tidygeocoder"; version="0.2.5"; sha256="03zrl7zvwpcir44a5f2mixyd35rcyx8fpq7fjybb5z0bky068ir4"; depends=[dplyr httr jsonlite purrr rlang stringr tibble tidyr tmaptools]; }; tidygraph = derive2 { name="tidygraph"; version="1.1.2"; sha256="1zpsarm74afbc7p5dlyb0whc09670qdcddw1ckb25cfc9hfh0hjn"; depends=[dplyr igraph magrittr pillar R6 Rcpp rlang tibble tidyr]; }; tidyhydat = derive2 { name="tidyhydat"; version="0.5.0"; sha256="0bf8rnk0yhdjjs79d4s833z9j165cwvg3xdmqg3kc5yzc31m4hsg"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr rlang RSQLite tidyr]; }; tidyjson = derive2 { name="tidyjson"; version="0.2.4"; sha256="1nbg7wg8r38ydvcp3kbxmmnayxrdkl3p7x0fjxny3bj9a0fp99y7"; depends=[assertthat dplyr jsonlite magrittr purrr tibble tidyr]; }; - tidylog = derive2 { name="tidylog"; version="1.0.0"; sha256="12civvsgj9d7ligc84sqii6a8q3ll12b8xs99f6rqp4nhzhpavv3"; depends=[clisymbols dplyr glue tidyr]; }; + tidylog = derive2 { name="tidylog"; version="1.0.1"; sha256="1plhzspwbc1p8hh1a3nkil63mfp740zvlsrfpdq5db3ja2jqz680"; depends=[clisymbols dplyr glue tidyr]; }; tidymodels = derive2 { name="tidymodels"; version="0.1.0"; sha256="1bi5vh80f6f2ibhyaapgnl7q1mkkx8425vj6ci0ml5rb7l8jhjm8"; depends=[broom cli crayon dials dplyr ggplot2 infer magrittr parsnip pillar purrr recipes rlang rsample rstudioapi tibble tidyposterior tidypredict tidytext tune workflows yardstick]; }; tidymv = derive2 { name="tidymv"; version="2.2.0"; sha256="0g550b0frgk4wy3sicsqqinffrlbqzghhcnvh3snci6xd7j37hmm"; depends=[dplyr ggplot2 itsadug magrittr mgcv rlang tibble tidyr]; }; tidync = derive2 { name="tidync"; version="0.2.3"; sha256="1wjw3fmyj8f95f94zai58h8b6h0vqqlrw4c629jjgg8ayy7aay9p"; depends=[dplyr forcats magrittr ncdf4 ncmeta purrr rlang RNetCDF tibble tidyr]; }; @@ -14679,8 +14696,9 @@ in with self; { tidystopwords = derive2 { name="tidystopwords"; version="0.9.0"; sha256="1zw6rz8fs8mynaqhrxidrar8vyiq73i8hl4h2lrfz83rxrihbq39"; depends=[dplyr stringr]; }; tidystringdist = derive2 { name="tidystringdist"; version="0.1.4"; sha256="1srxh5gyspcghzvnmpyq36ky608ipf71vv0s1jg01mgf2i5pdkf4"; depends=[attempt rlang stringdist tibble]; }; tidytable = derive2 { name="tidytable"; version="0.4.0"; sha256="16svngicns9xwkp1i16c1sd34p1w4np3nfd71pbz1b9w69pzc077"; depends=[data_table magrittr rlang]; }; - tidytext = derive2 { name="tidytext"; version="0.2.3"; sha256="12q6f7z3lzjgzmz5scp5jx89r2xkbvm20dc99kma9ddvbj7zj0y1"; depends=[dplyr generics hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; }; - tidytidbits = derive2 { name="tidytidbits"; version="0.2.1"; sha256="1hyqk8p4w1mjk9f497f2lh8hlic6fs37jnawqpfmrl39ylx4z6r7"; depends=[dplyr extrafont forcats magrittr purrr rlang stringr tibble tidyr tidyselect]; }; + tidytext = derive2 { name="tidytext"; version="0.2.4"; sha256="0gck3f039qkpkwn92jlyfan76w0xydg17bh6nsg9qlba7c35kzs6"; depends=[dplyr generics hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; }; + tidytidbits = derive2 { name="tidytidbits"; version="0.2.2"; sha256="1wy1bnfz7jkp357a2d916dmiw36jdqfnkvdg1fa19w8r7zzgrz7d"; depends=[dplyr extrafont forcats magrittr purrr rlang stringr tibble tidyr tidyselect]; }; + tidytransit = derive2 { name="tidytransit"; version="0.7.1"; sha256="1n1m67yvlk6fnls5hah43ycvwqvw3c4v6xhmmx06zr92r3lr7xql"; depends=[assertthat data_table digest dplyr hms httr lubridate readr rlang sf tibble tidyr zip]; }; tidytree = derive2 { name="tidytree"; version="0.3.3"; sha256="05b53dap0f784kl6s1wgck6m7brwmy6ifqp7v5l06s1spfspagl6"; depends=[ape dplyr lazyeval magrittr rlang tibble]; }; tidyverse = derive2 { name="tidyverse"; version="1.3.0"; sha256="02gyys08qv2v4cl2d66gml4d31ipxay0iyfwwksvxyclx60wp2kd"; depends=[broom cli crayon dbplyr dplyr forcats ggplot2 haven hms httr jsonlite lubridate magrittr modelr pillar purrr readr readxl reprex rlang rstudioapi rvest stringr tibble tidyr xml2]; }; tidyvpc = derive2 { name="tidyvpc"; version="1.0.0"; sha256="1f5ca0cbb3fwsdmb4zvgf8aglajmvks9jqidnx28ppy5w9qv1skc"; depends=[data_table magrittr quantreg rlang]; }; @@ -14713,7 +14731,7 @@ in with self; { timereg = derive2 { name="timereg"; version="1.9.4"; sha256="0jxm3h2sjc83klxdry5r1wgliadk6967cmiifycfpz282vpfxx7v"; depends=[lava numDeriv survival]; }; timesboot = derive2 { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; }; timeseriesdb = derive2 { name="timeseriesdb"; version="0.4.1"; sha256="1ghb3lg63fs9zx34l5qczv39mdccnmqzlc74l1zhb8qmsg8sm1g2"; depends=[data_table DBI jsonlite openxlsx RPostgreSQL shiny xtable xts zoo]; }; - timetk = derive2 { name="timetk"; version="0.1.3"; sha256="0p9vprknxwh5w3119dwvzl3hvckf4s3kag7gf3cyj685yv0m355c"; depends=[dplyr lazyeval lubridate padr purrr readr recipes rlang stringi tibble tidyr xts zoo]; }; + timetk = derive2 { name="timetk"; version="1.0.0"; sha256="1q8832jhzr5kan1mz1khdaw9p0yd5rii8lnibb02b3zgl2nmn8pk"; depends=[assertthat broom dplyr forcats forecast ggplot2 hms lazyeval lubridate padr plotly purrr readr recipes rlang rsample slider stringi stringr tibble tidyr timeDate xts zoo]; }; timetools = derive2 { name="timetools"; version="1.14"; sha256="13jchgd9fc8hxj74wm1kg4rwcng4yxblkq04i33djsqghgb5f9mj"; depends=[]; }; timetree = derive2 { name="timetree"; version="1.0"; sha256="1fpdp6mkwm67svqvkfflvqxn52y2041zl09rxrms28ybbd5f84c0"; depends=[phangorn XML]; }; timevis = derive2 { name="timevis"; version="0.5"; sha256="1psmnl6pkbizi2kjpaz9w32z2dkxlh4r229mfxsfqnjvf9sc34kj"; depends=[htmltools htmlwidgets jsonlite lubridate magrittr rmarkdown shiny]; }; @@ -14721,9 +14739,10 @@ in with self; { timsac = derive2 { name="timsac"; version="1.3.6"; sha256="186919qka9j3kfpdw2gbh16n48d6xgz9lfqgk4b17f1d7l72iplg"; depends=[]; }; tinsel = derive2 { name="tinsel"; version="0.0.1"; sha256="0n1x0cf4x6cq1yks0444nxd9snga4m6inc5lfvb7k96fzjb3xgbp"; depends=[]; }; tint = derive2 { name="tint"; version="0.1.2"; sha256="0afqlyi6d72x30pzzvmznz1l5pq4n30qiqa9ncbf0wjvqji7a182"; depends=[htmltools knitr rmarkdown]; }; + tinter = derive2 { name="tinter"; version="0.1.0"; sha256="02hfw2720qn70x0piahm8cy2ajsb5bqapr4vyvknm4v1yka1wmw3"; depends=[chk]; }; tinyProject = derive2 { name="tinyProject"; version="0.6.1"; sha256="0cflnfp5mib3j1y3n5yvi867h5a7z6xr6163gq9y9b6nrl2skxfk"; depends=[brew R_utils]; }; tinytest = derive2 { name="tinytest"; version="1.1.0"; sha256="1y3f0x56xagf9m5wr2b26qahww13p8i2s66yr51xy9pqxdyjh2yl"; depends=[]; }; - tinytex = derive2 { name="tinytex"; version="0.21"; sha256="088zzc2v0izbcs45p19v547pi78vkr08ibpvvi1g9bkbya4x3mq9"; depends=[xfun]; }; + tinytex = derive2 { name="tinytex"; version="0.22"; sha256="0s9f62v3ps5f8903ar6kxlf1z3b4v78vlw1nb05bq55dgj8brg3b"; depends=[xfun]; }; tiobeindexr = derive2 { name="tiobeindexr"; version="0.1.1"; sha256="09vw83hkf7lgd3xyhbmqkyv57g3dz856230xkf8630jiicfvcg3b"; depends=[rvest xml2]; }; tipom = derive2 { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; }; tippy = derive2 { name="tippy"; version="0.0.1"; sha256="0kkyi4s4ffpyjyfl89cd5y788ab1p253rx179k422y3y1z6w1md7"; depends=[htmltools htmlwidgets jsonlite shiny]; }; @@ -14734,7 +14753,7 @@ in with self; { titeIR = derive2 { name="titeIR"; version="0.1.0"; sha256="047vidn3zydbjijwgz6qm2d9j2ny8ng2sv5jzm8zb300y7k2426c"; depends=[Iso]; }; titrationCurves = derive2 { name="titrationCurves"; version="0.1.0"; sha256="0z127sihd262mdik46sq9vcf05s7jsqmkpm3p4d779viw74bl768"; depends=[]; }; tkRplotR = derive2 { name="tkRplotR"; version="0.1.2"; sha256="146jqjnbxqsph804ysd2jrcmm5qvqa7yi4f41sq0myjlkqvd6ndk"; depends=[]; }; - tkrgl = derive2 { name="tkrgl"; version="0.8"; sha256="1c5jiahqpf3nfybkzmks785dlkchjdisvknxkb0biv3xj9nzgz14"; depends=[rgl]; }; + tkrgl = derive2 { name="tkrgl"; version="0.9"; sha256="00767mxsaqkp7wsazznx6pr9dw75xmnijjqncbpavqf67g0cjinp"; depends=[rgl]; }; tkrplot = derive2 { name="tkrplot"; version="0.0-24"; sha256="04gk48vm8ilj1n3b3ir66pcfv504ra4rlgc0ll4ixbnp6w566wr8"; depends=[]; }; tlemix = derive2 { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx4c27hwxlb3c5ps65ipm6gi8v8r6spj"; depends=[]; }; tlm = derive2 { name="tlm"; version="0.1.5"; sha256="1iw08pa70nb25fnv64834s5c8vl456a2rcng7x6v9vs5q37610g6"; depends=[boot]; }; @@ -14750,7 +14769,7 @@ in with self; { tm_plugin_mail = derive2 { name="tm.plugin.mail"; version="0.2-1"; sha256="0rn8jqv622qmc0zkz534ka5qnbca2rlabxm3vjbqplr6fh1ahwb1"; depends=[NLP tm]; }; tm_plugin_webmining = derive2 { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[boilerpipeR NLP RCurl RJSONIO tm XML]; }; tm1r = derive2 { name="tm1r"; version="1.1.4"; sha256="165yn07nxywyxdd52g917rmzqyjpv6ai11fhl9g6dj163l4vcn5a"; depends=[httr jsonlite]; }; - tmap = derive2 { name="tmap"; version="2.3-2"; sha256="01v4z73xpxpg87daka2vcy1gj170qjg7qdl44vrfjrxib46cn2fa"; depends=[classInt htmltools htmlwidgets leaflet leafsync lwgeom raster RColorBrewer sf tmaptools units viridisLite]; }; + tmap = derive2 { name="tmap"; version="3.0"; sha256="0xd8kdrn1hvc9r73rjg6cjrvyprqkkriqf2fxnr8mkxv31zmmcg3"; depends=[classInt htmltools htmlwidgets leafem leaflet leafsync RColorBrewer sf stars tmaptools units viridisLite]; }; tmaptools = derive2 { name="tmaptools"; version="3.0"; sha256="0d36rv9275m32rqx259azqg55f1vpjihydhhic2bh4sjwxrbp58i"; depends=[classInt dichromat KernSmooth lwgeom magrittr raster RColorBrewer sf stars units viridisLite XML]; }; tmbstan = derive2 { name="tmbstan"; version="1.0.2"; sha256="1g4b415k36wij028xz15kwpv8hmx92kznsp231bnrprzw2vrninr"; depends=[BH Rcpp RcppEigen rstan StanHeaders TMB]; }; tmcn = derive2 { name="tmcn"; version="0.2-13"; sha256="0rf8mz6kdm83pm85kzfyzb8kd3iwaxv5bgphjpxlnq6z32m9yds7"; depends=[]; }; @@ -14770,12 +14789,11 @@ in with self; { tokenbrowser = derive2 { name="tokenbrowser"; version="0.1.4"; sha256="09bhwqqw2nr5c985ml8d6ik19r8jvxcj1l7v4xhb3y6n9k6dqxwr"; depends=[Rcpp stringi]; }; tokenizers = derive2 { name="tokenizers"; version="0.2.1"; sha256="006xf1vdrmp9skhpss9ldhmk4cwqk512cjp1pxm2gxfybpf7qq98"; depends=[Rcpp SnowballC stringi]; }; tokenizers_bpe = derive2 { name="tokenizers.bpe"; version="0.1.0"; sha256="1pwgjrzdcsafpv9rlyly6fckcjiymz0xcjm9byavj069kc4c69mi"; depends=[Rcpp]; }; - tolBasis = derive2 { name="tolBasis"; version="1.0"; sha256="0g4jdwklx92dffrz38kpm1sjzmvhdqzv6mj6hslsjii6sawiyibh"; depends=[lubridate polynom]; }; tolerance = derive2 { name="tolerance"; version="2.0.0"; sha256="001snzr2ipag3zprynydlbi9prkjzrllc054qh7m0qwkb3r19jjd"; depends=[MASS rgl]; }; toolmaRk = derive2 { name="toolmaRk"; version="0.0.1"; sha256="0pdr8lq4c11ia03v68lbfq38p3qp770mbj0nsbjsgbqi0pv9i1vx"; depends=[dplyr ggplot2 plyr reshape2]; }; tools4uplift = derive2 { name="tools4uplift"; version="0.1-1"; sha256="0difrjqgj8amc49mwh059ca9mr0z1fzy0g43vk43alsyl8lvajc4"; depends=[dplyr glmnet]; }; topicdoc = derive2 { name="topicdoc"; version="0.1.0"; sha256="0qliy6y8l09nblch1swlywam2awzwjl5xx0w8c3kiz48jxfysw0j"; depends=[slam topicmodels]; }; - topicmodels = derive2 { name="topicmodels"; version="0.2-9"; sha256="1757r5x8bsl4dk106xg6481mvdkdz9vwg87n7rpbvdkavsvhyxs0"; depends=[modeltools slam tm]; }; + topicmodels = derive2 { name="topicmodels"; version="0.2-11"; sha256="0jmp6wva99y0w40cfw7b0faylndhjam097x36ilc4vmyczcv89lw"; depends=[modeltools slam tm]; }; topmodel = derive2 { name="topmodel"; version="0.7.3"; sha256="15w9id90d6l0i0ji3ln3sxnpispb6pgabk4waysqn0nh6y4lfdgb"; depends=[]; }; topoDistance = derive2 { name="topoDistance"; version="1.0.1"; sha256="055z3gvqlb8nyy58ix89w7miav9gj3h43a4wcfc3kagd97xc3222"; depends=[gdistance igraph plotly raster RColorBrewer scales sp]; }; topologyGSA = derive2 { name="topologyGSA"; version="1.4.6"; sha256="0vas7qab5a86jb277ql63qjvfvx7iqqbcrwky7iyr0s8p8p794ia"; depends=[fields graph gRbase qpgraph]; }; @@ -14813,7 +14831,7 @@ in with self; { trajectories = derive2 { name="trajectories"; version="0.2-1"; sha256="0sw1gcwmz2d27ck8gm5xa9bmmpgpy483brdyi74wccchwb3nfw2m"; depends=[lattice sp spacetime zoo]; }; trajr = derive2 { name="trajr"; version="1.3.0"; sha256="1p092kqvwg3ncbk9hh8dij2grl1hfs3j5j64cqn227nr5b3xn1rc"; depends=[plotrix signal]; }; tram = derive2 { name="tram"; version="0.3-2"; sha256="043j8f2vhbm4alr47bv0ghv4358ckvd74hnlq8516b6is3ll1h72"; depends=[basefun Formula Matrix mlt multcomp sandwich survival variables]; }; - tramME = derive2 { name="tramME"; version="0.0.1"; sha256="1xsh6cm79bzxi2pw3ba5iwdr9077nssz485rpi5x451855pvbjll"; depends=[alabama basefun lme4 Matrix mlt nlme RcppEigen TMB tram variables]; }; + tramME = derive2 { name="tramME"; version="0.0.2"; sha256="1khzxjk1wp3gbhjxjlq07rmqr1rydjdbkl03fd6ld1dh1knl4bwp"; depends=[alabama basefun lme4 Matrix mlt nlme RcppEigen TMB tram variables]; }; tramnet = derive2 { name="tramnet"; version="0.0-2"; sha256="0q57cs9y0ssks7c9bbnhkvndl1yz6bsrpmcmml1nlvq2gs9rv9wg"; depends=[basefun CVXR lhs mlr mlrMBO mlt ParamHelpers sandwich smoof tram]; }; tranSurv = derive2 { name="tranSurv"; version="1.2.0"; sha256="0r698s2yg7ypyzid52a46p0bhl3xi4rh50bfnx0pacc65rigjr6f"; depends=[SQUAREM survival]; }; transcribeR = derive2 { name="transcribeR"; version="0.0.0"; sha256="0y2kxg2da71i962fhsjxsr2ic3b31fmffhj3gg97b0nykfpcviib"; depends=[httr]; }; @@ -14821,6 +14839,7 @@ in with self; { translate = derive2 { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; }; translateR = derive2 { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; }; translation_ko = derive2 { name="translation.ko"; version="0.0.1.5.2"; sha256="1w5xibg4znhd39f3i0vsqckp6iia43nblqxnzgj0ny6s7zmdq1wd"; depends=[]; }; + transmem = derive2 { name="transmem"; version="0.1.0"; sha256="1rx83cwx8mg2iyqqq2bb4yp8bpa6n6pxm6af7jkyp1gafnv7dvci"; depends=[cmna ggformula ggplot2 plot3D]; }; transplantr = derive2 { name="transplantr"; version="0.2.0"; sha256="1kzi8rvswsmibxqnhqd1j42y848si6cxd8hpvwi55y8s4hcylw0y"; depends=[]; }; transport = derive2 { name="transport"; version="0.12-2"; sha256="1d49gm5lwih7b7rav3c42brcp6xi3y55xw11r9n8illjwjayfcxd"; depends=[data_table Rcpp RcppEigen]; }; trapezoid = derive2 { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; }; @@ -14875,7 +14894,7 @@ in with self; { tropicalSparse = derive2 { name="tropicalSparse"; version="0.1.0"; sha256="1ay6i3pzz5lpvznxqln31mijp86p6z0df7rvp0gm4lxvn294m7f8"; depends=[]; }; trotter = derive2 { name="trotter"; version="0.6"; sha256="0i8r2f2klkkfnjm7jhvga3gx6m7r97pd73d88004jzlm9ficspgy"; depends=[]; }; trread = derive2 { name="trread"; version="0.2.7"; sha256="158mwnwkmwjvir8caz42jqc599xn9qkqx6bsi76m8l6szf09s0sl"; depends=[assertthat data_table dplyr here hms htmltools httr lubridate magrittr readr rlang scales stringr tibble tidyr zip]; }; - trtf = derive2 { name="trtf"; version="0.3-6"; sha256="1h90d3bpfq3nr2c44lynan1scz650nbzjry5i687wxa1c348lvb6"; depends=[Formula libcoin mlt partykit sandwich variables]; }; + trtf = derive2 { name="trtf"; version="0.3-7"; sha256="11fq119x59adls2r0af2p19zwbk5ykn5brdzqbqxy8ngmpncmzxr"; depends=[Formula libcoin mlt partykit sandwich variables]; }; truelies = derive2 { name="truelies"; version="0.2.0"; sha256="1qxzw7x7xgp9x6klnq6jv0fl8al2l24br2sd59r5gq076gkqc47k"; depends=[hdrcde]; }; trueskill = derive2 { name="trueskill"; version="0.1"; sha256="0mqvm64fcsxjlh789lqdk6l28q31yhh6jjirwjlgbpxxb90c5107"; depends=[]; }; truncSP = derive2 { name="truncSP"; version="1.2.2"; sha256="1hdi518j3sg9273g01l1jqlmqya3ppim82ma7zakwqpmsjmzw18q"; depends=[boot truncreg]; }; @@ -14953,7 +14972,7 @@ in with self; { tutorial = derive2 { name="tutorial"; version="0.4.3"; sha256="0sxdlpw0w4azlaxdlk36ycrric6pbj2zi4nyv26pgsp0cr1hrx6r"; depends=[base64enc knitr markdown rjson]; }; tuts = derive2 { name="tuts"; version="0.1.1"; sha256="0mwc6lsnhxww041wh3020wz7w812asp1d6djv4n9pl7jil0kvkry"; depends=[coda doParallel foreach lomb mcmcplots rjags truncnorm]; }; tvR = derive2 { name="tvR"; version="0.3.1"; sha256="056a241m3c1jhf8idly1bm4xja349cg5yzz19l45zyggml82snin"; depends=[Matrix Rcpp RcppArmadillo Rdpack]; }; - tvReg = derive2 { name="tvReg"; version="0.5.0"; sha256="17vbhny5dr62nwv30s15frdcdhcwk0hq7lwi3prpzyhl02bjhdyg"; depends=[bvarsv MASS Matrix plm systemfit vars]; }; + tvReg = derive2 { name="tvReg"; version="0.5.1"; sha256="18jif10pm1lsc9dwrb81cd55n6c6hdbhp01bk7q511lkzdx403hc"; depends=[bvarsv MASS Matrix plm systemfit vars]; }; tvd = derive2 { name="tvd"; version="0.1.0"; sha256="07al7gpm81a16q5nppsyc5rhv6zzkcvw72isx955b1q189v073aw"; depends=[Rcpp]; }; tvgeom = derive2 { name="tvgeom"; version="1.0.1"; sha256="1lr2vqgj5jfhzavwd43wcchhbicmf4dqjvyf66rvnjkw3jaig8dm"; depends=[]; }; tvm = derive2 { name="tvm"; version="0.4.0"; sha256="0v5b9s35q08a4z2ccph7g9q211w04x99sh72lrfby43fgl2jwyd1"; depends=[ggplot2 reshape2]; }; @@ -14993,8 +15012,8 @@ in with self; { ukbabynames = derive2 { name="ukbabynames"; version="0.1.1"; sha256="0vrwcf3hixd40ag6kb289anq2ys2k6vdhhsrjbizvndkyn8sr0r0"; depends=[]; }; ukbtools = derive2 { name="ukbtools"; version="0.11.3"; sha256="1j5p9ypn3s781582all64kvywih1ry0lqsh1zirr35g7r46fy783"; depends=[data_table doParallel dplyr foreach ggplot2 magrittr purrr readr scales stringr tibble tidyr XML]; }; ukgasapi = derive2 { name="ukgasapi"; version="0.17"; sha256="1jly1bzisvvx8pcsw0fb35xxvjgq7ydpxianf3dbxa88msdjr02d"; depends=[RCurl XML]; }; - uklr = derive2 { name="uklr"; version="1.0.0"; sha256="1c1r7d76rjh9ki2fwhv8chmhc2j5kzv3d9lv7qvr1cxyfsbxrsfb"; depends=[httr jsonlite tibble]; }; - ukpolice = derive2 { name="ukpolice"; version="0.1.2"; sha256="0jwc57360cr9fkqzs5j2jmnfagci86jzi6p5d5mpm35drsrzm1ca"; depends=[jsonlite purrr tibble]; }; + uklr = derive2 { name="uklr"; version="1.0.1"; sha256="0pr0qyf8zr8z1hzv8wziw9wddajja5dggs9cc9dw91v0kq5g5ris"; depends=[curl httr jsonlite tibble]; }; + ukpolice = derive2 { name="ukpolice"; version="0.1.4"; sha256="1ffrdl39fi5h68r1wm54q2y883ygz5lybd3jpmyd959zsj452559"; depends=[jsonlite purrr tibble]; }; ulid = derive2 { name="ulid"; version="0.3.0"; sha256="0xxkqrnlz3pkb3s1gacfzqav54w97gc0w8rh0fn1qy5rkmg2bplv"; depends=[Rcpp]; }; umap = derive2 { name="umap"; version="0.2.5.0"; sha256="0qp8zbh6fn8kn6q2h2lyjgmq3pr6gqwsd8ymqx25px13zjhxch9d"; depends=[openssl Rcpp reticulate RSpectra]; }; ump = derive2 { name="ump"; version="0.5-8"; sha256="1sg226caq9y41cwl7wr5s9z3bpq2j5p6rj6fy2pasbzimgzw0byx"; depends=[]; }; @@ -15037,7 +15056,6 @@ in with self; { updog = derive2 { name="updog"; version="1.2.0"; sha256="0q55h4rgr0hqn2fkcnd0pwmrawzcjmffvysps1cr061jd5yrzla4"; depends=[assertthat doParallel foreach ggplot2 ggthemes Rcpp RcppArmadillo reshape2 stringr]; }; uplift = derive2 { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; }; uplifteval = derive2 { name="uplifteval"; version="0.1.0"; sha256="1gnn40c47rpx40j210bz6fb48d70p6spv3drr8hd5b3vzfz6686c"; depends=[dplyr ggplot2 gridExtra whisker]; }; - upmfit = derive2 { name="upmfit"; version="0.1.0"; sha256="0f0rk606v17abgw3mwlwihl6fsxprp44h2xbhv1675i18i36vbgx"; depends=[mcmcplots R2jags]; }; uptasticsearch = derive2 { name="uptasticsearch"; version="0.4.0"; sha256="19sf3zdj424pz4ms0xg4asplf2bczvhl8p22y13jna1g51xyv92a"; depends=[assertthat data_table futile_logger httr jsonlite purrr stringr uuid]; }; uptimeRobot = derive2 { name="uptimeRobot"; version="1.0.0"; sha256="1sbr0vs6jqcyxjbs7q45bsfdnp3bc59phw0h3fwajqq1cxjgzdww"; depends=[plyr RCurl rjson]; }; uqr = derive2 { name="uqr"; version="1.0.0"; sha256="0f7isjfb5almp1zypxzw3lfkygkcixmg0xdsw0zznf61r6qhbqyr"; depends=[gtools Hmisc]; }; @@ -15051,11 +15069,11 @@ in with self; { usdm = derive2 { name="usdm"; version="1.1-18"; sha256="1sis47fri2lrbx2ll5ps7bvycjqhncnia800izf11szgayim5lrv"; depends=[raster sp]; }; usedist = derive2 { name="usedist"; version="0.4.0"; sha256="0ddf1zcalbrn293qmr9kdzz3x16fzc4k1bwb1pjmwnspisqfi8kj"; depends=[]; }; useful = derive2 { name="useful"; version="1.2.6"; sha256="0n50v1q75k518sq23id14jphwla35q4sasahrnrnllwrachl67v1"; depends=[assertthat dplyr ggplot2 magrittr Matrix plyr purrr scales]; }; - usefun = derive2 { name="usefun"; version="0.4.3"; sha256="0vsz7kmkqfffw2jh33ag6h22qclxblf04aw82ss66j8xpxmkqhs6"; depends=[]; }; + usefun = derive2 { name="usefun"; version="0.4.5"; sha256="11cvsx5rip4r7mcv3n711vylh0lzh3d6lnlcdjvfsg1sa1dbspp8"; depends=[dplyr]; }; userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.7.2"; sha256="17arxxha8qr876nrf9szpymgamxlvacj3lfbmpiv973kyi3hr7m4"; depends=[BiasedUrn car data_tree DiagrammeR digest diptest GGally ggplot2 ggrepel ggridges GPArotation gridExtra gtable knitr lavaan lme4 MASS MBESS minpack_lm pander plyr psych pwr RColorBrewer rio scales SCRT SuppDists ufs viridis XML xtable]; }; - usethis = derive2 { name="usethis"; version="1.5.1"; sha256="07an5wbikilg7cb3q6x5aykw8dfqnjrc3wpfb7gjmy0d9fh20fcy"; depends=[clipr clisymbols crayon curl desc fs gh git2r glue purrr rlang rprojroot rstudioapi whisker withr yaml]; }; + usethis = derive2 { name="usethis"; version="1.6.0"; sha256="12iyimqyza752anj29wpfisl8nz5r25kfcqbssybg24nb4wyy146"; depends=[cli clipr crayon curl desc fs gh git2r glue purrr rematch2 rlang rprojroot rstudioapi whisker withr yaml]; }; usfertilizer = derive2 { name="usfertilizer"; version="0.1.5"; sha256="05zjn39hqjjzzp4v4b1zbqq59205s7k0kikms951h57kbyvjz6vk"; depends=[tidyverse]; }; - ushr = derive2 { name="ushr"; version="0.2.2"; sha256="04j4hfwsk8idrl7c3lfcd1v7s8xxf2l0rlf2aixszsdbcfr9173n"; depends=[dplyr ggplot2 tidyr]; }; + ushr = derive2 { name="ushr"; version="0.2.3"; sha256="1ygyqgxw849165lpk81f114kgx9015b9a9dngavjy3ffqzrbb41k"; depends=[dplyr ggplot2 tidyr]; }; uskewFactors = derive2 { name="uskewFactors"; version="2.0"; sha256="0ndi5987ak8sa7krgiglsibfg0k7z9j8fg47hg1m8ar0sq4r1yj6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; }; usl = derive2 { name="usl"; version="3.0.0"; sha256="1ahry485kpzfc0pzi4zm039d5mpv1jycmhdpn0n0zn0drcrlhw0g"; depends=[nlsr]; }; usmap = derive2 { name="usmap"; version="0.5.0"; sha256="0fjmmw8xhba31gv8mx9k55881yb94z518csbqas3bvssq5s7048f"; depends=[]; }; @@ -15113,7 +15131,7 @@ in with self; { varrank = derive2 { name="varrank"; version="0.3"; sha256="0k7hz61ymxf7w2hh1v2yfb6qdjn68a8ckjfiw0jqqhjx4wh5crn7"; depends=[FNN]; }; vars = derive2 { name="vars"; version="1.5-3"; sha256="0zc6v827ll19n088n31afgjf65zqwvyzmmj4q3ab1xhqzxfsgbw6"; depends=[lmtest MASS sandwich strucchange urca]; }; varsExplore = derive2 { name="varsExplore"; version="0.1.0"; sha256="1sscz565i288nmk7sv03kj2xysfppvil4nl2lxxbvp3y4mrkz09b"; depends=[dplyr DT glue magrittr purrr rio rstudioapi stringr tidyr]; }; - varycoef = derive2 { name="varycoef"; version="0.2.10"; sha256="1gdny45zn1s492sx85aa8z86yfh2fwl9krq5kmmgxgmwy5gz0rjz"; depends=[fields optimParallel RandomFields sp spam]; }; + varycoef = derive2 { name="varycoef"; version="0.2.11"; sha256="13ccgc5dyac8224kpl5f1n6yw77m2f32amcr0h2c0z74sjwcxn54"; depends=[fields optimParallel RandomFields sp spam]; }; vaultr = derive2 { name="vaultr"; version="1.0.2"; sha256="1b7g0jplp5dw1img7d6wm75gaycb3z8a8mzc6s0iwvhbfl8vf574"; depends=[getPass httr jsonlite R6]; }; vbdm = derive2 { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; }; vbsr = derive2 { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; }; @@ -15157,11 +15175,11 @@ in with self; { vfprogression = derive2 { name="vfprogression"; version="0.7.1"; sha256="0kgw1jx0rl9v8qy8qg7zjzdgvwqdi7k1lsvsx3lnpw4sfpkzsq23"; depends=[]; }; vhcub = derive2 { name="vhcub"; version="1.0.0"; sha256="04a8hdm4pxl8fzwy9q2wqc9q0dl5r49xwbid70yj9qlflh683id0"; depends=[Biostrings coRdon ggplot2 seqinr stringr]; }; vhica = derive2 { name="vhica"; version="0.2.7"; sha256="0zz4sffhrvh9raxygxma5a2jijq8nw8wqg8bc486sd2ahlv8g3s8"; depends=[]; }; - viafr = derive2 { name="viafr"; version="0.1.0"; sha256="14y5k1vskfzxfpzjkk9602p8mvvyfrf3qpr517zdb714wv3gwk3h"; depends=[assertthat crul dplyr jsonlite magrittr purrr rlang stringr tibble tidyr utf8]; }; + viafr = derive2 { name="viafr"; version="0.2.0"; sha256="08hvylrv4c8p5vazalagbkv3vhqmr9halbxkf05kfn74ssw8lljz"; depends=[assertthat crul dplyr jsonlite magrittr purrr rlang stringr tibble tidyr utf8]; }; vici = derive2 { name="vici"; version="0.5.2"; sha256="0qad8ab04ndd29kcmd388piiymablfc7xlv6iml4sxkid7z5kgby"; depends=[cowplot DT ggplot2 ggpubr nlme shiny tidyr]; }; vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; }; viewshed3d = derive2 { name="viewshed3d"; version="3.0.0"; sha256="0yx271xx4nfxjlvrg0c5x77n6zcahmj9kvz6qpzdg3ysg4ydyika"; depends=[data_table lidR nabor pracma raster rgl sp TreeLS viridis]; }; - vimp = derive2 { name="vimp"; version="1.1.6"; sha256="1jczlg8sa62f9skn32gbc094lbm41w5hp65w1k1imqxcvb43n8ql"; depends=[SuperLearner]; }; + vimp = derive2 { name="vimp"; version="2.0.1"; sha256="0bwc4rdzdqvmhshk4l8d9x76fvd5f7g2jja182lsiz28v1jh8ga3"; depends=[dplyr magrittr rlang ROCR SuperLearner tibble]; }; vinereg = derive2 { name="vinereg"; version="0.7.0"; sha256="1fviqzs879n7rin3b0jks8dfvcxiay8jssqy7salslghpj7rkm84"; depends=[assertthat BH kde1d Rcpp RcppEigen RcppThread rvinecopulib wdm]; }; vines = derive2 { name="vines"; version="1.1.5"; sha256="057d2fdh03cq9kh4vz94arqscahmz14xbr2g59l0vn205lnyilf1"; depends=[ADGofTest copula cubature TSP]; }; violinmplot = derive2 { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; }; @@ -15182,7 +15200,7 @@ in with self; { visdat = derive2 { name="visdat"; version="0.5.3"; sha256="1ikqp29nncbw1xlwyb9dqqgcdk9q0bs3wxhnhnjpb11vcjv7cz2j"; depends=[dplyr ggplot2 glue magrittr purrr readr tibble tidyr]; }; visit = derive2 { name="visit"; version="2.1"; sha256="0kkspih7m18g5pqlwrxpgjdwqxpp23c3xyvcnvv247abl9aq81rd"; depends=[BH Rcpp RcppEigen rstan sqldf StanHeaders]; }; visreg = derive2 { name="visreg"; version="2.6.1"; sha256="01k44nxxilz7yrw5rihsg4r49yqjmz4zxmafcq89zbygap1d68ay"; depends=[lattice]; }; - vistime = derive2 { name="vistime"; version="0.9.0"; sha256="1apyjapxqm05mlr4bx7s2x5v9ji8z8jb3spkrwcs0fibd6bq1dbb"; depends=[assertive plotly RColorBrewer]; }; + vistime = derive2 { name="vistime"; version="1.0.0"; sha256="0114qgfq5ns02sgxh81cf68jx7pk74na9g10f23d6lm8jxcwdsrz"; depends=[assertive ggplot2 plotly RColorBrewer]; }; vistributions = derive2 { name="vistributions"; version="0.1.1"; sha256="1s68dpcy55v6yw7ivh2xpshz6qc0qaifjd15h7rjg3zl1cx81mh3"; depends=[ggplot2 magrittr shiny]; }; visualFields = derive2 { name="visualFields"; version="0.6"; sha256="1w6wkyzjakj6ss9nv4gzkgva4m21jbsz10c2jy660bjb25rf59ih"; depends=[deldir flip gtools Hmisc matrixStats spatstat]; }; visualize = derive2 { name="visualize"; version="4.4.0"; sha256="1k3jpvj1yysxc4g1a1w3m1y91104aqxqv8jh9qdd23gwy7a29525"; depends=[]; }; @@ -15199,7 +15217,7 @@ in with self; { volesti = derive2 { name="volesti"; version="1.0.3"; sha256="099c49dy9iqrvmrmcm6h8af4q50q6b0ymnkk0s2bzaqczbpkwibj"; depends=[BH Rcpp RcppEigen]; }; volleystat = derive2 { name="volleystat"; version="0.2.0"; sha256="0n1r0bvvmba21cs3qgpnw9jxpgl2n82fhxa40sa1w2gav5rch5i6"; depends=[]; }; voronoiTreemap = derive2 { name="voronoiTreemap"; version="0.2.0"; sha256="1wvnqdrvba4ss4f3k8gzb720irdq2brv2aaq16ywifv8fnjf02r3"; depends=[data_tree DT htmlwidgets rlang shiny shinyjs]; }; - vortexR = derive2 { name="vortexR"; version="1.1.6"; sha256="113ndhf2f3hlhmgbg6gh5fq1az6d314fwl872dwypj2zsvfm7x03"; depends=[betareg data_table GGally ggplot2 glmulti gtools irr plyr R_utils stringr vortexRdata]; }; + vortexR = derive2 { name="vortexR"; version="1.1.7"; sha256="06i2rqbc3h2kv8jjrdlrg03xrzb3yiyzpnv2rvlkjcnn46f84bgf"; depends=[betareg data_table GGally ggplot2 glmulti gtools irr plyr R_utils stringr vortexRdata]; }; vortexRdata = derive2 { name="vortexRdata"; version="1.0.5"; sha256="0b47q3aslz4110a1bfaa103i098y2ngzrjh01rwasq3gd6xbif9n"; depends=[]; }; vosonSML = derive2 { name="vosonSML"; version="0.29.4"; sha256="0ngipwg83xw832ikaaqbyh2zxkwwwxalp6xrb60dk96z2r7qgj2r"; depends=[data_table dplyr Hmisc httpuv httr igraph magrittr purrr RCurl RedditExtractoR rlang rtweet stringr textutils tibble tictoc tm]; }; vote = derive2 { name="vote"; version="1.2-1"; sha256="14bqmamndq5l7mfij8kfzk2lyrn0b52jgafgy9qb93qvk1fr5raz"; depends=[formattable knitr]; }; @@ -15239,6 +15257,7 @@ in with self; { wahc = derive2 { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3g47drhyb2b3h227cn3aakxyg"; depends=[]; }; waiter = derive2 { name="waiter"; version="0.1.0"; sha256="13csg6iy6fzr5fkz3wvmj1fvi0csijbgmvz262jnrq1c75srirmb"; depends=[magrittr R6 shiny]; }; wakefield = derive2 { name="wakefield"; version="0.3.3"; sha256="05z9a6g1cdavalp50wss7klnlcdbv3y1jvz1v8ry1x2bziy216y2"; depends=[chron dplyr ggplot2 stringi]; }; + waldo = derive2 { name="waldo"; version="0.1.0"; sha256="12405hc65mhwg69fp6m4g96zn8imx2jb9vl1pv6im0wmrqff3ay6"; depends=[cli diffobj fansi glue rematch2 rlang tibble]; }; walker = derive2 { name="walker"; version="0.3.1-1"; sha256="135x32ar8m4m4zxdz94c7wrddsb0ps58nywh2k2gh3kqjbbzxx7a"; depends=[bayesplot BH dplyr ggplot2 KFAS Rcpp RcppArmadillo RcppEigen rstan StanHeaders]; }; walkscoreAPI = derive2 { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; }; wallace = derive2 { name="wallace"; version="1.0.6.2"; sha256="0qhy1m9imwqmb6lzgx25xqqyrlja13g4l96c6q9mn008kmljpn0n"; depends=[dismo dplyr DT ENMeval leaflet leaflet_extras magrittr maptools raster RColorBrewer rgdal rgeos rmarkdown shiny shinyjs shinythemes spocc spThin testthat XML zip]; }; @@ -15272,8 +15291,8 @@ in with self; { wbsts = derive2 { name="wbsts"; version="2.0"; sha256="12k68nsrrxglrm9ik53rm8160xvjlsgzi7v4wp78jhmh2slmyxw3"; depends=[mvtnorm Rcpp wmtsa]; }; wdm = derive2 { name="wdm"; version="0.2.1"; sha256="05yc366g2lii305ljrhh9939gf8sf517alw5xcr2sdclr00qxal4"; depends=[Rcpp]; }; wdman = derive2 { name="wdman"; version="0.2.5"; sha256="1yf41lsrr9dbf5n4f5hv9mlmzl736fhnp9gxkm2g9apws6gsig02"; depends=[assertthat binman processx semver yaml]; }; - wdpar = derive2 { name="wdpar"; version="1.0.1"; sha256="0kqzizbs4bcph4vkv2v3wn6vcmdkpf9idl3wqadw805z2967ipv6"; depends=[assertthat cli countrycode curl httr lwgeom progress rappdirs RSelenium sf sp wdman xml2]; }; - weathercan = derive2 { name="weathercan"; version="0.3.3"; sha256="01hvrg2xx5nj7wspjhkwqs8lchya1ki16wj7flx1s1xzyd9n7x19"; depends=[dplyr httr lubridate purrr rlang rvest stringi stringr tidyr xml2]; }; + wdpar = derive2 { name="wdpar"; version="1.0.2"; sha256="0ybslv1vbvqskmr5s8b9ama6g30g8bjr74hir3mxdwsr4kf668sm"; depends=[assertthat cli countrycode curl httr lwgeom progress rappdirs RSelenium sf sp tibble wdman xml2]; }; + weathercan = derive2 { name="weathercan"; version="0.3.4"; sha256="1nglfmlwb3l1rlp7vgm2d77yx4fn39i8ps54v6jvsbs0p57s5xhi"; depends=[dplyr httr lubridate purrr rlang rvest stringi stringr tidyr tidyselect xml2]; }; weathermetrics = derive2 { name="weathermetrics"; version="1.2.2"; sha256="1hjhgsy3v8328hv4czxxz7kp68sxc10sy10f3dv5j8f6pka6qlsp"; depends=[]; }; weatherr = derive2 { name="weatherr"; version="0.1.2"; sha256="11sb5bmqccqkvlabsw4siy9n6ivsrvxavywvaffgrs3blmnygql9"; depends=[ggmap lubridate RJSONIO XML]; }; webTRISr = derive2 { name="webTRISr"; version="0.2.0"; sha256="10xj8qvibhnywsxd1yb4laz6b38qwn483a7bflizsndsgrbzdi5n"; depends=[dplyr httr jsonlite lubridate magrittr purrr readr sf stringr]; }; @@ -15307,7 +15326,7 @@ in with self; { wfe = derive2 { name="wfe"; version="1.9.1"; sha256="0lcg7hzdll1wqdwydkk96m4n715h8sjn3qwhabm245m0hqhdf7is"; depends=[arm MASS Matrix]; }; wfg = derive2 { name="wfg"; version="0.1"; sha256="1r6wb8v42mpapjfhmkmghm9fq21c3s4zmdxy8nlh31nsja71c37d"; depends=[igraph]; }; wfindr = derive2 { name="wfindr"; version="0.1.0"; sha256="0m5xj50hqdjj4lpbgx1kp3my4njr0nz09hd63rf4qf1ls8r7zil9"; depends=[dplyr magrittr]; }; - wflo = derive2 { name="wflo"; version="1.2"; sha256="17g60f4rs4lplawass2x6m8qj86hv5l13x94da9ff0w54dkh4qwq"; depends=[]; }; + wflo = derive2 { name="wflo"; version="1.5"; sha256="1k9iyyr15hzbsram1246zb415hgwg8kr15zp78q9b6yf3yr46kmb"; depends=[]; }; wgaim = derive2 { name="wgaim"; version="2.0-1"; sha256="1qiyfkpsbzjr9xsq5kqq6rlqpndngkn2irdfh3gyi45h6hn118j4"; depends=[ggplot2 qtl]; }; wgeesel = derive2 { name="wgeesel"; version="1.5"; sha256="0lybvsq5168cjybzv2dbyx2z8aakcx7i7ivm8zc90haiispm9n5x"; depends=[bindata CRTgeeDR geepack MASS PoisNor]; }; whatr = derive2 { name="whatr"; version="1.0.0"; sha256="0l9yvbqib2pf93dlslj5268c8l9zzywmy4kwijlvink6fasllrcn"; depends=[dplyr ggplot2 httr magrittr purrr rlang rvest scales stringr tibble tidyr xml2]; }; @@ -15323,7 +15342,7 @@ in with self; { wicket = derive2 { name="wicket"; version="0.4.0"; sha256="1lizzmj69bswzlk18fv2v4yxxc6dynvmkymdiafznzcyyz4a8xnf"; depends=[BH Rcpp]; }; widals = derive2 { name="widals"; version="0.6.1"; sha256="1094yaaq2xb0ykvc1j3hs87j1p4h7zgf8mkn4han8iw5fmr9zncy"; depends=[snowfall]; }; widgetframe = derive2 { name="widgetframe"; version="0.3.1"; sha256="0j0d73m72nzfc1wyrgsqr99ldx72adis6pd57mpim55hz0n9l224"; depends=[htmltools htmlwidgets magrittr purrr]; }; - widyr = derive2 { name="widyr"; version="0.1.2"; sha256="0mqj9w5sy8m2vqhjxmjrf68bfixbvmkigrsdzfnwvxp18hhfw5mj"; depends=[broom dplyr Matrix purrr reshape2 tidyr tidytext]; }; + widyr = derive2 { name="widyr"; version="0.1.3"; sha256="1mkgkn5lf3q9i3fhkz6v9lxl68kwhjn6bwxi3ks1v3njbsacnkay"; depends=[broom dplyr Matrix purrr reshape2 rlang tidyr tidytext]; }; wiesbaden = derive2 { name="wiesbaden"; version="1.2.2"; sha256="0zxz2cnxgx0p66ls1x2pz5i9iiv67ajm30a2n8m1alljnza6qigf"; depends=[httr jsonlite keyring readr stringi stringr xml2]; }; wikibooks = derive2 { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; }; wikifacts = derive2 { name="wikifacts"; version="0.1.0"; sha256="01mwzqign59lh7wvf8q8kwkgnfxi9nkk6n0qwfh27q64fajw8clg"; depends=[magrittr rvest xml2]; }; @@ -15340,10 +15359,9 @@ in with self; { windex = derive2 { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[ape geiger scatterplot3d]; }; windfarmGA = derive2 { name="windfarmGA"; version="2.2.3"; sha256="13jdh0c8lkc3043mnqx23s06xxkf6dvk7w9kfvwhib58rlgy0p2n"; depends=[calibrate doParallel foreach ggplot2 gstat leaflet magrittr raster RColorBrewer Rcpp rgdal rworldmap sf sp spatstat]; }; wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; }; - wiod = derive2 { name="wiod"; version="0.3.0"; sha256="1f151xmc6bm5d28w5123nm0hv7j1v8hay4jk5fk8pwn6yljl1pah"; depends=[decompr gvc]; }; wiqid = derive2 { name="wiqid"; version="0.2.3"; sha256="166d9cdrj8vz2m5n1yxhckhs9nmd3sv13c3jcifzjixl45f8f2aa"; depends=[coda HDInterval MASS truncnorm]; }; wiseR = derive2 { name="wiseR"; version="1.0.1"; sha256="187ylwhk06957x9zm5r0m6w9wg08im83myz3s4gr927ig8yv3b5f"; depends=[arules bnlearn DescTools dplyr DT graph HydeNet igraph linkcomm missRanger psych RBGL Rgraphviz rhandsontable rintrojs shiny shinyalert shinyBS shinycssloaders shinydashboard shinyWidgets visNetwork]; }; - withr = derive2 { name="withr"; version="2.1.2"; sha256="11j6zykklxnvp4xqsr6a2xib665i38m3khdspp887nwagmvnydj1"; depends=[]; }; + withr = derive2 { name="withr"; version="2.2.0"; sha256="10mmfffjbnb2zq5x0kqhhb4z6va4micc6pjzvlfji34gyhffa8ac"; depends=[]; }; wkNNMI = derive2 { name="wkNNMI"; version="1.0.0"; sha256="0qpl1b2134kz9mjl38w93lp3g6kpv9ygv9hygpssm845k02hkw7c"; depends=[foreach infotheo]; }; wkb = derive2 { name="wkb"; version="0.4-0"; sha256="0mah538345npkb06bcj18mb6qnnx8nn7bdqmvqqpbawallh546a9"; depends=[sp]; }; wktmo = derive2 { name="wktmo"; version="1.0.5"; sha256="05pjyk0xsdazbi1x7xfmg097ybybd60zmzzm7sch1ikp05hzn0wb"; depends=[]; }; @@ -15377,10 +15395,10 @@ in with self; { wpp2015 = derive2 { name="wpp2015"; version="1.1-2"; sha256="07bnbmrshlqnlpca5djpq5crnpsmz228wmbpv1ah7ywnjvks6fyx"; depends=[plyr]; }; wpp2017 = derive2 { name="wpp2017"; version="1.2-3"; sha256="1w7cg31larvgaah16ch6z11jjq02i5f20hfwg63wvw5p6fyafivz"; depends=[data_table]; }; wpp2019 = derive2 { name="wpp2019"; version="1.1-1"; sha256="03c0ybk1m8lr6dxckm1950h617yhphgxsg01qj5ywbcm7rpvw1a0"; depends=[data_table]; }; - wppExplorer = derive2 { name="wppExplorer"; version="2.3-3"; sha256="0sz31xsdlk9p52sl5dik7g0qmkrjb7ydkknd154c988kqb5gbp0w"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny shinyjs shinythemes wpp2019]; }; + wppExplorer = derive2 { name="wppExplorer"; version="2.3-4"; sha256="1pbmjg6y543aih8mxf9njfwpm090virhgqf8w0a5yx0jdfjwmz04"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny shinyjs shinythemes wpp2019]; }; wql = derive2 { name="wql"; version="0.4.9"; sha256="0m16l807mhcjkbqhlzhc24pw4hl78fjyykiszlg337x3qs803fg2"; depends=[ggplot2 reshape2 zoo]; }; wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; }; - wrMisc = derive2 { name="wrMisc"; version="1.1.0"; sha256="10cg4l963aabynic25m6k3sp69d6amhkpqv5x5m38nidy4855jzb"; depends=[MASS]; }; + wrMisc = derive2 { name="wrMisc"; version="1.2.0"; sha256="1fv4bmzi00492s8mln79dsyil7phrrhkd028nc6zi050ssy9ggsi"; depends=[MASS]; }; wrProteo = derive2 { name="wrProteo"; version="1.0.0"; sha256="110rpwac6hccv8i55fdw3mzd500jip1ldzmqw4196igq61cd9m20"; depends=[limma wrMisc]; }; wrangle = derive2 { name="wrangle"; version="0.5.2"; sha256="1b6qgwdjvwbrarp9ylgkb5ia1p5a5g7ws0jyqrwc6hii8z5yj2qb"; depends=[dplyr lazyeval magrittr rlang tidyr]; }; wrapr = derive2 { name="wrapr"; version="2.0.0"; sha256="15171m6bljlmbzds24sy5z8spx8la5ahg1i49i8yghymkp6vvslw"; depends=[]; }; @@ -15399,29 +15417,29 @@ in with self; { wv = derive2 { name="wv"; version="0.1.1"; sha256="06xf3c97pjhln1v31waj8rmp4r0y2kp6v2x10pbpvi8m0nf5zfs1"; depends=[coda Rcpp RcppArmadillo simts]; }; wvtool = derive2 { name="wvtool"; version="1.0"; sha256="0x9awj6g5lzqp2lhwgh9ib7jmfdzyhwazrjvw1vwacqqfhbz8qxv"; depends=[]; }; wwntests = derive2 { name="wwntests"; version="1.0.0"; sha256="1wsqbhsnzkishqwxz5kjcb5xawafizi3ip4yzxj05p9rx9wja1yc"; depends=[ftsa MASS rainbow sde]; }; - wyz_code_metaTesting = derive2 { name="wyz.code.metaTesting"; version="1.1.11"; sha256="1misp5yc015himyd0qniwz1b7fh6x74pw7si5c4gh18brwszycpw"; depends=[crayon data_table lubridate tidyr wyz_code_offensiveProgramming]; }; - wyz_code_offensiveProgramming = derive2 { name="wyz.code.offensiveProgramming"; version="1.1.17"; sha256="00s8dzk86r3iaxvihzpgi550ljqy38sdlma7gvvb2mma6xa114i5"; depends=[crayon data_table lubridate R6 stringr tidyr]; }; - wyz_code_rdoc = derive2 { name="wyz.code.rdoc"; version="1.1.15"; sha256="08f3c9wnlwwv6lhzhl9aljwnqmz0hrf7j2hrd90wa6m31aaks7dj"; depends=[crayon data_table digest lubridate R6 stringr tidyr wyz_code_offensiveProgramming]; }; - wyz_code_testthat = derive2 { name="wyz.code.testthat"; version="1.1.16"; sha256="06xbhk5b0r8y98xl0lab5cndlhv3a9dvbhrnld39mhq1wwryx2sh"; depends=[data_table lubridate R6 tidyr wyz_code_offensiveProgramming]; }; + wyz_code_metaTesting = derive2 { name="wyz.code.metaTesting"; version="1.1.12"; sha256="17fmbym4kxxnygn91da2crxsq8kqh6sj5pzm197l202av0r9pvjd"; depends=[crayon data_table lubridate tidyr wyz_code_offensiveProgramming]; }; + wyz_code_offensiveProgramming = derive2 { name="wyz.code.offensiveProgramming"; version="1.1.18"; sha256="14wk0hjysz8ravwsmiki7dyllkbygq0l5mg516rbbf0wfq5zl7nl"; depends=[crayon data_table lubridate R6 stringr tidyr]; }; + wyz_code_rdoc = derive2 { name="wyz.code.rdoc"; version="1.1.16"; sha256="1f8yd1pkk9aamsx2x59jpa5jgq03hnbf9zrs1ah010sn3l51v1yr"; depends=[crayon data_table digest R6 stringr tidyr wyz_code_offensiveProgramming]; }; + wyz_code_testthat = derive2 { name="wyz.code.testthat"; version="1.1.17"; sha256="1hl6gqxpxa3fyzc01i37g9il4vc6z339iir4228yz7ky1x85xjna"; depends=[data_table lubridate R6 tidyr wyz_code_offensiveProgramming]; }; x_ent = derive2 { name="x.ent"; version="1.1.7"; sha256="15qra77dqhj27g3qx92gram4mq4n9fdidygdpvxfmcx7ww3vc6yh"; depends=[ggplot2 jsonlite statmod stringr xtable]; }; x12 = derive2 { name="x12"; version="1.9.0"; sha256="0hrcw1d52yp5rr4r120lcnfxw2rgs95njg37m28blcnfbq2flfc2"; depends=[stringr x13binary]; }; x12GUI = derive2 { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[cairoDevice Hmisc lattice RGtk2 stringr x12]; }; x13binary = derive2 { name="x13binary"; version="1.1.39-2"; sha256="1if8yayvn6rr98gwp0ypmlk3d9fjf0b9kxir2iwha506aslq70xp"; depends=[]; }; x3ptools = derive2 { name="x3ptools"; version="0.0.2"; sha256="1a3vdljd51kvd70mq9cr84r536zmby7vkd36a02z2sxabq03cl9s"; depends=[assertthat digest png rgl xml2 zoo]; }; xLLiM = derive2 { name="xLLiM"; version="2.1"; sha256="1q6ryw9z5wi0amv5f4drz14p36zy8gc2a0s59q10jixhhyas7ycl"; depends=[abind capushe corpcor igraph MASS Matrix]; }; - xROI = derive2 { name="xROI"; version="0.9.13"; sha256="0687cg113ykslsky1lln2mf097flzjkpyw0hvgzd9dzqc14vpzki"; depends=[colourpicker data_table jpeg lubridate moments plotly raster RCurl rgdal rjson shiny shinyAce shinyBS shinydashboard shinyFiles shinyjs shinythemes shinyTime sp stringr tiff]; }; xRing = derive2 { name="xRing"; version="0.1.0"; sha256="17f1jif8yw2508k86p8mjgw1h20ml5wzaff04ix9xq96plqzi8ma"; depends=[dplR imager tcltk2 tkRplotR]; }; xSub = derive2 { name="xSub"; version="2.0.2"; sha256="00mahp8fi6iskjaf5nwka67a7hqb3i08j8yrd4d2av39zfs268h2"; depends=[countrycode haven RCurl]; }; xVA = derive2 { name="xVA"; version="0.8.1"; sha256="0wr4i37sya5gg6v63ka16g9077gxbhvjqyqfaahhban8skzl2adf"; depends=[SACCR Trading]; }; xaringan = derive2 { name="xaringan"; version="0.16"; sha256="1jdj8qkadb09x7kvf93h4mp8gxk6lda8aspldhdki9qqpdc78gc8"; depends=[htmltools knitr rmarkdown servr xfun]; }; xbreed = derive2 { name="xbreed"; version="1.0.1.1"; sha256="032i04ginyf9dyabfkygnhrkq7lqdvvyw7s41vjimy2kvjrnkkkx"; depends=[BGLR]; }; xdcclarge = derive2 { name="xdcclarge"; version="0.1.0"; sha256="1j8wsidwmfjygqlwavxinv4bqc6rddy42jdmlknsjfrrs49yj8kn"; depends=[nlshrink Rcpp RcppArmadillo]; }; + xergm_common = derive2 { name="xergm.common"; version="1.7.8"; sha256="03mjpafwfkmyj5ba84jydap9rp0i602izjlbd511xbxcw6dx2k0b"; depends=[ergm network]; }; xesreadR = derive2 { name="xesreadR"; version="0.2.3"; sha256="1pvdx0mxg2f885bhy4hb3kqzcgva4q7hzzaipkfzyi5lnjdsbc81"; depends=[bupaR data_table dplyr lubridate purrr stringr tidyr XML xml2]; }; - xfun = derive2 { name="xfun"; version="0.12"; sha256="0sgh8kafi9x1glmmcp1ly827pm8q7fsfngbplr41fbb4nc9363df"; depends=[]; }; + xfun = derive2 { name="xfun"; version="0.13"; sha256="03iyqgx9mmdbd3qih70qzijjqcdg7k7ps5r1y6q8praanx9qvnm3"; depends=[]; }; xgb2sql = derive2 { name="xgb2sql"; version="0.1.2"; sha256="1gw5dw0ck5hip8mv347zaswrggk395bg2hgn02bvqs0d31jhmgvi"; depends=[data_table xgboost]; }; xgboost = derive2 { name="xgboost"; version="1.0.0.2"; sha256="1ld2w51c5fy3bl0kvjn1iplffc4lmin9s9zz5xx7xsm44d6j6kzd"; depends=[data_table magrittr Matrix stringi]; }; xgobi = derive2 { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; }; - xgxr = derive2 { name="xgxr"; version="1.0.7"; sha256="1hl2xblq06mgy0a1apfvdinyr8sqqmvqqi42xmcyl9di5x9kb0qx"; depends=[assertthat binom dplyr ggplot2 labeling magrittr pander png scales tibble]; }; + xgxr = derive2 { name="xgxr"; version="1.0.9"; sha256="1hci16ly4wzrjyfa7chwn6nnwlfnq77ix2w3gwrvlgfcjisbcsq1"; depends=[assertthat binom dplyr ggplot2 labeling magrittr pander png scales tibble]; }; xhmmScripts = derive2 { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; }; xkcd = derive2 { name="xkcd"; version="0.0.6"; sha256="1z2y0ihn68ppay7xkglhw7djki5654g6z4bbpyy41if57z9q554f"; depends=[extrafont ggplot2 Hmisc]; }; xkcdcolors = derive2 { name="xkcdcolors"; version="1.0"; sha256="07fnjv01r3b951dqca2zs9b9f6hsgbpbpsrggvb8rps53kpid0i7"; depends=[FNN]; }; @@ -15432,7 +15450,7 @@ in with self; { xltabr = derive2 { name="xltabr"; version="0.1.2"; sha256="0pwbpcdiqkhvzxsi6yxly4zza12bw7zc7ji8cvhldw4yl5sxkz1l"; depends=[magrittr openxlsx]; }; xlutils3 = derive2 { name="xlutils3"; version="0.1.0"; sha256="1cxishi62bd36zlsy5qhzix1p68akdf9kpjg9gfm9aqpcijzccb9"; depends=[magrittr readxl]; }; xmeta = derive2 { name="xmeta"; version="1.1-5"; sha256="1r2mqrrcl7vmbyydw3kzpskinkiqr919bxgq69i1y6pbfim7jzag"; depends=[aod glmmML metafor mvmeta numDeriv]; }; - xml2 = derive2 { name="xml2"; version="1.3.0"; sha256="138v9374xwc7flw8fz8qp8q3w4fch2jviij0g10dg92xn9dsyani"; depends=[]; }; + xml2 = derive2 { name="xml2"; version="1.3.2"; sha256="1kx400v62xkd5xal7rzz7jcarz94ac8g1sh4i2dqr78qwgkzj8nz"; depends=[]; }; xmlparsedata = derive2 { name="xmlparsedata"; version="1.0.3"; sha256="0gjr3l5z5dp276lchr2649as1rkj56d2mlvbr66yg393zzw50lsh"; depends=[]; }; xmlrpc2 = derive2 { name="xmlrpc2"; version="1.1"; sha256="13rfw0civp3hzi4hn31x1idliid1qb73495x4c31z5msd35lzxrs"; depends=[base64enc curl xml2]; }; xmrr = derive2 { name="xmrr"; version="1.0.36"; sha256="0xxi8z9sp156508y5a7f4ax8yry7lg4qmn0hyk04dn1xr7syd4gs"; depends=[dplyr ggplot2 tidyr]; }; @@ -15450,7 +15468,7 @@ in with self; { xrf = derive2 { name="xrf"; version="0.1.2"; sha256="0mcyjw75f2w3hvx1r6lhc4yidmih2z6dfmkxvywm499whk2pcqhv"; depends=[dplyr fuzzyjoin glmnet Matrix rlang xgboost]; }; xrnet = derive2 { name="xrnet"; version="0.1.7"; sha256="136aadrvsdg9hizjg4q12h56ih0s3w88j3jpfb54ajgdmqw3pldi"; depends=[BH bigmemory foreach Rcpp RcppEigen]; }; xseq = derive2 { name="xseq"; version="0.2.1"; sha256="0bsakbfvkfv39q2ch2g21b17g84470sq4v73355cljlshsi6404i"; depends=[e1071 gptk impute preprocessCore RColorBrewer sfsmisc]; }; - xslt = derive2 { name="xslt"; version="1.4"; sha256="0qdrw6f0m5y4y9ky7r766jy4wqi6hw892xcfw4byfby9a4cfj7m6"; depends=[Rcpp xml2]; }; + xslt = derive2 { name="xslt"; version="1.4.1"; sha256="1gpqap5i2xabr9yrrkyr8kzzgqzpk6d6mgp4rqbkjdn77hs24krd"; depends=[Rcpp xml2]; }; xsp = derive2 { name="xsp"; version="0.1.2"; sha256="1jbmxa234v52qji8sz4bkg24c2n65b0zh9py1wyyfzw9n1wx5w0r"; depends=[ggplot2 reshape2]; }; xspliner = derive2 { name="xspliner"; version="0.0.4"; sha256="1j3wlw39r3ahhdfq3rks1zhnlmz14f4wk7bl7gf94yffasqg6k2r"; depends=[dplyr ggplot2 magrittr mgcv pdp pROC purrr tidyr]; }; xtable = derive2 { name="xtable"; version="1.8-4"; sha256="077xfm0gphvhsay75amd9v90zk57kjgrrlgih04fyrbqqblc1gjs"; depends=[]; }; @@ -15513,14 +15531,13 @@ in with self; { ziphsmm = derive2 { name="ziphsmm"; version="2.0.6"; sha256="0lm6m2g9jd1v7gxv4viych8c59phbvz1yly1ydgajl8q251d8n87"; depends=[pracma Rcpp RcppArmadillo]; }; zoeppritz = derive2 { name="zoeppritz"; version="1.0-7"; sha256="14j9jl2g7gn94nzs96mwsgwlxnfbr1crjfmfwbi3rk367xi197jb"; depends=[]; }; zoib = derive2 { name="zoib"; version="1.5.4"; sha256="10hv5li1l9gm1bl3k3c9qcmzkqa4ri0kccrsgw1mn8ddn11g9m0a"; depends=[abind coda Formula matrixcalc rjags]; }; - zoltr = derive2 { name="zoltr"; version="0.2.2"; sha256="0nxg37h6vlj5g6rxmgzy060h3lwfgjxvcf5gfpsgpg1mjg9h4k3f"; depends=[base64url httr jsonlite mockery readr webmockr]; }; + zoltr = derive2 { name="zoltr"; version="0.5.1"; sha256="12zh7y3pwidclscgvd0b0iaqq9j5y8mc8xd6pz4vs0jy5qs3ahar"; depends=[base64url dplyr httr jsonlite magrittr MMWRweek mockery readr rlang webmockr]; }; zoo = derive2 { name="zoo"; version="1.8-7"; sha256="1w4542zs53bm261g95086a60576v334g1jrhnbgdqni4izf2s1wy"; depends=[lattice]; }; zooaRch = derive2 { name="zooaRch"; version="1.2"; sha256="0grc378xppv0303sf4flfqz5002vq5a23nzbq4bsff41rww7dihc"; depends=[ggplot2]; }; zooaRchGUI = derive2 { name="zooaRchGUI"; version="1.0.2"; sha256="0snggx0d69ajz6xxwnv03l12jpjrjkpy2dgf4lrpm2l8rspd27i4"; depends=[car coda foreign geomorph ggplot2 MASS pgirmess raster readxl rjags sp spdep splancs tcltk2 tkrplot vegan]; }; zoocat = derive2 { name="zoocat"; version="0.2.0.1"; sha256="0rdjgf1gvnixqwxrnvzswb53yzcvjgvfkrms6d38bhfyw320kgdp"; depends=[plyr reshape2 scales zoo]; }; zooimage = derive2 { name="zooimage"; version="5.5.2"; sha256="0ck8w0zb9l1n9xvjwqshq9q9l8pigy3yslq2hnfbgcwk17kk9mp8"; depends=[digest DT filehash jpeg MASS mda mlearning png shiny svDialogs svMisc tiff]; }; zoom = derive2 { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; }; - zoomgrid = derive2 { name="zoomgrid"; version="1.0.0"; sha256="1bjm2b1ll5ikym21ia7k6gfiw1bcplcn4p6fls2298nf20q63kaa"; depends=[]; }; zoon = derive2 { name="zoon"; version="0.6.5"; sha256="02y29vr2yn8al69km8faiqrwjrc1r3hsvw3dg8lwjr65cxw1krip"; depends=[dismo plyr randomForest raster RCurl rfigshare rgdal roxygen2 rworldmap sp testthat]; }; zscorer = derive2 { name="zscorer"; version="0.3.1"; sha256="0aijhs0fyird5gq68x4dxchb02mxa7ijk10k9zjhngghxbjj7iqn"; depends=[shiny]; }; ztable = derive2 { name="ztable"; version="0.2.0"; sha256="0g7khk5ifsdh9p31wlwh2l5mn1hzxzpv6qcn1wh34vsfjdmijjwy"; depends=[flextable magrittr moonBook officer RColorBrewer scales stringr]; }; diff --git a/third_party/nixpkgs/pkgs/development/r-modules/default.nix b/third_party/nixpkgs/pkgs/development/r-modules/default.nix index 44ff794654..68faec99db 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/default.nix @@ -328,7 +328,6 @@ let Rpoppler = [ pkgs.poppler ]; RPostgreSQL = [ pkgs.postgresql pkgs.postgresql ]; RProtoBuf = [ pkgs.protobuf ]; - rPython = [ pkgs.python ]; RSclient = [ pkgs.openssl.dev ]; Rserve = [ pkgs.openssl ]; Rssa = [ pkgs.fftw.dev ]; @@ -425,7 +424,6 @@ let Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ]; tcltk2 = [ pkgs.tcl pkgs.tk ]; tikzDevice = [ pkgs.which pkgs.texlive.combined.scheme-medium ]; - rPython = [ pkgs.which ]; gridGraphics = [ pkgs.which ]; adimpro = [ pkgs.which pkgs.xorg.xdpyinfo ]; mzR = [ pkgs.netcdf ]; 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 539c2f7d19..3367588bb3 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.31"; + version = "8.32"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "03dn07lissr2dkhi44wlkrbsby4zfvwai8gykc3xjgs46jy05rf8"; + sha256 = "18ahdphxfcfi2vghl11kmj089hyh9iawll3cwxrqsdqak0748ijs"; }; nativeBuildInputs = [ makeWrapper ]; 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 37dc9e51be..32d23597e5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub , buildPackages , pkgconfig -, libusb, readline, libewf, perl, zlib, openssl +, libusb-compat-0_1, readline, libewf, perl, zlib, openssl , libuv, file, libzip, xxHash , gtk2 ? null, vte ? null, gtkdialog ? null , python3 ? null @@ -84,7 +84,7 @@ let depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ file readline libusb libewf perl zlib openssl libuv ] + buildInputs = [ file readline libusb-compat-0_1 libewf perl zlib openssl libuv ] ++ optional useX11 [ gtkdialog vte gtk2 ] ++ optional rubyBindings [ ruby ] ++ optional pythonBindings [ python3 ] @@ -110,17 +110,17 @@ in { # # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "24088"; - gittap = "4.3.1"; - gittip = "e7f940d27b3b4eb2738afef78a6ea09ed770318c"; - rev = "4.3.1"; - version = "4.3.1"; - sha256 = "0fiy6aj8xf9anpkk2vpkx8x0m2f26rhjb92nmg61xj13dmhchh30"; + version_commit = "24545"; + gittap = "4.4.0"; + gittip = "9ea0b7ce566cfdcfb3513f407c4056915204294a"; + rev = "4.4.0"; + version = "4.4.0"; + sha256 = "0gwdnrnk7wdgkajp2qwg4fyplh7nsbmf01bzx07px6xmiscd9z2s"; cs_ver = "4.0.1"; cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; r2-for-cutter = generic { - version_commit = "24088"; + version_commit = "24545"; gittap = "4.3.1"; gittip = "e7f940d27b3b4eb2738afef78a6ea09ed770318c"; rev = "e7f940d27b3b4eb2738afef78a6ea09ed770318c"; 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 200df98c0a..8ad237bd1d 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.15.4"; + version = "0.15.5"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1z98zy04dj4hj94k9c9r1sfw167s3ywpxnjbylj7nsyxdlvwj37j"; + sha256 = "0mdxs019vzpfxaqkw4nb79p3rydril0ihbn55n4yyh0fznv6zzxi"; }; - modSha256 = "1j6vflvg2k544r0kkdiw64n6v467c0kr7l2m39h8yjbyjbmwl5xz"; + modSha256 = "0ksblhra7ln4ryggr2x8fzl8a7ljz5zdjgdxz82c75wd7wdbw8f5"; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/asmfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/asmfmt/default.nix index 9794180eec..c93b864b70 100644 --- a/third_party/nixpkgs/pkgs/development/tools/asmfmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/asmfmt/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "asmfmt"; - version = "1.1"; + version = "1.2.1"; goPackagePath = "github.com/klauspost/asmfmt"; @@ -14,19 +14,15 @@ buildGoPackage rec { owner = "klauspost"; repo = "asmfmt"; rev = "v${version}"; - sha256 = "08mybfizcvck460axakycz9ndzcgwqilp5mmgm4bl8hfrn36mskw"; + sha256 = "0qwxb4yx12yl817vgbhs7acaj98lgk27dh50mb8sm9ccw1f43h9i"; }; - patches = [ - (fetchpatch { - excludes = ["README.md"]; - url = "https://github.com/klauspost/asmfmt/commit/39a37c8aed8095e0fdfb07f78fc8acbd465d9627.patch"; - sha256 = "18bc77l87mf0yvqc3adlakxz6wflyqfsc2wrmh9q0nlqghlmnw5k"; - }) - ]; - goDeps = ./deps.nix; + # This package comes with its own version of goimports, gofmt and goreturns + # but these binaries are outdated and are offered by other packages. + subPackages = [ "cmd/asmfmt" ]; + meta = with lib; { description = "Go Assembler Formatter"; homepage = "https://github.com/klauspost/asmfmt"; diff --git a/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix b/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix index 328092feaf..87e732e8dc 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.3.4"; + version = "10.4.3"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = version; - sha256 = "16pdvcgy1d5dfqk3as23j45rkwfrv232n384cj5wfz9qwijkcy5g"; + sha256 = "0yl7iznjyng1i3d994qrryllni702gga7h45sx8i3sgpy8544yjf"; }; subPackages = [ "." ]; - modSha256 = "07cy2zi7m2pkbfdcy659x4k5j2w60cmjy8kxv1dcii3dc6ls4bvb"; + modSha256 = "02c668bp1pfrd994lhg6z3hm1qg3530nk9aw1cahiwj549vxxfhm"; postInstall = '' ln -rs "$out/bin/azure-storage-azcopy" "$out/bin/azcopy" diff --git a/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix b/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix index 27c72b351e..9cdd72eeaa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix @@ -5,35 +5,29 @@ , go , python , stdenv +, iana-etc +, mailcap +, tzdata }: let patches = [ ./use-go-in-path.patch - - # update rules_go to fix the build. Remove these when updating past 0.10.3 - (fetchpatch { - url = "https://github.com/bazelbuild/bazel-watcher/commit/686130f50cea274f7453f6abc8c5249654047462.patch"; - sha256 = "0rzs01sfiinl5d3dq9sx1bhl8kkzppdwh964fr7bzafqcxv5llmb"; - }) - (fetchpatch { - url = "https://github.com/bazelbuild/bazel-watcher/commit/18bdb44832ccc533e0ab3923ef80060eeb24582d.patch"; - sha256 = "0k5hvlxlg4n092d53cbfxqqhzc6f1jv4licdhhi1dhckkhb4sdk6"; - }) ]; in buildBazelPackage rec { name = "bazel-watcher-${version}"; - version = "0.10.3"; + version = "0.13.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${version}"; - sha256 = "17z4nqqsdrainbh8fmhf6sgrxwf7aknadmn94z1yqpxa7kb9x33v"; + sha256 = "1fc3sp79znbbq1yjap56lham72n7cap8yfghpzrzmpl5brybjkvm"; }; nativeBuildInputs = [ go git python ]; + removeRulesCC = false; bazelTarget = "//ibazel"; @@ -55,6 +49,10 @@ buildBazelPackage rec { rm -rf $bazelOut/external/{go_sdk,\@go_sdk.marker} sed -e '/^FILE:@go_sdk.*/d' -i $bazelOut/external/\@*.marker + # Retains go build input markers + chmod -R 755 $bazelOut/external/{bazel_gazelle_go_repository_cache,@\bazel_gazelle_go_repository_cache.marker} + rm -rf $bazelOut/external/{bazel_gazelle_go_repository_cache,@\bazel_gazelle_go_repository_cache.marker} + # Remove the gazelle tools, they contain go binaries that are built # non-deterministically. As long as the gazelle version matches the tools # should be equivalent. @@ -62,7 +60,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "0cmj186n2y1g9kkdhcivmh2qvigvpnbp03m575b7hgsxi1cp3ssj"; + sha256 = "0wj573dcirssr2cmq90b4yl57mv3gsxaj1s26afvkz1dvyxmq7sz"; }; buildAttrs = { 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 15b0a5ffcd..0dbe9ec784 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 @@ -98,7 +98,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://mesonbuild.com"; description = "SCons-like build system that use python as a front-end language and Ninja as a building backend"; license = licenses.asl20; - maintainers = with maintainers; [ jtojnar mbe rasendubi ]; + maintainers = with maintainers; [ jtojnar mbe ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix b/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix index f452b24cf0..6e070f3cc5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "cloud-nuke"; - version = "0.1.7"; + version = "0.1.18"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "054z6v13x55x9l5xnixxxszj8k2wa09b5ld2wq4gm4hc273s2m4k"; + sha256 = "1amk9bjrc9svvgllif2vr6xx7kc3xmwjbyb8prnm5zp82hymk5f1"; }; goPackagePath = "github.com/gruntwork-io/cloud-nuke"; diff --git a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/deps.nix b/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/deps.nix index ffd50762ee..c354bd985f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/deps.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/aws/aws-sdk-go"; - rev = "180cc10e5ff368b86dee226b034af7d1672baec6"; - sha256 = "0xphkjqhcn8zq7gali0v32kq2xpbnnw1g7r5vr5p763q2z5c436w"; + rev = "1f4898f67806740d2a91c9dfe9a8be8a61523eb4"; + sha256 = "1znjv4irzqxwizdp3dxgb5w9x06xjs79a3s68afzrblz97kf94kc"; }; } { @@ -18,6 +18,15 @@ sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s"; }; } + { + goPackagePath = "github.com/boombuler/barcode"; + fetch = { + type = "git"; + url = "https://github.com/boombuler/barcode"; + rev = "3cfea5ab600ae37946be2b763b8ec2c1cf2d272d"; + sha256 = "1fzb8wz1ny2sc78g9rm0bcm80pgwvkm2k6lmim2sb4jgm1j3sajd"; + }; + } { goPackagePath = "github.com/davecgh/go-spew"; fetch = { @@ -45,6 +54,33 @@ sha256 = "1skj4vh9h7c5lk1pw8y6740w2k99z398jl0aasn63x83viqjf1zw"; }; } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "72cd26f257d44c1114970e19afddcd812016007e"; + sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1"; + }; + } + { + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "b48cb6623c04dae64c28537143aca42d16561daf"; + sha256 = "1zb4n285mv85dh3y2f8fqbs30h2dhzw7vbczr6z0zg2gqr6vzg0q"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "064e2069ce9c359c118179501254f67d7d37ba24"; + sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb"; + }; + } { goPackagePath = "github.com/gruntwork-io/gruntwork-cli"; fetch = { @@ -54,13 +90,22 @@ sha256 = "1x6g2s4f66c4pb8dwvjnj4i70ik43ak2x189v2ys218nz4zkjs74"; }; } + { + goPackagePath = "github.com/gruntwork-io/terratest"; + fetch = { + type = "git"; + url = "https://github.com/gruntwork-io/terratest"; + rev = "bd5fdfc1564ec40a149a6e579d6ca20ebf2eaca4"; + sha256 = "1vbipykcwhmzs2qxfxdnq3gdi3i5ds6pykjjxqw3f1llad2dihby"; + }; + } { goPackagePath = "github.com/jmespath/go-jmespath"; fetch = { type = "git"; url = "https://github.com/jmespath/go-jmespath"; - rev = "0b12d6b5"; - sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; + rev = "c2b33e84"; + sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; }; } { @@ -90,6 +135,15 @@ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; }; } + { + goPackagePath = "github.com/pquerna/otp"; + fetch = { + type = "git"; + url = "https://github.com/pquerna/otp"; + rev = "43bebefda392017900e7a7b237b4c914c6a55b50"; + sha256 = "088njs8i7b0syyz20hzd3lcjxy61chc518d71lvykw2g9c9wsc7l"; + }; + } { goPackagePath = "github.com/sirupsen/logrus"; fetch = { @@ -104,8 +158,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c"; - sha256 = "178xyfgsbs40jq406aqj0r67ik1b81gdc28z45nbcw6hfhz82rvl"; + rev = "3ebf1ddaeb260c4b1ae502a01c7844fa8c1fa0e9"; + sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; }; } { @@ -126,6 +180,15 @@ sha256 = "1621j82c1hiw4pxjdvaf5qyirwv5c0bqwlrhhna9pnjsgr5pkw33"; }; } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "ca1201d0de80cfde86cb01aea620983605dfe99b"; + sha256 = "16j9xyby1vfl4ch6wqzafxxxnxvcp8vhzknpchwabci1f2zcsn6i"; + }; + } { goPackagePath = "golang.org/x/sys"; fetch = { @@ -135,4 +198,22 @@ sha256 = "0gj9nwryyzf9rn33gl3zm6rxvg1zhrhwi36akipqj37x4g86h3gz"; }; } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880"; + sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "53403b58ad1b561927d19068c655246f2db79d48"; + sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; + }; + } ] \ No newline at end of file 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 ab746c9c53..55d9854d79 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "cloudfoundry-cli"; @@ -15,6 +15,8 @@ buildGoPackage rec { sha256 = "0dqrkimwhw016icgyf4cyipzy6vdz5jgickm33xxd9018dh3ibwq"; }; + nativeBuildInputs = [ installShellFiles ]; + makeTarget = let hps = stdenv.hostPlatform.system; in if hps == "x86_64-darwin" then "out/cf-cli_osx" @@ -33,7 +35,7 @@ buildGoPackage rec { installPhase = '' install -Dm555 out/cf "$bin/bin/cf" - install -Dm444 -t "$bin/share/bash-completion/completions/" "$src/ci/installers/completion/cf" + installShellCompletion --bash "$src/ci/installers/completion/cf" ''; 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 cdf15f3ad7..394dc7b2f5 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,12 @@ buildPythonApplication rec { pname = "cmake-format"; - version = "0.6.9"; + version = "0.6.10"; src = fetchPypi { inherit version; pname = "cmake_format"; - sha256 = "082d7949gsk5v72ap7k4p3vgmc126a0bfm195xpi4lb6khpbzy5j"; + sha256 = "14ypplkjah4hcb1ad8978xip4vvzxy1nkysvyi1wn9b24cbfzw42"; }; propagatedBuildInputs = [ autopep8 flake8 jinja2 pylint pyyaml ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix b/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix index 133526c569..2d7c2c03ce 100644 --- a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "conftest"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "instrumenta"; repo = "conftest"; rev = "v${version}"; - sha256 = "0ial1zs5aqcwza813ny6zqn9ybq6ibrqjmaccwbbam1k9f5rplqv"; + sha256 = "15xzldcmnpfg1hd5zr5i7x2zjrgkwnp4nylxbn9kfic2dpjp1a38"; }; - modSha256 = "17j5fhgwfpyg9r7a5g9rmvkaz510xx9s4mbl1cmyzysvddc6f5wp"; + modSha256 = "0nwmxmh1pmism5r9zzghfrzizr1fbyc8d4jljrbzjjq1l449r2ja"; buildFlagsArray = '' -ldflags= 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 b18bea0c90..7c7862dbe3 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 = "12.10.0"; + version = "12.10.1"; # 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 = "1a2cfr72b15h3ymxf69a0inb4amfxivdhfaj711wgyvcf5ymnbsv"; + sha256 = "0xs0cnkqzmkbj8488s9kyc0m00g3n8vq9wplb99wrax86zs8dyw9"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "18if2xbkldpn0bwfyk6bgbdl9rdg4rjxc0im6lclwcgpbmslwx5r"; + sha256 = "1mcz9a44pa8wx8hk2x7rgp5brbw7a71dqilfrfchnjkg2c9q7x1q"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0bsd3dk2fi21klqwzw8c181gv61qxbd32lj6mhkj9liz4flarhmv"; + sha256 = "1xvkr3zhn085mz7k3xbz7y5q9yjbmgp1h1sp3a2w27jmpmhl32zm"; }; 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 6baa91f44c..c40572a4f2 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.222.1"; + version = "2.222.3"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0glmx8xi99mbfr84hi4sn36qkxw00rfn8wlz5n674ygbdj1vnv2s"; + sha256 = "1087rih5cb4ici538rcgkrfhcqckbs9i2mpzd59zcx4yw91dca8m"; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix b/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix index e400051e2c..32519594e4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix @@ -29,7 +29,6 @@ , gnumake , gnupg , gnutar -, p7zip , json-glib , libcap , libdwarf @@ -99,7 +98,6 @@ in stdenv.mkDerivation rec { cpio = "${cpio}/bin/cpio"; git = "${gitMinimal}/bin/git"; rofilesfuse = "${ostree}/bin/rofiles-fuse"; - sevenz = "${p7zip}/bin/7z"; strip = "${binutils}/bin/strip"; eustrip = "${elfutils}/bin/eu-strip"; euelfcompress = "${elfutils}/bin/eu-elfcompress"; diff --git a/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/fix-paths.patch b/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/fix-paths.patch index cc7d9e82b0..e24fade686 100644 --- a/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/fix-paths.patch +++ b/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/fix-paths.patch @@ -49,15 +49,6 @@ va_end (ap); return res; -@@ -470,7 +470,7 @@ un7z (GFile *dir, - GError **error) - { - gboolean res; -- const gchar *argv[] = { "7z", "x", sevenz_path, NULL }; -+ const gchar *argv[] = { "@sevenz@", "x", sevenz_path, NULL }; - - res = flatpak_spawnv (dir, NULL, 0, error, argv); - @@ -483,7 +483,7 @@ unrpm (GFile *dir, GError **error) { 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 3b82eea104..c33a4cf69f 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.25.0"; + version = "1.25.1"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "0xf9chk6f1ydg2wyi6wzj2fxl641z7iyk6spp5gb1chq7plsi8sm"; + sha256 = "04r26nn72myacs6v2jq8mi4kjik82iwsh6w59h4k9yk0my3fjwia"; }; - modSha256 = "15lb8y4kj2h514nl5517ah3ml9d2i71zv6ah08lpycz1b4v9hlwv"; + modSha256 = "1pz5f2hv2lssiwsp60hsycg2ijyafb7r5fl2yrvflqg547k3n8x2"; subPackages = [ "cmd/golangci-lint" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix index 45629338d9..3dd7fb9e35 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotestsum"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "1wllcmc2c8ch2ggknhxwgdm6g70ppmxr492kbxvlbwif9p6ms0ci"; + sha256 = "0zifha3mj7386q2accrdmd8qniingadxz1v8vg4mciwi723msr44"; }; - modSha256 = "08vil1jb7dpkld59b6qhsfh9cx450vbgfaji7777immzsd1azf4m"; + modSha256 = "10zkk4zqla5yqs5sq2qc7x1vhadfyd1l7s29xyjmg4grs8iimk2j"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/gox/default.nix b/third_party/nixpkgs/pkgs/development/tools/gox/default.nix index ac4e2c582c..7c800df0a6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gox/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gox/default.nix @@ -1,25 +1,22 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage { +buildGoPackage rec { pname = "gox"; - version = "20181025"; + version = "1.0.1"; goPackagePath = "github.com/mitchellh/gox"; src = fetchFromGitHub { owner = "mitchellh"; repo = "gox"; - rev = "9cc487598128d0963ff9dcc51176e722788ec645"; - sha256 = "18indkdwq2m1wy95d71lgbf46jxxrfc5km1fys5laapz993h77v6"; + rev = "v${version}"; + sha256 = "0mkh81hd7kn45dz7b6yhzqsg2mvg1g6pwx89jjigxrnqhyg9vrl7"; }; - goDeps = ./deps.nix; - meta = with stdenv.lib; { homepage = "https://github.com/mitchellh/gox"; description = "A dead simple, no frills Go cross compile tool"; platforms = platforms.all; license = licenses.mpl20; }; - } diff --git a/third_party/nixpkgs/pkgs/development/tools/gox/deps.nix b/third_party/nixpkgs/pkgs/development/tools/gox/deps.nix deleted file mode 100644 index c4991e38ff..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/gox/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "github.com/mitchellh/iochan"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/iochan"; - rev = "87b45ffd0e9581375c491fef3d32130bb15c5bd7"; - sha256 = "1435kdcx3j1xgr6mm5c7w7hjx015jb20yfqlkp93q143hspf02fx"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/development/tools/jazzy/Gemfile.lock b/third_party/nixpkgs/pkgs/development/tools/jazzy/Gemfile.lock index f703cb707e..bed539369a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jazzy/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/tools/jazzy/Gemfile.lock @@ -12,10 +12,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.8.4) + cocoapods (1.9.1) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.8.4) + cocoapods-core (= 1.9.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -30,13 +30,15 @@ GEM molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.11.1, < 2.0) - cocoapods-core (1.8.4) + xcodeproj (>= 1.14.0, < 2.0) + cocoapods-core (1.9.1) activesupport (>= 4.0.2, < 6) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) + netrc (~> 0.11) + typhoeus (~> 1.0) cocoapods-deintegrate (1.0.4) cocoapods-downloader (1.3.0) cocoapods-plugins (1.0.0) @@ -46,18 +48,20 @@ GEM cocoapods-trunk (1.4.1) nap (>= 0.8, < 2.0) netrc (~> 0.11) - cocoapods-try (1.1.0) + cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) escape (0.0.4) - ffi (1.11.3) + ethon (0.12.0) + ffi (>= 1.3.0) + ffi (1.12.2) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - jazzy (0.13.1) + jazzy (0.13.3) cocoapods (~> 1.5) mustache (~> 1.1) open4 @@ -68,7 +72,7 @@ GEM xcinvoke (~> 0.3.0) json (2.3.0) liferaft (0.0.6) - minitest (5.13.0) + minitest (5.14.0) molinillo (0.6.6) mustache (1.1.1) nanaimo (0.2.6) @@ -76,17 +80,19 @@ GEM netrc (0.11.0) open4 (1.3.4) redcarpet (3.5.0) - rouge (3.14.0) + rouge (3.18.0) ruby-macho (1.4.0) - sassc (2.2.1) + sassc (2.3.0) ffi (~> 1.9) sqlite3 (1.4.2) thread_safe (0.3.6) - tzinfo (1.2.6) + typhoeus (1.3.1) + ethon (>= 0.9.0) + tzinfo (1.2.7) thread_safe (~> 0.1) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcodeproj (1.14.0) + xcodeproj (1.16.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/third_party/nixpkgs/pkgs/development/tools/jazzy/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/jazzy/gemset.nix index 872b629678..f4f9c8104d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jazzy/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jazzy/gemset.nix @@ -57,21 +57,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "007ssx75588ji2d8l8s6c95dng1c7b6yacng8nngpy7maijzjgzc"; + sha256 = "0wxr81qy4jsbxl066nlfp8zlqk31i6fsmd7f01xmi9bv04990hrs"; type = "gem"; }; - version = "1.8.4"; + version = "1.9.1"; }; cocoapods-core = { - dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap"]; + dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zcisqb404828n5d3lbk9y2yyx8v2yr6rk1l8y9a4i1hp743fiad"; + sha256 = "0c1679fkyp06dwsh93r0ldzly9vc74g0br4jdngwvdl4g0j4fyzc"; type = "gem"; }; - version = "1.8.4"; + version = "1.9.1"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -132,12 +132,14 @@ version = "1.4.1"; }; cocoapods-try = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gf2zjmcjhh9psq15yfy82wz5jnlihf5bcw79f8hlv4cnqyspncj"; + sha256 = "1znyp625rql37ivb5rk9fk9564cmax8icxfr041ysivpdrn98nql"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; colored2 = { source = { @@ -152,10 +154,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; type = "gem"; }; - version = "1.1.5"; + version = "1.1.6"; }; escape = { source = { @@ -165,15 +167,26 @@ }; version = "0.0.4"; }; + ethon = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"; + type = "gem"; + }; + version = "0.12.0"; + }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10ay35dm0lkcqprsiya6q2kwvyid884102ryipr4vrk790yfp8kd"; + sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; type = "gem"; }; - version = "1.11.3"; + version = "1.12.2"; }; fourflusher = { groups = ["default"]; @@ -230,10 +243,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0917v3dk9ks0apr0srk9sm6agk47iyh5bzfxqpkhd4dfgb4vpvjx"; + sha256 = "1iv98hfmxf1vib63bq8l0wgx5n8kw2kmsj55y2vs04f2kcav3n4n"; type = "gem"; }; - version = "0.13.1"; + version = "0.13.3"; }; json = { groups = ["default"]; @@ -258,10 +271,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w16p7cvslh3hxd3cia8jg4pd85z7rz7xqb16vh42gj4rijn8rmi"; + sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; type = "gem"; }; - version = "5.13.0"; + version = "5.14.0"; }; molinillo = { groups = ["default"]; @@ -332,10 +345,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k5jrp0qc9p61mfcwyn1a7dajmkw04z6y76wa8a0axh1v2wrw8ld"; + sha256 = "1n9h0ls2a2zq0bcsw31wxci1wdxb8s3vglfadxpcs6b04vkf6nqq"; type = "gem"; }; - version = "3.14.0"; + version = "3.18.0"; }; ruby-macho = { groups = ["default"]; @@ -353,10 +366,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bnid7r5z5hcin5hykvpvv8xig27wbbckxwis60z2aaxq4j9siz"; + sha256 = "1qzfnvb8khvc6w2sn3k91mndc2w50xxx5c84jkr6xdxlmaq1a3kg"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.0"; }; sqlite3 = { groups = ["default"]; @@ -376,16 +389,27 @@ }; version = "0.3.6"; }; + typhoeus = { + dependencies = ["ethon"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5"; + type = "gem"; + }; + version = "1.3.1"; + }; tzinfo = { dependencies = ["thread_safe"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; xcinvoke = { dependencies = ["liferaft"]; @@ -402,9 +426,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h9iba53mrb663qdqzpfbdwkwzqv7hndd0df71yr2kj2hzwjmkvb"; + sha256 = "1bkk8y6lzd86w9yx72hd1nil3fkk5f0v3il9vm554gzpl6dhc2bi"; type = "gem"; }; - version = "1.14.0"; + version = "1.16.0"; }; } \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/tools/jid/default.nix b/third_party/nixpkgs/pkgs/development/tools/jid/default.nix index f63d580bca..e031159d37 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jid/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jid/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { pname = "jid"; - version = "0.7.2"; + version = "0.7.6"; goPackagePath = "github.com/simeji/jid"; src = fetchFromGitHub { owner = "simeji"; repo = "jid"; - rev = version; - sha256 = "0p4srp85ilcafrn9d36rzpzg5k5jd7is93p68hamgxqyiiw6a8fi"; + rev = "v${version}"; + sha256 = "15fgi7cpq5bg2lnpr7rip359xwj2kvlj6j2qzi837c26adnw973x"; }; goDeps = ./deps.nix; diff --git a/third_party/nixpkgs/pkgs/development/tools/jid/deps.nix b/third_party/nixpkgs/pkgs/development/tools/jid/deps.nix index a027902d2d..6e2d5514a8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jid/deps.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jid/deps.nix @@ -1,12 +1,12 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ { goPackagePath = "github.com/bitly/go-simplejson"; fetch = { type = "git"; url = "https://github.com/bitly/go-simplejson"; - rev = "9db4a59bd4d803ae0c173a7d8a538e056cd59d57"; - sha256 = "0cbnjzjq55jnzk07zdk7nb96yzgpyawm1r6km3xignn8ih4bnn6g"; + rev = "v0.5.0"; + sha256 = "0n9f9dz1jn1jx86d48569nznpjn9fmq3knn7r65xpy7jhih284jj"; }; } { @@ -14,8 +14,26 @@ fetch = { type = "git"; url = "https://github.com/fatih/color"; - rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; - sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.0.9"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.4"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; }; } { @@ -23,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "c88d7e5f2e24de48a200a2655ac8a0910be9a0f7"; - sha256 = "14prmzjlv9z31n6caaaq1kwi4p0mp3x4pv5r7d0575lcampa41jw"; + rev = "v0.0.4"; + sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; }; } { @@ -32,7 +50,7 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "60ab7e3d12ed91bc1b2486559c4b3a6b62297577"; + rev = "60ab7e3d12ed"; sha256 = "040064fh7wzdmv8flw6svi007hiqs1cjk1a3k3gpg7gii3npifsl"; }; } @@ -41,7 +59,7 @@ fetch = { type = "git"; url = "https://github.com/nwidger/jsoncolor"; - rev = "75a6de4340e59be95f0884b9cebdda246e0fdf40"; + rev = "75a6de4340e5"; sha256 = "0aiv42xijrqgrxfx6pfyrndpwqv8i1qwsk190jdczyjxlnki2nki"; }; } @@ -50,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "059132a15dd08d6704c67711dae0cf35ab991756"; - sha256 = "0bxkbh2rq40kdk8i05am5np77cnskx3571v2k300j5mmj1rl1ijg"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; }; } ] diff --git a/third_party/nixpkgs/pkgs/development/tools/kind/default.nix b/third_party/nixpkgs/pkgs/development/tools/kind/default.nix index f86bc48983..6436c83ee2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kind/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kind/default.nix @@ -19,9 +19,10 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - $bin/bin/kind completion bash > kind.bash - $bin/bin/kind completion zsh > kind.zsh - installShellCompletion kind.{bash,zsh} + for shell in bash zsh; do + $bin/bin/kind completion $shell > kind.$shell + installShellCompletion kind.$shell + done ''; meta = { diff --git a/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix b/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix index c1fc313fbc..de45ff50c0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix @@ -4,16 +4,21 @@ with rustPlatform; buildRustPackage rec { pname = "kubie"; - version = "0.7.3"; + version = "0.8.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "186h5fng16gwqhsy2nxswbrrxsx0ysqrb4pqznyygbiz5cd9bgxp"; + sha256 = "1f82xlhhxbjadjw609kr1kdm4n69c9mqjia4b3k505wjh7cc55n0"; }; - cargoSha256 = "1yllpi8dp1fy39z4zmhyf1hdjpl62vwh8b8qlj0g778qsdrm9p98"; + cargoSha256 = "0mish7wqwq5ynl98n6swdn5i6mg62aih5rfykbl3wx39b468n481"; + + installPhase = '' + mkdir -p $out/share/bash-completion/completions + cp -v ${src}/completion/kubie.bash $out/share/bash-completion/completions/kubie + ''; meta = with stdenv.lib; { description = diff --git a/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix b/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix index 6466f1c4a2..36df02ff71 100644 --- a/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "1.3.2"; + version = "1.3.4"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "0jwvbymwaz4whw08n9scz6vk57sx7l3qddh4m5dlv2cxishwf7n3"; + sha256 = "0mddr6jw7bl8k4iqfq3sfpxq8fffm2spi9xwdr4cskkw4qdgrrpz"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; 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 885cef9911..8df465c495 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.7"; + version = "0.2.8"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "0qx3vwsynmil1h3d2dzvqz0jzshfyy3vin14zjfmd353d915hf06"; + sha256 = "14ird8z8f467spa0kdzjf6lq7pipq7rwxrdk6ppv7y1fxw96qm9x"; }; - modSha256 = "0276dngh29kzgm95d23r8ajjrrkss0v0f0wfq1ribgsxh17v0y5n"; + modSha256 = "09q8dh4g4k0y7mrhwyi9py7zdiipmq91j3f32cn635v2xw6zyg2k"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/avrdude/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/avrdude/default.nix index bca091d630..bb0520cf28 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/avrdude/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/avrdude/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, yacc, flex, libusb, libelf, libftdi1, readline +{ stdenv, fetchurl, yacc, flex, libusb-compat-0_1, libelf, libftdi1, readline # docSupport is a big dependency, disabled by default , docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionals docSupport "--enable-doc"; - buildInputs = [ yacc flex libusb libelf libftdi1 readline ] + buildInputs = [ yacc flex libusb-compat-0_1 libelf libftdi1 readline ] ++ stdenv.lib.optionals docSupport [ texLive texinfo texi2html ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix index 224cf16d76..6e733cfe28 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, gcc-arm-embedded, libftdi1, libusb, pkgconfig +, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkgconfig , python, pythonPackages }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ libftdi1 - libusb + libusb-compat-0_1 python pythonPackages.intelhex ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ccls/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ccls/default.nix index cb5653583f..ba57ef561f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ccls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ccls/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ccls"; - version = "0.20190823.5"; + version = "0.20190823.6"; src = fetchFromGitHub { owner = "MaskRay"; repo = "ccls"; rev = version; - sha256 = "0b2pkpzn576b92zcxpwchpkyw2fww6s69818rx4g9z34kzm35zy5"; + sha256 = "11h5nwk4qqshf3i8yr4bxpnvmidrhkzd0zxhf1xqv8cv6r08k47f"; }; nativeBuildInputs = [ cmake ]; 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 fde1c68d34..5b3b728ea9 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,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.6949"; + version = "0.1.7179"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "0r64m4lcm9w0rzi61rsi3sm719ydwiv5axxnikwhzmvkdz0rd7dq"; + sha256 = "0md6y2rnzhkpxc2pm3c46jrhwicrswy9qlr6a4mmvpjq1imj1hjq"; }; - modSha256 = "199ai38knp50mjjhddjd70qfwx63c69rf7ddw4hpzgx5cm5a04q2"; + modSha256 = "169d0mm52l6w6jln5ak6zkh97q65m9jpg3bm8qll6sfrmrnfncfi"; buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" ]; 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 cd805069df..a29af8b60e 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 = "20200412T033138"; + version = "20200413T141742"; src = fetchurl { url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}"; - sha256 = "19i6sikg5x5qzcbakzbiqbcy5q2srqk6ihpmb3l90n1p4jn4605c"; + sha256 = "0bgyl791l8qaja9p22p77llis39kgdm8x1djz1dm8iy6qn22hm1y"; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix index 10e6dc0d8b..a474ccc7e5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb }: +{ stdenv, fetchurl, libusb-compat-0_1 }: let version = "0.7.2"; in @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "dfu-programmer"; inherit version; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; src = fetchurl { url = "mirror://sourceforge/dfu-programmer/${pname}-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix index 9fbafebb10..890439adc6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix @@ -1,7 +1,7 @@ { pkgs , stdenv -, libusb +, libusb-compat-0_1 , fetchFromGitHub , lib }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in"; }; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; installPhase = '' 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 7a6a060464..47596789de 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/scc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/scc/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "scc"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "boyter"; repo = "scc"; rev = "v${version}"; - sha256 = "1wk6s9ga9rkywgqys960s6fz4agwzh3ac2l6cpcr7kca4379s28k"; + sha256 = "0hbcq5qn97kr9d4q9m2p1mj3ijn8zmwycrs5bgf1kfiwr09wg2yh"; }; goPackagePath = "github.com/boyter/scc"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/stlink/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/stlink/default.nix index c59847b1e0..7793d9185e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/stlink/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/stlink/default.nix @@ -1,9 +1,13 @@ { stdenv, fetchFromGitHub, cmake, libusb1 }: -# IMPORTANT: You need permissions to access the stlink usb devices. +let + # The Darwin build of stlink explicitly refers to static libusb. + libusb1' = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1; + +# IMPORTANT: You need permissions to access the stlink usb devices. # Add services.udev.pkgs = [ pkgs.stlink ] to your configuration.nix -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "stlink"; version = "1.6.0"; @@ -14,7 +18,8 @@ stdenv.mkDerivation rec { sha256 = "1mlkrxjxg538335g59hjb0zc739dx4mhbspb26z5gz3lf7d4xv6x"; }; - buildInputs = [ cmake libusb1 ]; + buildInputs = [ libusb1' ]; + nativeBuildInputs = [ cmake ]; patchPhase = '' sed -i 's@/etc/udev/rules.d@$ENV{out}/etc/udev/rules.d@' CMakeLists.txt sed -i 's@/etc/modprobe.d@$ENV{out}/etc/modprobe.d@' CMakeLists.txt diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix index e03320f842..62c480707c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb }: +{ stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb-compat-0_1 }: stdenv.mkDerivation rec { pname = "teensy-loader-cli"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1yx8vsh6b29pqr4zb6sx47429i9x51hj9psn8zksfz75j5ivfd5i"; }; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; nativeBuildInputs = [ go-md2man installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/wishbone-tool/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/wishbone-tool/default.nix index 8c2e27d645..d900d14e33 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/wishbone-tool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/wishbone-tool/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, libusb }: +{ lib, fetchFromGitHub, rustPlatform, libusb-compat-0_1 }: let version = "0.6.9"; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { ''; cargoSha256 = "0d5kcwy0cgxqfxf2xysw65ng84q4knhp4fgvh6dwqhf0nsca9gvs"; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; meta = with lib; { description = "Manipulate a Wishbone device over some sort of bridge"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix index b39e9028af..1ccd6c2ec4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, cmake, libusb, libftdi }: +{ stdenv, fetchsvn, cmake, libusb-compat-0_1, libftdi }: # The xc3sprog project doesn't seem to make proper releases, they only put out # prebuilt binary subversion snapshots on sourceforge. @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { rev = version; }; - buildInputs = [ cmake libusb libftdi ]; + buildInputs = [ cmake libusb-compat-0_1 libftdi ]; meta = with stdenv.lib; { description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG"; diff --git a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix index d158f3bf15..32ac95cff6 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.5.5"; + version = "1.5.6"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "1l5n6s4fg6rgb7k845hsxgrs44y9bs2hmdxqzfbayiv8nz1qg286"; + sha256 = "0pwygrh6pjmx8a1jc12929x0slj7w3b8p3pzswnbk7klyhj4jkp8"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix new file mode 100644 index 0000000000..727a789c42 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +, perl, pkgconfig, openssl, Security, libiconv, curl +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-deny"; + version = "0.6.6"; + + src = fetchFromGitHub { + owner = "EmbarkStudios"; + repo = pname; + rev = version; + sha256 = "0pmh6x7rb0v1g087xgyicw9mm4ayppgh7vzvq3hs8vip2zvy7r56"; + }; + + cargoSha256 = "00lh6nxc17dyl8z2l70gzc7l1vpn448lzi1c69wxxcqnk8y0ka9w"; + + nativeBuildInputs = [ perl pkgconfig ]; + + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + + meta = with lib; { + description = "Cargo plugin to generate list of all licenses for a crate"; + homepage = "https://github.com/EmbarkStudios/cargo-deny"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix index 4ae2b55f01..6af944e9c5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xbuild"; - version = "0.5.28"; + version = "0.5.29"; src = fetchFromGitHub { owner = "rust-osdev"; repo = pname; rev = "v${version}"; - sha256 = "1rczflf6fllxkag5nah195shwqvqmlna9a1gkcwp9ljlgxlr9zvq"; + sha256 = "05wg1xx2mcwb9cplmrpg13jimddlzmv7hf5g3vjppjp8kz2gb7zj"; }; - cargoSha256 = "0xr8wpcw3x0343hm6clygsbikhrp6gcqb8vh7g7h9nijjrbnzxxb"; + cargoSha256 = "1s2xsfld29shvjzyp16y263hnbqxrq8i2557y0g09xmfm5x0jhix"; meta = with stdenv.lib; { description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/racerd/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/racerd/default.nix index 02b32c6485..72588b3741 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/racerd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/racerd/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { installPhase = '' mkdir -p $out/bin - cp -p target/release/racerd $out/bin/ + cp -p $releaseDir/racerd $out/bin/ wrapProgram $out/bin/racerd --set-default RUST_SRC_PATH "$RUST_SRC_PATH" ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix index 76091926a2..ec9de0610e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "2.4.2"; + version = "2.5.0"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0axinxfyycnmxg561n80s90swr6d0pgsw669gvpsk557nhmcclja"; + outputHash = "1m7jdgndbjynhl98an6g9gxxpp9bd6p3xqgzfilak8pamjkdwdp4"; }; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix index d1d1200344..5534492cf3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.6.0"; + version = "1.8.0"; # rev is the ${version} commit, mainly for skaffold version command output - rev = "4cc0be23e41e37d8b1bca1464516538b2cc1bba0"; + rev = "bd280192092e28067f0f52584c8bcb4f4dc480e4"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "0wz9x3p0hfajrkm1qrhl4kw7l7r3n6xv16chl4dxigaix8ga068h"; + sha256 = "0s1j1lij56idl981nq7dnvkil1ki283nfhcfqyl5g00payihlm73"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/spring-boot/default.nix b/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix similarity index 75% rename from third_party/nixpkgs/pkgs/development/tools/spring-boot/default.nix rename to third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix index 4f8c17caee..865c655e67 100644 --- a/third_party/nixpkgs/pkgs/development/tools/spring-boot/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchzip, jdk, makeWrapper, installShellFiles }: +{ stdenv, fetchzip, jdk, makeWrapper, installShellFiles, coreutils }: stdenv.mkDerivation rec { - pname = "spring-boot"; - version = "2.1.9"; + pname = "spring-boot-cli"; + version = "2.2.6"; src = fetchzip { - url = "https://repo.spring.io/release/org/springframework/boot/${pname}-cli/${version}.RELEASE/${pname}-cli-${version}.RELEASE-bin.zip"; - sha256 = "03iphh5l9w9sizksidkv217qnqx3nh1zpw6kdjnn40j3mlabfb7j"; + url = "https://repo.spring.io/release/org/springframework/boot/${pname}/${version}.RELEASE/${pname}-${version}.RELEASE-bin.zip"; + sha256 = "1rb21a8nr4mcdsfv3c3xh45kcpdwllhjfb26w9xsdgfh1j4mhb81"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { rm -r shell-completion cp -r . $out wrapProgram $out/bin/spring \ - --prefix JAVA_HOME : ${jdk} + --set JAVA_HOME ${jdk} \ + --set PATH /bin:${coreutils}/bin:${jdk}/bin runHook postInstall ''; @@ -28,14 +29,14 @@ stdenv.mkDerivation rec { CLI which makes it easy to create spring-based applications ''; longDescription = '' - Spring Boot makes it easy to create stand-alone, production-grade - Spring-based Applications that you can run. We take an opinionated view - of the Spring platform and third-party libraries, so that you can get - started with minimum fuss. Most Spring Boot applications need very + Spring Boot makes it easy to create stand-alone, production-grade + Spring-based Applications that you can run. We take an opinionated view + of the Spring platform and third-party libraries, so that you can get + started with minimum fuss. Most Spring Boot applications need very little Spring configuration. - You can use Spring Boot to create Java applications that can be started - by using java -jar or more traditional war deployments. We also provide + You can use Spring Boot to create Java applications that can be started + by using java -jar or more traditional war deployments. We also provide a command line tool that runs “spring scripts”. ''; homepage = "https://spring.io/projects/spring-boot"; diff --git a/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix b/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix index 2939df0ba2..bb84584e83 100644 --- a/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: -appimageTools.wrapType2 rec { +let + version = "2.3.1"; +in appimageTools.wrapType2 rec { name = "unityhub"; extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk_pixbuf glib libGL libGLU nss nspr @@ -16,8 +18,9 @@ appimageTools.wrapType2 rec { ''; src = fetchurl { - url = "https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage"; - sha256 = "05p5kqbwgqyk2aw2lix5dk1ql16aj6iczxrc63a1l0vj8wrha7z4"; + # mirror of https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage + url = "https://archive.org/download/unity-hub-${version}/UnityHub.AppImage"; + sha256 = "09nrgjlknl3hgrrl7rc79bmbrq6r6sl49dw0cmvs37vjqnvlr8ny"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch index 29886fccd5..86fbb81de0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch +++ b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch @@ -1,6 +1,6 @@ -From 786cd8df9e9fa245c4dbab1bfd21b7949b8a5300 Mon Sep 17 00:00:00 2001 +From a13aff157f899a6388b3c9e621680049f329a028 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch -Date: Thu, 26 Mar 2020 01:54:11 +0100 +Date: Fri, 1 May 2020 23:44:08 +0200 Subject: [PATCH] Add cargo.lock --- @@ -10,7 +10,7 @@ Subject: [PATCH] Add cargo.lock diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 00000000..976ea6d4 +index 00000000..4822cea1 --- /dev/null +++ b/Cargo.lock @@ -0,0 +1,2527 @@ @@ -49,9 +49,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "anyhow" -+version = "1.0.27" ++version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "013a6e0a2cbe3d20f9c60b65458f7a7f7a5e636c5d0f45a5a6aee5d4b1f01785" ++checksum = "d9a60d744a80c30fcb657dfe2c1b22bcb3e814c1a1e3674f32bf5820b570fbff" + +[[package]] +name = "arrayref" @@ -213,9 +213,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "cc" -+version = "1.0.50" ++version = "1.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" ++checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d" + +[[package]] +name = "cfg-if" @@ -359,9 +359,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "curl" -+version = "0.4.28" ++version = "0.4.29" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eda1c0c03cacf3365d84818a40293f0e3f3953db8759c9c565a3b434edf0b52e" ++checksum = "762e34611d2d5233a506a79072be944fddd057db2f18e04c0d6fa79e3fd466fd" +dependencies = [ + "curl-sys", + "libc", @@ -374,9 +374,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "curl-sys" -+version = "0.4.30+curl-7.69.1" ++version = "0.4.31+curl-7.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "923b38e423a8f47a4058e96f2a1fa2865a6231097ee860debd678d244277d50c" ++checksum = "dcd62757cc4f5ab9404bc6ca9f0ae447e729a1403948ce5106bd588ceac6a3b0" +dependencies = [ + "cc", + "libc", @@ -494,9 +494,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "filetime" -+version = "0.2.8" ++version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d" ++checksum = "f59efc38004c988e4201d11d263b8171f49a2e7ec0bdbb71773433f271504a5e" +dependencies = [ + "cfg-if", + "libc", @@ -604,9 +604,9 @@ index 00000000..976ea6d4 +checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7" +dependencies = [ + "proc-macro-hack", -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", -+ "syn 1.0.17", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", ++ "syn 1.0.18", +] + +[[package]] @@ -692,9 +692,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "hermit-abi" -+version = "0.1.8" ++version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8" ++checksum = "61565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4" +dependencies = [ + "libc", +] @@ -772,9 +772,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "jpeg-decoder" -+version = "0.1.18" ++version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0256f0aec7352539102a9efbcb75543227b7ab1117e0f95450023af730128451" ++checksum = "5b47b4c4e017b01abdc5bcc126d2d1002e5a75bbe3ce73f9f4f311a916363704" +dependencies = [ + "byteorder", + "rayon", @@ -782,7 +782,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "js-sys" -+version = "0.3.37" ++version = "0.3.39" +dependencies = [ + "wasm-bindgen", + "wasm-bindgen-futures", @@ -811,9 +811,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "libc" -+version = "0.2.68" ++version = "0.2.69" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" ++checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" + +[[package]] +name = "libz-sys" @@ -1001,9 +1001,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "num_cpus" -+version = "1.12.0" ++version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ + "hermit-abi", + "libc", @@ -1011,9 +1011,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "openssl" -+version = "0.10.28" ++version = "0.10.29" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "973293749822d7dd6370d6da1e523b0d1db19f06c459134c658b2a4261378b52" ++checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd" +dependencies = [ + "bitflags 1.2.1", + "cfg-if", @@ -1031,18 +1031,18 @@ index 00000000..976ea6d4 + +[[package]] +name = "openssl-src" -+version = "111.7.0+1.1.1e" ++version = "111.9.0+1.1.1g" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6fde5a8c01ef8aa31ff8d0aaf9bae248581ed8840fca0b66e51cc9f294a8cb2c" ++checksum = "a2dbe10ddd1eb335aba3780eb2eaa13e1b7b441d2562fd962398740927f39ec4" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" -+version = "0.9.54" ++version = "0.9.55" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986" ++checksum = "7717097d810a0f2e2323f9e5d11e71608355e24828410b55b9d4f18aa5f9a5d8" +dependencies = [ + "autocfg 1.0.0", + "cc", @@ -1108,9 +1108,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "pin-utils" -+version = "0.1.0-alpha.4" ++version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587" ++checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" @@ -1167,35 +1167,35 @@ index 00000000..976ea6d4 + +[[package]] +name = "proc-macro-error" -+version = "0.4.12" ++version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7" ++checksum = "98e9e4b82e0ef281812565ea4751049f1bdcdfccda7d3f459f2e138a40c08678" +dependencies = [ + "proc-macro-error-attr", -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", -+ "syn 1.0.17", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", ++ "syn 1.0.18", + "version_check 0.9.1", +] + +[[package]] +name = "proc-macro-error-attr" -+version = "0.4.12" ++version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de" ++checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53" +dependencies = [ -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", -+ "syn 1.0.17", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", ++ "syn 1.0.18", + "syn-mid", + "version_check 0.9.1", +] + +[[package]] +name = "proc-macro-hack" -+version = "0.5.14" ++version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fcfdefadc3d57ca21cf17990a28ef4c0f7c61383a28cb7604cf4a18e6ede1420" ++checksum = "0d659fe7c6d27f25e9d80a1a094c223f5246f6a6596453e09d7229bf42750b63" + +[[package]] +name = "proc-macro-nested" @@ -1214,9 +1214,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "proc-macro2" -+version = "1.0.9" ++version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435" ++checksum = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3" +dependencies = [ + "unicode-xid 0.2.0", +] @@ -1238,11 +1238,11 @@ index 00000000..976ea6d4 + +[[package]] +name = "quote" -+version = "1.0.3" ++version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f" ++checksum = "4c1f4b0efa5fc5e8ceb705136bfee52cfdb6a4e3509f770b478cd6ed434232a7" +dependencies = [ -+ "proc-macro2 1.0.9", ++ "proc-macro2 1.0.10", +] + +[[package]] @@ -1495,9 +1495,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "regex" -+version = "1.3.6" ++version = "1.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7f6946991529684867e47d86474e3a6d0c0ab9b82d5821e314b1ede31fa3a4b3" ++checksum = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692" +dependencies = [ + "aho-corasick", + "memchr", @@ -1578,9 +1578,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "ryu" -+version = "1.0.3" ++version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76" ++checksum = "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1" + +[[package]] +name = "safemem" @@ -1628,29 +1628,29 @@ index 00000000..976ea6d4 + +[[package]] +name = "serde" -+version = "1.0.105" ++version = "1.0.106" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e707fbbf255b8fc8c3b99abb91e7257a622caeb20a9818cbadbeeede4e0932ff" ++checksum = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" -+version = "1.0.105" ++version = "1.0.106" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac5d00fc561ba2724df6758a17de23df5914f20e41cb00f94d5b7ae42fffaff8" ++checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c" +dependencies = [ -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", -+ "syn 1.0.17", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", ++ "syn 1.0.18", +] + +[[package]] +name = "serde_json" -+version = "1.0.48" ++version = "1.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9371ade75d4c2d6cb154141b9752cf3781ec9c05e0e5cf35060e1e70ee7b9c25" ++checksum = "a7894c8ed05b7a3a279aeb79025fdec1d3158080b75b98a08faf2806bb799edd" +dependencies = [ + "itoa", + "ryu", @@ -1677,15 +1677,15 @@ index 00000000..976ea6d4 + +[[package]] +name = "smallvec" -+version = "1.2.0" ++version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc" ++checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" + +[[package]] +name = "socket2" -+version = "0.3.11" ++version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" ++checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" +dependencies = [ + "cfg-if", + "libc", @@ -1713,9 +1713,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "structopt" -+version = "0.3.12" ++version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c8faa2719539bbe9d77869bfb15d4ee769f99525e707931452c97b693b3f159d" ++checksum = "863246aaf5ddd0d6928dfeb1a9ca65f505599e4e1b399935ef7e75107516b4ef" +dependencies = [ + "clap", + "lazy_static", @@ -1724,15 +1724,15 @@ index 00000000..976ea6d4 + +[[package]] +name = "structopt-derive" -+version = "0.4.5" ++version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f88b8e18c69496aad6f9ddf4630dd7d585bcaf765786cb415b9aec2fe5a0430" ++checksum = "d239ca4b13aee7a2142e6795cbd69e457665ff8037aed33b3effdc430d2f927a" +dependencies = [ + "heck", + "proc-macro-error", -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", -+ "syn 1.0.17", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", ++ "syn 1.0.18", +] + +[[package]] @@ -1748,12 +1748,12 @@ index 00000000..976ea6d4 + +[[package]] +name = "syn" -+version = "1.0.17" ++version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03" ++checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213" +dependencies = [ -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", + "unicode-xid 0.2.0", +] + @@ -1763,9 +1763,9 @@ index 00000000..976ea6d4 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" +dependencies = [ -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", -+ "syn 1.0.17", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", ++ "syn 1.0.18", +] + +[[package]] @@ -1832,21 +1832,20 @@ index 00000000..976ea6d4 + +[[package]] +name = "threadpool" -+version = "1.7.1" ++version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865" ++checksum = "e8dae184447c15d5a6916d973c642aec485105a13cd238192a6927ae3e077d66" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "time" -+version = "0.1.42" ++version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" ++checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +dependencies = [ + "libc", -+ "redox_syscall", + "winapi", +] + @@ -1900,9 +1899,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "trybuild" -+version = "1.0.24" ++version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "24b4e093c5ed1a60b22557090120aa14f90ca801549c0949d775ea07c1407720" ++checksum = "4e5696e4fd793743fbcc29943fe965ea3993b6c3d2a6a3a35c6680d926fd3a49" +dependencies = [ + "glob", + "lazy_static", @@ -2038,9 +2037,9 @@ index 00000000..976ea6d4 +checksum = "2bc16925d405153a91e01cdac2a5549aa25ca9148b5176e25e601f6536344d94" +dependencies = [ + "heck", -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", -+ "syn 1.0.17", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", ++ "syn 1.0.18", +] + +[[package]] @@ -2051,7 +2050,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ + "cfg-if", + "js-sys", @@ -2067,7 +2066,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-anyref-xform" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ + "anyhow", + "rayon", @@ -2079,14 +2078,14 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-backend" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ + "bumpalo", + "lazy_static", + "log 0.4.8", -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", -+ "syn 1.0.17", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", ++ "syn 1.0.18", + "wasm-bindgen-shared", +] + @@ -2100,7 +2099,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-cli" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ + "anyhow", + "assert_cmd", @@ -2128,7 +2127,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-cli-support" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ + "anyhow", + "base64 0.9.3", @@ -2150,7 +2149,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-futures" -+version = "0.4.10" ++version = "0.4.12" +dependencies = [ + "cfg-if", + "futures-channel-preview", @@ -2162,9 +2161,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-macro" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ -+ "quote 1.0.3", ++ "quote 1.0.4", + "trybuild", + "wasm-bindgen", + "wasm-bindgen-futures", @@ -2173,18 +2172,18 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-macro-support" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", -+ "syn 1.0.17", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", ++ "syn 1.0.18", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-multi-value-xform" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ + "anyhow", + "rayon", @@ -2205,11 +2204,11 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-shared" -+version = "0.2.60" ++version = "0.2.62" + +[[package]] +name = "wasm-bindgen-test" -+version = "0.3.10" ++version = "0.3.12" +dependencies = [ + "console_error_panic_hook", + "js-sys", @@ -2235,15 +2234,15 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-test-macro" -+version = "0.3.10" ++version = "0.3.12" +dependencies = [ -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", +] + +[[package]] +name = "wasm-bindgen-threads-xform" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ + "anyhow", + "walrus", @@ -2252,7 +2251,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-wasm-conventions" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ + "anyhow", + "walrus", @@ -2260,7 +2259,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-wasm-interpreter" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ + "anyhow", + "log 0.4.8", @@ -2271,18 +2270,18 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-webidl" -+version = "0.2.60" ++version = "0.2.62" +dependencies = [ + "anyhow", + "env_logger", + "heck", + "lazy_static", + "log 0.4.8", -+ "proc-macro2 1.0.9", -+ "quote 1.0.3", ++ "proc-macro2 1.0.10", ++ "quote 1.0.4", + "sourcefile", + "structopt", -+ "syn 1.0.17", ++ "syn 1.0.18", + "wasm-bindgen-backend", + "weedle", +] @@ -2336,25 +2335,25 @@ index 00000000..976ea6d4 + +[[package]] +name = "wast" -+version = "11.0.0" ++version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df4d67ba9266f4fcaf2e8a1afadc5e2a959e51aecc07b1ecbdf85a6ddaf08bde" ++checksum = "47b11c94c63d5365a76ea287f8e6e5b6050233fae4b2423aea2a1e126a385e17" +dependencies = [ + "leb128", +] + +[[package]] +name = "wat" -+version = "1.0.12" ++version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a9400dc1c8512087b2d974b1b9b0a6c4e6e26e7e8acf629e3e351165a1ed301" ++checksum = "03db18bc33cff3859c296efbefdcc00763a644539feeadca3415a1cee8a2835d" +dependencies = [ -+ "wast 11.0.0", ++ "wast 14.0.0", +] + +[[package]] +name = "web-sys" -+version = "0.3.37" ++version = "0.3.39" +dependencies = [ + "js-sys", + "wasm-bindgen", @@ -2393,6 +2392,7 @@ index 00000000..976ea6d4 +name = "websockets" +version = "0.1.0" +dependencies = [ ++ "js-sys", + "wasm-bindgen", + "web-sys", +] @@ -2437,9 +2437,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "winapi-util" -+version = "0.1.3" ++version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] @@ -2542,5 +2542,5 @@ index 00000000..976ea6d4 + "web-sys", +] -- -2.25.0 +2.25.4 diff --git a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix index b52346d96a..9adabeb573 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.60"; + version = "0.2.62"; src = fetchFromGitHub { owner = "rustwasm"; repo = "wasm-bindgen"; rev = version; - sha256 = "1jr4v5y9hbkyg8gjkr3qc2qxwhyagfs8q3y3z248mr1919mcas8h"; + sha256 = "0d3ph3g220nvzwxa71rch03j5c0w06v8z4lmlyp5kky6p86r37hz"; }; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkgconfig ]; - cargoSha256 = "08g110qahipgm1qyyihgqwnkr23w0gk1gp63ici5dj2qsxnc4mxv"; + cargoSha256 = "13lj2yx2bcwac1b4gpwcgiwqvy178zis6r1pidn4pgwqv7zxa7p2"; cargoPatches = [ ./0001-Add-cargo.lock.patch ]; cargoBuildFlags = [ "-p" pname ]; diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix index b70fa053a1..3cb5b96d58 100644 --- a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec{ pname = "cypress"; - version = "4.3.0"; + version = "4.4.1"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "0lrjha3zrsclpk8bhmv14vy1y5liahjkvcd87zm6cik1rnscaspw"; + sha256 = "0da1y90a6i3fjhyrzwwn3pavzbqin9v5v7hx8halz6i7cf1halfi"; }; # don't remove runtime deps diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix index 965a53dcdb..22da8cd751 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.110"; + version = "0.0.117"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "1fvvanyzrai41fq98msjwzgwsidxbaly6f6knma6lwmicv4f9svg"; + sha256 = "0i9azvhlwp5g699yagfbd5rnsr5kdnbw6lsz28nz1dzvmrj9xp7w"; }; preBuild = '' @@ -20,7 +20,7 @@ buildGoModule rec { rm $out/bin/helpgen ''; - modSha256 = "0lnk2g5msqhhshh99s32sqd793rdlzmp7vhqdb1fd6qafrrrxm5w"; + modSha256 = "0d0hfmdk81apha3r7zspam8wqadpy6qmqkgbq0sbiwrji4155hrh"; meta = with lib; { description = "Command line tools for fly.io services"; diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix index 14b64094ef..af8595b564 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.16.2"; - sha256 = "0y5yd6h13fr34byi7h5xdjaivgcxiz0ykcmpk9nm5ra01b54fp2m"; + version = "12.16.3"; + sha256 = "18srfcv9zi39960szdnd4rgfj9w295z1agjvpw8arwn75449nmgh"; } diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v13.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v13.nix index 1f32c660f8..f157269b63 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v13.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v13.nix @@ -1,13 +1,13 @@ { callPackage, openssl, icu, python3, enableNpm ? true }: let - buildNodejs = callPackage ./nodejs.nix { + buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; python = python3; }; in buildNodejs { inherit enableNpm; - version = "13.13.0"; - sha256 = "0wy7d2alli59gwl73hpaf3bz1wxkkcw5yjsgyz42695fz86p64b7"; + version = "13.14.0"; + sha256 = "1gi9nl99wsiqpwm266jdsa8g6rmjw4wqwgrkx9f2qk1y3hjcs0vf"; } diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix new file mode 100644 index 0000000000..e2f8dd7173 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix @@ -0,0 +1,14 @@ +{ callPackage, openssl, icu66, python3, enableNpm ? true }: + +let + buildNodejs = callPackage ./nodejs.nix { + inherit openssl; + icu = icu66; + python = python3; + }; +in + buildNodejs { + inherit enableNpm; + version = "14.1.0"; + sha256 = "0pw39628y8qi2jagmmnfj0fkcbv00qcd1cqybiprf1v22hhij44n"; + } diff --git a/third_party/nixpkgs/pkgs/development/web/remarkjs/default.nix b/third_party/nixpkgs/pkgs/development/web/remarkjs/default.nix index 7859e7b036..d9cc433fd8 100644 --- a/third_party/nixpkgs/pkgs/development/web/remarkjs/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/remarkjs/default.nix @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = "http://remarkjs.com"; + homepage = "https://remarkjs.com"; description = "A simple, in-browser, markdown-driven slideshow tool"; maintainers = []; platforms = stdenv.lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/games/chocolate-doom/default.nix b/third_party/nixpkgs/pkgs/games/chocolate-doom/default.nix index 7eef6b5dff..1c2a24de01 100644 --- a/third_party/nixpkgs/pkgs/games/chocolate-doom/default.nix +++ b/third_party/nixpkgs/pkgs/games/chocolate-doom/default.nix @@ -1,17 +1,22 @@ -{ stdenv, autoreconfHook, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }: +{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "chocolate-doom-2.3.0"; - src = fetchurl { - url = "https://github.com/chocolate-doom/chocolate-doom/archive/${name}.tar.gz"; - sha256 = "0i57smxmbhxj0wgvxq845ba9zsn5nx5wmzkl71rdchyd4q5jmida"; + pname = "chocolate-doom"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "chocolate-doom"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "0ajzb767wyj8vzhjpsmgslw42b0155ji4alk26shxl7k5ijbzn0j"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ SDL SDL_mixer SDL_net ]; - patchPhase = '' + + postPatch = '' sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am ''; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; enableParallelBuilding = true; meta = { diff --git a/third_party/nixpkgs/pkgs/games/endless-sky/default.nix b/third_party/nixpkgs/pkgs/games/endless-sky/default.nix index f0950cf4d3..76ab6542a7 100644 --- a/third_party/nixpkgs/pkgs/games/endless-sky/default.nix +++ b/third_party/nixpkgs/pkgs/games/endless-sky/default.nix @@ -3,7 +3,7 @@ }: let - version = "0.9.11"; + version = "0.9.12"; in stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { owner = "endless-sky"; repo = "endless-sky"; rev = "v${version}"; - sha256 = "0f4svg448bg8qx49f8fr8l4yzks7an6673jwgva15p3zzfxy6w03"; + sha256 = "1hly68ljm7yv01jfxyr7g6jivhj0igg6xx7vi92zqymick0hlh7a"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/games/gnuchess/default.nix b/third_party/nixpkgs/pkgs/games/gnuchess/default.nix index 43c60c6673..478da6dc32 100644 --- a/third_party/nixpkgs/pkgs/games/gnuchess/default.nix +++ b/third_party/nixpkgs/pkgs/games/gnuchess/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, flex}: +{stdenv, fetchurl, flex, makeWrapper}: let s = # Generated upstream information rec { baseName="gnuchess"; - version="6.2.5"; + version="6.2.6"; name="${baseName}-${version}"; url="mirror://gnu/chess/${name}.tar.gz"; - sha256="00j8s0npgfdi41a0mr5w9qbdxagdk2v41lcr42rwl1jp6miyk6cs"; + sha256="0kxhdv01ia91v2y0cmzbll391ns2vbmn65jjrv37h4s1srszh5yn"; }; buildInputs = [ flex @@ -18,6 +18,13 @@ stdenv.mkDerivation { inherit (s) url sha256; }; inherit buildInputs; + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/gnuchessx --set PATH "$out/bin" + wrapProgram $out/bin/gnuchessu --set PATH "$out/bin" + ''; + meta = { inherit (s) version; description = "GNU Chess engine"; diff --git a/third_party/nixpkgs/pkgs/games/steam/runtime-generated.nix b/third_party/nixpkgs/pkgs/games/steam/runtime-generated.nix index 36f16b6155..2f9fc51779 100644 --- a/third_party/nixpkgs/pkgs/games/steam/runtime-generated.nix +++ b/third_party/nixpkgs/pkgs/games/steam/runtime-generated.nix @@ -129,6 +129,15 @@ name = "libatk1.0-0.deb"; }; } + rec { + name = "libatomic1_5.4.0-7.really.6+steamrt1.2+srt2_amd64"; + sha256 = "8dd843d4497f66c1af07551d8cc636e63ffff692187b51d0a01191c96bc0049a"; + url = "mirror://steamrt/pool/main/g/gcc-5/libatomic1_5.4.0-7.really.6+steamrt1.2+srt2_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libatomic1.deb"; + }; + } rec { name = "libattr1_2.4.46-5ubuntu1+steamrt1.1+srt2_amd64"; sha256 = "d33b00c3e19337f3abbb070f646adda7420f171f5487dca5e253b68b63a4d8fc"; @@ -246,6 +255,15 @@ name = "libcap2.deb"; }; } + rec { + name = "libcapsule-tools-relocatable_0.20190926.0-0co1+srt1_amd64"; + sha256 = "9ddaac17a0f812eec785e34eefccb8ea24a4abf0fa6ad008d03b26d5493ea010"; + url = "mirror://steamrt/pool/main/libc/libcapsule/libcapsule-tools-relocatable_0.20190926.0-0co1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libcapsule-tools-relocatable.deb"; + }; + } rec { name = "libcg_3.0.0016-0ubuntu1+srt6_amd64"; sha256 = "6e627aa3ff1724ec8759431f3ead530f4c1511eb2b881d168a1929c8eac2e196"; @@ -669,6 +687,15 @@ name = "libindicator7.deb"; }; } + rec { + name = "libitm1_5.4.0-7.really.6+steamrt1.2+srt2_amd64"; + sha256 = "3c01841997e77fe1616b16936394c86383dc76e875f70e6d96ed016e4b945050"; + url = "mirror://steamrt/pool/main/g/gcc-5/libitm1_5.4.0-7.really.6+steamrt1.2+srt2_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libitm1.deb"; + }; + } rec { name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt5_amd64"; sha256 = "9a419baf1b88386cf643ca64965de607321e5d27f13c5bd68be0eb1a803fd7a9"; @@ -993,6 +1020,15 @@ name = "libpulse0.deb"; }; } + rec { + name = "libquadmath0_5.4.0-7.really.6+steamrt1.2+srt2_amd64"; + sha256 = "12523138b2f21cd6d824b5c778ee49789ef0129ba6207cf03d3cf6b4138b1a1b"; + url = "mirror://steamrt/pool/main/g/gcc-5/libquadmath0_5.4.0-7.really.6+steamrt1.2+srt2_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libquadmath0.deb"; + }; + } rec { name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; sha256 = "e55b129066b92ab99f518d2f857b54e8754c3c873b5fb603270e3c4c36564a7b"; @@ -1192,27 +1228,27 @@ }; } rec { - name = "libsteam-runtime-tools-0-0_0.20200109.0-0+steamrt1.1+srt1_amd64"; - sha256 = "680a2855b601ecccc81179df162722081ad0c7f4d1689e25bbce9d19de1a3eb6"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-0_0.20200109.0-0+steamrt1.1+srt1_amd64.deb"; + name = "libsteam-runtime-tools-0-0_0.20200415.0+srt1_amd64"; + sha256 = "0db05ccf5ca6705a6001d2c43ae5163cc289ef60126381bf886014e2344b4190"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-0_0.20200415.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsteam-runtime-tools-0-0.deb"; }; } rec { - name = "libsteam-runtime-tools-0-helpers_0.20200109.0-0+steamrt1.1+srt1_amd64"; - sha256 = "b33f5c1217c7927057428b54faa4d0fcdddda1b5b18d708f755e96893ed6e108"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-helpers_0.20200109.0-0+steamrt1.1+srt1_amd64.deb"; + name = "libsteam-runtime-tools-0-helpers_0.20200415.0+srt1_amd64"; + sha256 = "c568548d3c73df1c61efe06574e4ab17c2250059e9659690dec6c43db8695ce8"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-helpers_0.20200415.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsteam-runtime-tools-0-helpers.deb"; }; } rec { - name = "libsteam-runtime-tools-0-relocatable-libs_0.20200109.0-0+steamrt1.1+srt1_amd64"; - sha256 = "4f2ddb4dd6f48636f95bb301541a023ba8235672e1e053be8da9961787958d18"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-relocatable-libs_0.20200109.0-0+steamrt1.1+srt1_amd64.deb"; + name = "libsteam-runtime-tools-0-relocatable-libs_0.20200415.0+srt1_amd64"; + sha256 = "450c03778f4901e8b54f5dc879b071a84d18f4fc65e6308b91eebf40c77ef093"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-relocatable-libs_0.20200415.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsteam-runtime-tools-0-relocatable-libs.deb"; @@ -1444,18 +1480,18 @@ }; } rec { - name = "libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_amd64"; - sha256 = "99b0d38e6a2240dbea57c3ebee18de7013ee5d346c82bc82243c18e66bc50ae4"; - url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_amd64.deb"; + name = "libvulkan1_1.2.135.0-1~steamrt1.1+srt1_amd64"; + sha256 = "fa3dfb44b47c35e8a16de3c8240accdca131b70dd59a84f6e38cc6824219fa28"; + url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.2.135.0-1~steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvulkan1.deb"; }; } rec { - name = "libwaffle-1-0_1.6.0-2~steamrt1.3+srt1_amd64"; - sha256 = "40ebf5f91707d0f183841ab8673f7bdd6d77540f090fc97cb69be54381c382be"; - url = "mirror://steamrt/pool/main/w/waffle/libwaffle-1-0_1.6.0-2~steamrt1.3+srt1_amd64.deb"; + name = "libwaffle-1-0_1.6.1-0+steamrt1.1+srt1_amd64"; + sha256 = "a2a73515ddef193da5de918190df27fce75cf27c3081662c2f6fc5d227c96cc4"; + url = "mirror://steamrt/pool/main/w/waffle/libwaffle-1-0_1.6.1-0+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libwaffle-1-0.deb"; @@ -1912,27 +1948,27 @@ }; } rec { - name = "steam-runtime-tools-bin_0.20200109.0-0+steamrt1.1+srt1_amd64"; - sha256 = "b5fcefb31c79a4ac085ef1050cdb2770507fbcf04eae713f9f16fdc3a483a85d"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/steam-runtime-tools-bin_0.20200109.0-0+steamrt1.1+srt1_amd64.deb"; + name = "steam-runtime-tools-bin_0.20200415.0+srt1_amd64"; + sha256 = "e21848eb4cf02402600a952f5ca8bafbd95db9f5b3bb8d5af746721c5ac4ebc3"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/steam-runtime-tools-bin_0.20200415.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "steam-runtime-tools-bin.deb"; }; } rec { - name = "steamrt-legacy_1.20200128.0+srt1_amd64"; - sha256 = "16a8adf316032424fa5cd53f498c53472c45a66b572e8c60adb2ff3ae7556eed"; - url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20200128.0+srt1_amd64.deb"; + name = "steamrt-legacy_1.20200421.0+srt1_amd64"; + sha256 = "9ee2744dbefc6c8055d3f496ad8e7ab8df01049a5571b9558c23b15001218fa6"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20200421.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "steamrt-legacy.deb"; }; } rec { - name = "steamrt-libs_1.20200128.0+srt1_amd64"; - sha256 = "18247c8534f8d67f63f4ece884b15276e0eecf540d0758ed6d5ae8b6a6ba510b"; - url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20200128.0+srt1_amd64.deb"; + name = "steamrt-libs_1.20200421.0+srt1_amd64"; + sha256 = "52ffad4cdca3f7f1c8091474a1a978941512c993e52d15fadab49165e248603b"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20200421.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "steamrt-libs.deb"; @@ -1975,72 +2011,54 @@ }; } rec { - name = "vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64"; - sha256 = "b5c0c3fd9f5329f2aff54ce73f9281e3e61156556e1ee50c697b37f2144b1531"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64.deb"; + name = "vulkan-tools_1.2.135.0+dfsg1-1~steamrt1.1+srt1_amd64"; + sha256 = "bb70e1a31fe204319ea24292fe0ee7a9073f1b8f79e66ffb1ab192e500f8452b"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools_1.2.135.0+dfsg1-1~steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "vulkan-tools.deb"; }; } rec { - name = "vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64"; - sha256 = "33b03b9413ec308f5ee5b8699e9f9ad939b501b602eea185fdcaa69863deb70c"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64.deb"; + name = "vulkan-tools-multiarch_1.2.135.0+dfsg1-1~steamrt1.1+srt1_amd64"; + sha256 = "8e8aa0bf8fe147dd52e442a88e57a16f86b3a807201175585d47c64531865822"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools-multiarch_1.2.135.0+dfsg1-1~steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "vulkan-tools-multiarch.deb"; }; } rec { - name = "vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all"; - sha256 = "f10004e20ed5fc93edf035f8f34bb9f8307eb34974a3ed5aae9ba87f00a2c468"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all.deb"; - source = fetchurl { - inherit url sha256; - name = "vulkan-utils.deb"; - }; - } - rec { - name = "vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64"; - sha256 = "a1e9387bb5cb7effb23c5994dd2724614cfed7a447ec9c449ee4effcab58fd4c"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64.deb"; - source = fetchurl { - inherit url sha256; - name = "vulkan-utils-multiarch.deb"; - }; - } - rec { - name = "waffle-utils_1.6.0-2~steamrt1.3+srt1_amd64"; - sha256 = "b465d2c357b0376f355a99ac99830e78974747859ec4ca9084bdeff9891920d6"; - url = "mirror://steamrt/pool/main/w/waffle/waffle-utils_1.6.0-2~steamrt1.3+srt1_amd64.deb"; + name = "waffle-utils_1.6.1-0+steamrt1.1+srt1_amd64"; + sha256 = "ad14f1e2dcc6b9ed7b036989cf5f18efb683879927a4b474692bbe1d7ddbe94c"; + url = "mirror://steamrt/pool/main/w/waffle/waffle-utils_1.6.1-0+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "waffle-utils.deb"; }; } rec { - name = "waffle-utils-multiarch_1.6.0-2~steamrt1.3+srt1_amd64"; - sha256 = "de563095affd9fd5a4ec2941b72481bbd6176bdc210dad587372bab3cec406c1"; - url = "mirror://steamrt/pool/main/w/waffle/waffle-utils-multiarch_1.6.0-2~steamrt1.3+srt1_amd64.deb"; + name = "waffle-utils-multiarch_1.6.1-0+steamrt1.1+srt1_amd64"; + sha256 = "cf66bcb711bee45fb722d4125d37d8001fe7f3691f81ac224b62f849af0b4fba"; + url = "mirror://steamrt/pool/main/w/waffle/waffle-utils-multiarch_1.6.1-0+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "waffle-utils-multiarch.deb"; }; } rec { - name = "zenity_3.4.0-0ubuntu4+steamrt2+srt6_amd64"; - sha256 = "5eb59aa8d2211153c780aab2304e8694d7eb0204f284193ff2a037dc9e1274db"; - url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt6_amd64.deb"; + name = "zenity_3.4.0-0ubuntu4+steamrt3+srt1_amd64"; + sha256 = "c31a99f8d47cba157db251ea97cd14074d99c622969dd4d4173f76494feb7723"; + url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt3+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "zenity.deb"; }; } rec { - name = "zenity-common_3.4.0-0ubuntu4+steamrt2+srt6_all"; - sha256 = "bc8f0b80672833be72c6dd87d406b5fc0ef92e51f91e3a461678fc97844649bc"; - url = "mirror://steamrt/pool/main/z/zenity/zenity-common_3.4.0-0ubuntu4+steamrt2+srt6_all.deb"; + name = "zenity-common_3.4.0-0ubuntu4+steamrt3+srt1_all"; + sha256 = "7ec603c8b00c5573e88e1df9785af4baef93b54e377e697515eb939b7c119cdc"; + url = "mirror://steamrt/pool/main/z/zenity/zenity-common_3.4.0-0ubuntu4+steamrt3+srt1_all.deb"; source = fetchurl { inherit url sha256; name = "zenity-common.deb"; @@ -2183,6 +2201,15 @@ name = "libatk1.0-0.deb"; }; } + rec { + name = "libatomic1_5.4.0-7.really.6+steamrt1.2+srt2_i386"; + sha256 = "aafd5b3b573f22562e3f93bfa449ca374e2788fb14d555193c5c57e996def8fb"; + url = "mirror://steamrt/pool/main/g/gcc-5/libatomic1_5.4.0-7.really.6+steamrt1.2+srt2_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libatomic1.deb"; + }; + } rec { name = "libattr1_2.4.46-5ubuntu1+steamrt1.1+srt2_i386"; sha256 = "bcea5d6f2743c617dac44c4d836b6937a64816f3c288a56b656ee4adbf63714a"; @@ -2300,6 +2327,15 @@ name = "libcap2.deb"; }; } + rec { + name = "libcapsule-tools-relocatable_0.20190926.0-0co1+srt1_i386"; + sha256 = "5ce9e11e0204db54cecb59b59b1c6fc6bd5e4aefe73a327dbb85283b08591428"; + url = "mirror://steamrt/pool/main/libc/libcapsule/libcapsule-tools-relocatable_0.20190926.0-0co1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libcapsule-tools-relocatable.deb"; + }; + } rec { name = "libcg_3.0.0016-0ubuntu1+srt6_i386"; sha256 = "a21ba20d03f43163c1222fbc6a570c20783a1d504dcf92306ab029c437fd0df9"; @@ -2723,6 +2759,15 @@ name = "libindicator7.deb"; }; } + rec { + name = "libitm1_5.4.0-7.really.6+steamrt1.2+srt2_i386"; + sha256 = "188591aec152ece7b33b765079593a110a005046977d15794d5cc3be5b3381c7"; + url = "mirror://steamrt/pool/main/g/gcc-5/libitm1_5.4.0-7.really.6+steamrt1.2+srt2_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libitm1.deb"; + }; + } rec { name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt5_i386"; sha256 = "a59a4de570335899d10f36b4b9552ee894fc0bb21c4ee4e06ed689f3fa55c2e6"; @@ -3047,6 +3092,15 @@ name = "libpulse0.deb"; }; } + rec { + name = "libquadmath0_5.4.0-7.really.6+steamrt1.2+srt2_i386"; + sha256 = "58f646279972a537cf838fc935f9f37285e5255604d7b5c1e034644e77d3e25b"; + url = "mirror://steamrt/pool/main/g/gcc-5/libquadmath0_5.4.0-7.really.6+steamrt1.2+srt2_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libquadmath0.deb"; + }; + } rec { name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; sha256 = "8827d782d8fedf7fe0285bbab14914e61d2ac5fe5e7ea297fbff916c7fd73939"; @@ -3246,27 +3300,27 @@ }; } rec { - name = "libsteam-runtime-tools-0-0_0.20200109.0-0+steamrt1.1+srt1_i386"; - sha256 = "dfd80854857cdbc764f799f34acd7f37a4c3e773c4ba5c7c81394071148a140f"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-0_0.20200109.0-0+steamrt1.1+srt1_i386.deb"; + name = "libsteam-runtime-tools-0-0_0.20200415.0+srt1_i386"; + sha256 = "7da98a9a206829dbf5cc95570049502d1cf8dd2a2234a981787f14cc098c1739"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-0_0.20200415.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsteam-runtime-tools-0-0.deb"; }; } rec { - name = "libsteam-runtime-tools-0-helpers_0.20200109.0-0+steamrt1.1+srt1_i386"; - sha256 = "f2c5fc6abcc3a938e2a0b27e8682b56944a2a61416e8d0edb5878af2e16c98cb"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-helpers_0.20200109.0-0+steamrt1.1+srt1_i386.deb"; + name = "libsteam-runtime-tools-0-helpers_0.20200415.0+srt1_i386"; + sha256 = "bf06ad0ef0d5c80ddff53c58e4397c87fd655e1913ecf48a29560d27719b4d71"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-helpers_0.20200415.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsteam-runtime-tools-0-helpers.deb"; }; } rec { - name = "libsteam-runtime-tools-0-relocatable-libs_0.20200109.0-0+steamrt1.1+srt1_i386"; - sha256 = "c06ea7ec21d2114925c09d5245e87482c81cc4e1928ed31827ab58cb094721ae"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-relocatable-libs_0.20200109.0-0+steamrt1.1+srt1_i386.deb"; + name = "libsteam-runtime-tools-0-relocatable-libs_0.20200415.0+srt1_i386"; + sha256 = "79e3b5b5a2904daccb17f5f54e3a87842dd9408fe04a8fee8d4ee83c3a3c0bcf"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-relocatable-libs_0.20200415.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsteam-runtime-tools-0-relocatable-libs.deb"; @@ -3498,18 +3552,18 @@ }; } rec { - name = "libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_i386"; - sha256 = "ac161149e1106247de706788a7ea29dbe5e3c17c2b8aedf97ec892b311abbb75"; - url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_i386.deb"; + name = "libvulkan1_1.2.135.0-1~steamrt1.1+srt1_i386"; + sha256 = "dd6167b259a8ec4c927f3fa710d01456321b3ff40f6daa3383ec353866615aaa"; + url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.2.135.0-1~steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libvulkan1.deb"; }; } rec { - name = "libwaffle-1-0_1.6.0-2~steamrt1.3+srt1_i386"; - sha256 = "875ebdcc60fd8be86b6e83a2155bea69aa3ef7442d60eef277bcdf814c663452"; - url = "mirror://steamrt/pool/main/w/waffle/libwaffle-1-0_1.6.0-2~steamrt1.3+srt1_i386.deb"; + name = "libwaffle-1-0_1.6.1-0+steamrt1.1+srt1_i386"; + sha256 = "06f22a35ca49969e44f1bdaca82a1d085e69211bf3b39915d77d80f414ea8668"; + url = "mirror://steamrt/pool/main/w/waffle/libwaffle-1-0_1.6.1-0+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libwaffle-1-0.deb"; @@ -3966,27 +4020,27 @@ }; } rec { - name = "steam-runtime-tools-bin_0.20200109.0-0+steamrt1.1+srt1_i386"; - sha256 = "52e587b75463b08e0e903e30cd4b836bd4e39ead8d556807e5628eff36fdc477"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/steam-runtime-tools-bin_0.20200109.0-0+steamrt1.1+srt1_i386.deb"; + name = "steam-runtime-tools-bin_0.20200415.0+srt1_i386"; + sha256 = "3ea27a32f19f6e5133385fe4072f3d9a027c4f83604355baa34cf3ae5e346db5"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/steam-runtime-tools-bin_0.20200415.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "steam-runtime-tools-bin.deb"; }; } rec { - name = "steamrt-legacy_1.20200128.0+srt1_i386"; - sha256 = "3adf8b89ac83f12eeb431785bd18a569b1174bc81aa24d5c562687b823704f28"; - url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20200128.0+srt1_i386.deb"; + name = "steamrt-legacy_1.20200421.0+srt1_i386"; + sha256 = "08371f2a03aacd50f578b7aca4e6934fc60b9db1927e9eb3c8f1a5f6421e79e5"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20200421.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "steamrt-legacy.deb"; }; } rec { - name = "steamrt-libs_1.20200128.0+srt1_i386"; - sha256 = "8ad6092d1b4d257883ca4f3fac8ee5b9a71413c8bdbc149a9bec843047867311"; - url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20200128.0+srt1_i386.deb"; + name = "steamrt-libs_1.20200421.0+srt1_i386"; + sha256 = "0f84ef7ebea603df58d4549a8368a51ceb3989d136174870bfd4c2ed50a13195"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20200421.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "steamrt-libs.deb"; @@ -4029,72 +4083,54 @@ }; } rec { - name = "vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386"; - sha256 = "6a8576cc6fadc4d18c97b100dc24bad1906f6f56cab024997787355025695df4"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386.deb"; + name = "vulkan-tools_1.2.135.0+dfsg1-1~steamrt1.1+srt1_i386"; + sha256 = "1a252f79e90034726d80e49ab892ddfd504fa32dfef93887ed2c6e6e83e77248"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools_1.2.135.0+dfsg1-1~steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "vulkan-tools.deb"; }; } rec { - name = "vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386"; - sha256 = "fae0430f540c71bd8f6ab3099f8aa132d2eda858b66facf3d8a586ab38cffde6"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386.deb"; + name = "vulkan-tools-multiarch_1.2.135.0+dfsg1-1~steamrt1.1+srt1_i386"; + sha256 = "f7f68aefcb4f45f855949ad84463c68071595568db27480d3df3ed9be5683b5f"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools-multiarch_1.2.135.0+dfsg1-1~steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "vulkan-tools-multiarch.deb"; }; } rec { - name = "vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all"; - sha256 = "f10004e20ed5fc93edf035f8f34bb9f8307eb34974a3ed5aae9ba87f00a2c468"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all.deb"; - source = fetchurl { - inherit url sha256; - name = "vulkan-utils.deb"; - }; - } - rec { - name = "vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386"; - sha256 = "f81b81ef14f11662d2d5e5a7f688c2ef4f9ad9625ec5e59de91aab3f1ad45406"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386.deb"; - source = fetchurl { - inherit url sha256; - name = "vulkan-utils-multiarch.deb"; - }; - } - rec { - name = "waffle-utils_1.6.0-2~steamrt1.3+srt1_i386"; - sha256 = "37df214d4f0fd1c5e9afce405756fc1615f2d5cba468b34569b13f3e8a08a2a5"; - url = "mirror://steamrt/pool/main/w/waffle/waffle-utils_1.6.0-2~steamrt1.3+srt1_i386.deb"; + name = "waffle-utils_1.6.1-0+steamrt1.1+srt1_i386"; + sha256 = "c88c88a12f5a9486a20275624c45ab7ac2170e846ea1368d1180e7b39c9d586f"; + url = "mirror://steamrt/pool/main/w/waffle/waffle-utils_1.6.1-0+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "waffle-utils.deb"; }; } rec { - name = "waffle-utils-multiarch_1.6.0-2~steamrt1.3+srt1_i386"; - sha256 = "5866f8bf43b6c19608670a8c565ce8f0dac9db9c943e65ac25e9cb4f951997a4"; - url = "mirror://steamrt/pool/main/w/waffle/waffle-utils-multiarch_1.6.0-2~steamrt1.3+srt1_i386.deb"; + name = "waffle-utils-multiarch_1.6.1-0+steamrt1.1+srt1_i386"; + sha256 = "9aa2ee8c466c343dda5c8db9465238eb5f4cb55b5cfcfca8a3c109ba1d6c6d65"; + url = "mirror://steamrt/pool/main/w/waffle/waffle-utils-multiarch_1.6.1-0+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "waffle-utils-multiarch.deb"; }; } rec { - name = "zenity_3.4.0-0ubuntu4+steamrt2+srt6_i386"; - sha256 = "1c772d4f96424d204ab4913efcafbe43518257ca5032ca7b23d6c6ab76439117"; - url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt6_i386.deb"; + name = "zenity_3.4.0-0ubuntu4+steamrt3+srt1_i386"; + sha256 = "b8b0d0781ed2e59ac22af8006e61323a5f1f5be44d47e0fea0ca32e8c575528d"; + url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt3+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "zenity.deb"; }; } rec { - name = "zenity-common_3.4.0-0ubuntu4+steamrt2+srt6_all"; - sha256 = "bc8f0b80672833be72c6dd87d406b5fc0ef92e51f91e3a461678fc97844649bc"; - url = "mirror://steamrt/pool/main/z/zenity/zenity-common_3.4.0-0ubuntu4+steamrt2+srt6_all.deb"; + name = "zenity-common_3.4.0-0ubuntu4+steamrt3+srt1_all"; + sha256 = "7ec603c8b00c5573e88e1df9785af4baef93b54e377e697515eb939b7c119cdc"; + url = "mirror://steamrt/pool/main/z/zenity/zenity-common_3.4.0-0ubuntu4+steamrt3+srt1_all.deb"; source = fetchurl { inherit url sha256; name = "zenity-common.deb"; diff --git a/third_party/nixpkgs/pkgs/misc/apulse/default.nix b/third_party/nixpkgs/pkgs/misc/apulse/default.nix index 273e358184..33ba0bf867 100644 --- a/third_party/nixpkgs/pkgs/misc/apulse/default.nix +++ b/third_party/nixpkgs/pkgs/misc/apulse/default.nix @@ -5,13 +5,13 @@ let oz = x: if x then "1" else "0"; in stdenv.mkDerivation rec { pname = "apulse"; - version = "0.1.12"; + version = "0.1.13"; src = fetchFromGitHub { owner = "i-rinat"; repo = pname; rev = "v${version}"; - sha256 = "0yk9vgb4aws8xnkhdhgpxp5c0rri8yq61yxk85j99j8ax806i3r8"; + sha256 = "1p6fh6ah5v3qz7dxhcsixx38bxg44ypbim4m03bxk3ls5i9xslmn"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix b/third_party/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix index 664fa8fcb8..596f5e90e3 100644 --- a/third_party/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix @@ -6,7 +6,7 @@ let , platform ? null , extraMakeFlags ? [] , extraMeta ? {} - , version ? "2.2" + , version ? "2.3" , ... } @ args: stdenv.mkDerivation ({ @@ -16,8 +16,8 @@ let src = fetchFromGitHub { owner = "ARM-software"; repo = "arm-trusted-firmware"; - rev = "refs/tags/v${version}"; - sha256 = "03fjl5hy1bqlya6fg553bqz7jrvilzrzpbs87cv6jd04v8qrvry8"; + rev = "v${version}"; + sha256 = "113mcf1hwwl0i90cqh08lywxs1bfbg0nwqibay9wlkmx1a5v0bnj"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -51,7 +51,7 @@ let homepage = "https://github.com/ARM-software/arm-trusted-firmware"; description = "A reference implementation of secure world software for ARMv8-A"; license = licenses.bsd3; - maintainers = [ maintainers.lopsided98 ]; + maintainers = with maintainers; [ lopsided98 ]; } // extraMeta; } // builtins.removeAttrs args [ "extraMeta" ]); diff --git a/third_party/nixpkgs/pkgs/misc/cups/default.nix b/third_party/nixpkgs/pkgs/misc/cups/default.nix index f229ced893..b16c0645cd 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/default.nix @@ -13,7 +13,7 @@ , acl , gmp , darwin -, libusb ? null +, libusb1 ? null , gnutls ? null , avahi ? null , libpaper ? null @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig removeReferencesTo ]; - buildInputs = [ zlib libjpeg libpng libtiff libusb gnutls libpaper ] + buildInputs = [ zlib libjpeg libpng libtiff libusb1 gnutls libpaper ] ++ optionals stdenv.isLinux [ avahi pam dbus ] ++ optional enableSystemd systemd # Separate from above only to not modify order, to avoid mass rebuilds; merge this with the above at next big change. @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { "--enable-dbus" "--enable-pam" "--with-dbusdir=${placeholder "out"}/share/dbus-1" - ] ++ optional (libusb != null) "--enable-libusb" + ] ++ optional (libusb1 != null) "--enable-libusb" ++ optional (gnutls != null) "--enable-ssl" ++ optional (avahi != null) "--enable-avahi" ++ optional (libpaper != null) "--enable-libpaper" diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix index 323163bed3..b04ef89d21 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb, libtool +{ stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb1, libtool , withDebug ? false }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; buildInputs = [ - cups automake autoconf glib libxml2 libusb libtool + cups automake autoconf glib libxml2 libusb1 libtool ]; # lgmon3's --enable-libdir flag is used soley for specifying in which @@ -37,7 +37,7 @@ stdenv.mkDerivation { cd lgmon3 substituteInPlace src/Makefile.am \ --replace /usr/include/libusb-1.0 \ - ${libusb.dev}/include/libusb-1.0 + ${libusb1.dev}/include/libusb-1.0 ./autogen.sh --prefix=$out --enable-progpath=$out/bin \ --datadir=$out/share \ --enable-libdir=/var/cache/cups diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix index 679d890699..9b328c20b7 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, autoconf, automake, libtool, cups, popt, libtiff, libpng, - ghostscript, glib, libusb, libxml2 }: + ghostscript, glib, libusb1, libxml2 }: /* this derivation is basically just a transcription of the rpm .spec file included in the tarball */ -let arch = +let arch = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else if stdenv.hostPlatform.system == "i686-linux" then "32" else throw "Unsupported system ${stdenv.hostPlatform.system}"; @@ -32,7 +32,7 @@ in stdenv.mkDerivation { buildInputs = [ autoconf libtool automake cups popt libtiff libpng - ghostscript glib libusb libxml2 ]; + ghostscript glib libusb1 libxml2 ]; # patches from https://github.com/tokiclover/bar-overlay/tree/master/net-print/cnijfilter patches = [ @@ -53,10 +53,10 @@ in stdenv.mkDerivation { configurePhase = '' cd libs - ./autogen.sh --prefix=$out + ./autogen.sh --prefix=$out cd ../bscc2sts - ./autogen.sh + ./autogen.sh cd ../cnijnpr ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib @@ -68,25 +68,25 @@ in stdenv.mkDerivation { ./autogen.sh --prefix=$out --enable-progpath=$out/bin cd ../pstocanonij - ./autogen.sh --prefix=$out --enable-progpath=$out/bin + ./autogen.sh --prefix=$out --enable-progpath=$out/bin cd ../backend ./autogen.sh --prefix=$out cd ../backendnet - ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin + ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin cd ../cmdtocanonij ./autogen.sh --prefix=$out --datadir=$out/share cd ../cnijbe - ./autogen.sh --prefix=$out --enable-progpath=$out/bin + ./autogen.sh --prefix=$out --enable-progpath=$out/bin cd ../lgmon2 substituteInPlace src/Makefile.am \ --replace /usr/include/libusb-1.0 \ - ${libusb.dev}/include/libusb-1.0 - ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin + ${libusb1.dev}/include/libusb-1.0 + ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin cd ..; diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix index 308be5337d..4088ce700d 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, libusb, libxml2, perl }: +{ stdenv, fetchurl, cups, libusb-compat-0_1, libxml2, perl }: let @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { buildInputs = [ cups - libusb + libusb-compat-0_1 libxml2 perl ]; @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { done patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so" - patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" + patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ ''; diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.37.nix index b7e75c2a16..c205560706 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.37.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.37.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, libusb, libxml2 }: +{ stdenv, fetchurl, cups, libusb-compat-0_1, libxml2 }: let @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { buildInputs = [ cups - libusb + libusb-compat-0_1 libxml2 ]; @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { done patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so" - patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" + patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ ''; diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/4.01.17.nix index 755003e4d3..5de93b20cb 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -11,14 +11,14 @@ # } # (This advice was tested on the 1st November 2016.) -{ stdenv, fetchurl, cups, libusb }: +{ stdenv, fetchurl, cups, libusb-compat-0_1 }: # Do not bump lightly! Visit # to see what will break when upgrading. Consider a new versioned attribute. let installationPath = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else "i386"; appendPath = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else ""; - libPath = stdenv.lib.makeLibraryPath [ cups libusb ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}"; + libPath = stdenv.lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}"; in stdenv.mkDerivation rec { pname = "samsung-UnifiedLinuxDriver"; version = "4.01.17"; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epkowa/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/epkowa/default.nix index ecf79a953f..9724e68a04 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/epkowa/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/epkowa/default.nix @@ -3,7 +3,7 @@ pkgconfig, libtool, gtk2, libxml2, libxslt, -libusb, +libusb-compat-0_1, sane-backends, rpm, cpio, getopt, @@ -263,7 +263,7 @@ stdenv.mkDerivation rec { gtk2 libxml2 libtool - libusb + libusb-compat-0_1 sane-backends makeWrapper ]; 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 4edc08a357..a1420a0428 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.1"; + version = "1.1.11"; 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/09/72/04/c6d928e83e558c4ba1e7e8bcb5c1fe080b8095eb/epson-inkjet-printer-escpr2-1.1.1-1lsb3.2.src.rpm" - "https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/09/72/04/c6d928e83e558c4ba1e7e8bcb5c1fe080b8095eb/epson-inkjet-printer-escpr2-1.1.1-1lsb3.2.src.rpm" + "https://download3.ebz.epson.net/dsc/f/03/00/11/01/98/8ff121831d0a6be76e86b87c78178f3c93df6d0f/epson-inkjet-printer-escpr2-1.1.11-1lsb3.2.src.rpm" + "https://web.archive.org/web/20200425154102/https://download3.ebz.epson.net/dsc/f/03/00/11/01/98/8ff121831d0a6be76e86b87c78178f3c93df6d0f/epson-inkjet-printer-escpr2-1.1.11-1lsb3.2.src.rpm" ]; - sha256 = "02vdlhvinsx6vsjq172b2c1vrfzkg0w9j5lbsnjvj6yq3yqz5b5q"; + sha256 = "1gcdzmqli7jycljm66mdssivb3lk223ih6zg0l3lyn7hj2gbkinm"; }; patches = [ ./cups-filter-ppd-dirs.patch ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { Refer to the description of epson-escpr for usage. ''; license = licenses.gpl2; - maintainers = with maintainers; [ ma9e ]; + maintainers = with maintainers; [ ma9e ma27 ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix index 96c0968882..9946f49932 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix @@ -2,7 +2,7 @@ { stdenv, lib, fetchurl, makeWrapper, pkgconfig , ijs, zlib , gimp2Support ? false, gimp -, cupsSupport ? true, cups, libusb, perl +, cupsSupport ? true, cups, libusb-compat-0_1, perl }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ ijs zlib ] ++ lib.optionals gimp2Support [ gimp.gtk gimp ] - ++ lib.optionals cupsSupport [ cups libusb perl ]; + ++ lib.optionals cupsSupport [ cups libusb-compat-0_1 perl ]; configureFlags = lib.optionals cupsSupport [ "--disable-static-genppd" # should be harmless on NixOS diff --git a/third_party/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix index 0ae92121ca..6560024b19 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,25 +1,22 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, wrapGAppsHook, intltool, pkgconfig -, SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, portaudio }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig +, SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, pulseaudio, portaudio }: stdenv.mkDerivation rec { pname = "snes9x-gtk"; - version = "1.57"; + version = "1.60"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; rev = version; - sha256 = "1jcvj2l03b98iz6aq4x747vfz7i6h6j339z4brj4vz71s11vn31a"; + sha256 = "12hpn7zcdvp30ldpw2zf115yjqv55n1ldjbids7vx0lvbpr06dm1"; }; enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook wrapGAppsHook intltool pkgconfig ]; - buildInputs = [ SDL2 zlib gtk3 libxml2 libXv epoxy minizip portaudio ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; + buildInputs = [ SDL2 zlib gtk3 libxml2 libXv epoxy minizip pulseaudio portaudio ]; - preAutoreconf = '' - cd gtk - intltoolize - ''; + preConfigure = "cd gtk"; meta = with stdenv.lib; { homepage = "http://www.snes9x.com"; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix index 0e3eb2ce69..964e08674c 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix @@ -56,8 +56,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20191224"; - sha256 = "07q3zh2i3xqzpg46ljarhq3a4ha9zwpc6jqzvly0kfglkh3b3v66"; + version = "20200412"; + sha256 = "0ccr8wdmhkhbccxs5hvn44ppl969n8j0c3rnnir5v6akjcb2nzzv"; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix b/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix index c47825f901..a93f7e6aea 100644 --- a/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix +++ b/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix @@ -10,10 +10,10 @@ }: let - version = "1.12.1"; + version = "1.13"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "1sk6hbbnf4g6q58fspwlh8bn16j73j3i8hlcshqxzhfhl746krb3"; + sha256 = "11gqsl2x18hgwdjajag9q8qdxqvdqr9m67zka22z7hnd3k569vjz"; }; in stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "16zi0d2jjm2nlrwkwvsxzfpgy45ami45wfh67wq7na2h2ywfmgcp"; + sha256 = "1zc73l5vm4hca8niaa3y76kpk7i9vj89wv4gbxmf1yjmixb71hby"; }; # postPatch: diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 1099ca84af..f0d93572de 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -473,12 +473,12 @@ let coc-java = buildVimPluginFrom2Nix { pname = "coc-java"; - version = "2020-04-10"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-java"; - rev = "e4dd6b744f7eb356afa8db7b958bdf5910b5ec6f"; - sha256 = "0fndkbmi84qgqfj6ny04wm05mnrvrg36bb04vk7zj90k8a51xrrr"; + rev = "3c914c2b9e154889361d2631cd2188cf7e5fa020"; + sha256 = "0q7q2z7k2sxqgi6nyj669iq2p4h3962i8hv3gzg2mpi0p73xs98k"; }; meta.homepage = "https://github.com/neoclide/coc-java/"; }; @@ -521,12 +521,12 @@ let coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-04-21"; + version = "2020-04-22"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "fdddbbdbe04cdb077b7a2006c295d7a95343c4bb"; - sha256 = "0g0zqxmakwmjr9ii0v5rxiyvv3k909lzvkxkw0hyhpdkbpmzjkxl"; + rev = "b35bb16122d8771c9936f1203d0c712d45017f13"; + sha256 = "1w9vgxai421j3qbzbm42hq3fyzwf2a9n89y10vj9vhir0q0j8az0"; }; meta.homepage = "https://github.com/ckipp01/coc-metals/"; }; @@ -569,12 +569,12 @@ let coc-python = buildVimPluginFrom2Nix { pname = "coc-python"; - version = "2020-02-21"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-python"; - rev = "6a5104d18ae5ebf7d9b84af7c4a34c6ced62aee8"; - sha256 = "0l8zrb2bhv1apx2vp8gswqh7v64dxfd8124cggxfkkzdqyxr10w0"; + rev = "968aec39f74c6f80e6c9c3c0fed51b6113a1a35a"; + sha256 = "135z48idr8r7604ymiqdsml9z6d3swaja89697znszigpy05nz11"; }; meta.homepage = "https://github.com/neoclide/coc-python/"; }; @@ -593,16 +593,27 @@ let coc-rls = buildVimPluginFrom2Nix { pname = "coc-rls"; - version = "2019-12-07"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-rls"; - rev = "c899418e8fae4a8c3eb15fee48513ae050b11d60"; - sha256 = "0sipvs8r8i239l2334k4qnhwpaijwd524q598rp4ma34ry42c2xl"; + rev = "142353e2f71cb6c1b235db0cf430ca53e211613b"; + sha256 = "07gkspvh5l25vyny5waiw0y3fm5a8qbrml13r7llgp4lqzzh96bd"; }; meta.homepage = "https://github.com/neoclide/coc-rls/"; }; + coc-rust-analyzer = buildVimPluginFrom2Nix { + pname = "coc-rust-analyzer"; + version = "2020-04-24"; + src = fetchFromGitHub { + owner = "fannheyward"; + repo = "coc-rust-analyzer"; + rev = "1dcdf6768520bff29921c50ef904478cbdfe0fb8"; + sha256 = "1p6hyixx9bjpyy42g2w4bnxwv9hafs5ppsx1fq8gndnq3nsjcyl3"; + }; + }; + coc-smartf = buildVimPluginFrom2Nix { pname = "coc-smartf"; version = "2019-07-26"; @@ -617,12 +628,12 @@ let coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2020-04-16"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "21f65e0de83936f8db27ce1bc4a93251adfeef5a"; - sha256 = "1ahh143yq6hb8f3xv5kvj3dy2017yzl9vn31gfabswvdmdjm37in"; + rev = "cad80795d4abcbbd2aa6da462af1087e9134b4eb"; + sha256 = "04wk7x148dcw3rx4fh3c7c80qillq0bf9vfdkc9l8xaglk0xh73h"; }; meta.homepage = "https://github.com/neoclide/coc-snippets/"; }; @@ -773,12 +784,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-04-21"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "1cedc9a852cc7e246665ca1d662bd8978ac5405c"; - sha256 = "1vqm9s68148715gb5x5xrhl5ajwi881d86hq7906lp7b8gk5d6is"; + rev = "0d4f02555e5aaecbd8efef47a70ba2f2c6412d1f"; + sha256 = "0129gr3hsagr1lzngvbgs4bnvj92izxavval0zyxgh68w3vlak42"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1038,12 +1049,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-04-20"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "6d2174645f3a7ab790546940b02024d72296e4c1"; - sha256 = "0dnnnwr01c4jgjyjnk4hivj4hiyar4j60fy2jc3l91aqd4m845vl"; + rev = "609c85797a5f6acc2e2357cf56e7f6c78c561145"; + sha256 = "0rx0nvsyzj1wl7p30g769cidspkq3xpvzpdhz94qfsczdm68yhi0"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1692,12 +1703,12 @@ let iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg-vim"; - version = "2020-03-06"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "1740235846c92666fe521e550a27fa47ebe5f5a3"; - sha256 = "13zf899kgwjhrksznz2212ywml7nnqwq2dyam39nzywf8msg8va6"; + rev = "acf6696e14fd8cfa2ed338076a7c3a68fad42486"; + sha256 = "1hy9n37nkkax6qdcg23a522bz26r8b23w9kj570qml9v3ck4ihqm"; }; meta.homepage = "https://github.com/cocopon/iceberg.vim/"; }; @@ -1873,12 +1884,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2020-04-17"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "34c24ee0f8476dfc573e22f9f6a6fe4eec466225"; - sha256 = "0yy50yb28md5z2yzcaq45cchd8c44q12xvwcb2yh3r9nhgqhll2h"; + rev = "c97e5cfb6ef20b725f859af694bec9c6a3a44145"; + sha256 = "1349v5lhc4dg7ir42jj157jyf29bm7pj73h64n2501ddqdkb1zqd"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2269,12 +2280,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-03-20"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "d02b169e70bd6d2b2365bf6cda721967616a30bf"; - sha256 = "1cya26wfqc7l7dqy854m4kwrq3w66knmn2cgviqh9cnsjzhwxs0d"; + rev = "7af08e5a80c095a836d3f6762b991c6f9c4f2f2f"; + sha256 = "17llh2jh2igkbjmnbii54g4x9g57y6xflh8d40wim980pb3jr57s"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2353,12 +2364,12 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-04-20"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "e3ece229fc0f26cb114f629faa2dc979e16e8e8a"; - sha256 = "1g823p6qvxvxv5l9f3lb0dyf9pzrr7i3qw8n1rqfs2w0xipj6arl"; + rev = "48900bd6a008120aeb33e3807f1d2c18985ad210"; + sha256 = "1x788nrrxaa12cqsdi2gdx2haxji3v4rahpxjq309kd5s40m9z2j"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; @@ -2521,12 +2532,12 @@ let nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-04-21"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "39b743b9b36be26a5e58278d7608fe456a0ad3f8"; - sha256 = "15q7d0qxdvvn79rwy87aiynilxn8vcnym2w252x1p3s4wqsx1psi"; + rev = "d1507239df1d9f2758f1ad75634046c4d024cfd8"; + sha256 = "00smhjk73xwzmxqjwqi1srmfbirl065gii65gj1lhfi6vha7h9k1"; }; meta.homepage = "https://github.com/neovim/nvim-lsp/"; }; @@ -3229,12 +3240,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-01-23"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "majutsushi"; repo = "tagbar"; - rev = "679a9d9ac9579bd18225409d85ed4870fb6c9c62"; - sha256 = "1s4736104vfaj7rfcdzcnmgbnxxi0ngs07km0p2fi1m2zc68602l"; + rev = "1e50ea85361b7144acad459eb091973089b780f6"; + sha256 = "09w7vwzacny6kbf9s2ihan8k682qljp8zad1dh5ds0738a3nwxpl"; }; meta.homepage = "https://github.com/majutsushi/tagbar/"; }; @@ -3277,12 +3288,12 @@ let tender-vim = buildVimPluginFrom2Nix { pname = "tender-vim"; - version = "2020-02-18"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "jacoborus"; repo = "tender.vim"; - rev = "f93b2f373cc21826524c94fbd1f3b3a4c55173d2"; - sha256 = "0bfns5vsbyh1s01s295hbf8h04n21cfkfp8b2r3cfr8mcvazpmpq"; + rev = "44d04bc9ecb0188e7b1a3e6b6715b9a63dc8f3e1"; + sha256 = "059my5q6gqjdkaf7qn842h92c6y7lp5z8wpwsi2ww6anzy85506z"; }; meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; @@ -3506,12 +3517,12 @@ let vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2020-04-18"; + version = "2020-04-22"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "6a8cd0f825c3d7b071ebd0dce81a7707ec0be652"; - sha256 = "1qyqc7j8sdq3xnp871hgxdgxypkm8v5mfri2r89b0ydchrd15b2l"; + rev = "043518d3a9c48049bc0ae0af72dcbb239bf1d36d"; + sha256 = "0v25yk0d4488yn1yvzkpcqh8ldx51q4hbfn678vkr9ga5i0nkkwp"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -3758,12 +3769,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-04-20"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "eff4828b37d7f631aaec0465a315d627651b9037"; - sha256 = "1rm8kd90sf00sdgr8pqcansyrmrwsqd4v1fkyy7zl9x2jgrxkbrh"; + rev = "ff3f66ed30fbab70af1f37c8532327bd9617f7c7"; + sha256 = "1gppy9lk9vyxrqyb9lxvvl8nl31ha5mjwvhlang8g69j2vqpxikr"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4502,12 +4513,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-04-12"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "85e2c73830b6bb01ce7fc3a926d2b25836a253eb"; - sha256 = "1zbw8cnjl9m59grr65kfkgi8p4850rjp24f1plp4jhidjmsfhv7x"; + rev = "05bbfcd0dc24088f302e7221c7ec000d0ee62982"; + sha256 = "1yrfci26yr02s2728jlk4bd29g1abh8dwps8q9l1pk93rzlchisc"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -4562,12 +4573,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-04-18"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "2b62481d388c5e0e1dd11e74377523fdb98b6ac4"; - sha256 = "1x6x6wp1ggn2whrm5mi7wyz5b88syc4yvncgs8bjhbrc636psqhq"; + rev = "6b46098b2a83becda06586d7c430ffdc4a27db88"; + sha256 = "0q8yvjgxvfjd40f3pspv2kzdcz45q242jfpl948mw74arl0121g8"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -4598,12 +4609,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-04-19"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "07869cdfb066dcb287673eee3effb30021a970b8"; - sha256 = "1gmfvlysy7s0rh3lwpq9fym59nfwm64grcfrrhf2d9gzvwip9326"; + rev = "b7edb21cc518a5404b16997df056d560b6ae067f"; + sha256 = "1acwh0kqk7vy0p5vinmm42c4map4qara0590yd6mzc3ym0zyjvi0"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -4898,12 +4909,12 @@ let vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2019-12-17"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "dc7951895a98c49c39622f65cdd7b39374c348bc"; - sha256 = "1d8xiiwfg5wz57jyy7ahbi2bl5sjkhkpkqm2qbhsn7cd9vk36sxy"; + rev = "3ebc63c4b79eec08eb81bdddc8f4c7cfe9cb702f"; + sha256 = "0dwgqnjcnnyvmrplbxkzmfyrm0rgd4z5kgx5989c528gp0dwhaja"; }; meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; @@ -5979,12 +5990,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-04-20"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "dbfffb971b46bfb9bc90763d4ccad97e3277cd7b"; - sha256 = "0rmpf1lrrq57pai2vn0q9qig73kdq7l54iar1qk46f7wxy3wi1dw"; + rev = "ad4407f31bf170b0813fb9b03f851cf79b5f65ca"; + sha256 = "0nr7xq5kz94fm578ds84pd3ydbhfbxs6r4fc5250anmazip2h2cw"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6075,12 +6086,12 @@ let vim-subversive = buildVimPluginFrom2Nix { pname = "vim-subversive"; - version = "2020-04-10"; + version = "2020-04-22"; src = fetchFromGitHub { owner = "svermeulen"; repo = "vim-subversive"; - rev = "4a2020248c8a09950b7e1a2cd864ffb88826572c"; - sha256 = "0pqrb3hz1hjl42khn4691s3ajlswk6nms43hdbglj679y28bkzfi"; + rev = "9db5f782be230368a3a81a21d3eb93678f7523ae"; + sha256 = "0igv2yf1h1ajnv9c0z02pvgqciighwc1y53c9ahfqwxd58kpi5fj"; }; meta.homepage = "https://github.com/svermeulen/vim-subversive/"; }; @@ -6291,12 +6302,12 @@ let vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2019-12-10"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "8fdf78292bb3aed1c9de880be7e03efdbf23d306"; - sha256 = "0y92na4dcfcsj5zbs3m7y6csl3sd46a9968id78cdn9cgg8iwzac"; + rev = "44ba6fbe45895cd541ebfc87606add5c76e3829b"; + sha256 = "075cncr53w9xc1kqm50zl8yl18aspn3zdr6qjqyslf7gkw8yk38d"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -6651,12 +6662,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-04-20"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "f029f673b259206bb04ca71b97e68d9635b1c4ee"; - sha256 = "16m7ab5sy0gb900bf6ydynm1bhi11w60qmscqc66cmmb2hjz0iq2"; + rev = "3e2bf3f27ad7253767eefe0b4c4e551c602d5d77"; + sha256 = "1pxkim0mh691lb8clv1828nhs4cqzf8s3vkmynq7164mzvrf77sh"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -6699,12 +6710,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-04-19"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "02b128dd37a63f82732c3a0a9db9b24430ad56af"; - sha256 = "1zmf9yrpxynbvajkv52z3njgzh89j4qx6w8ppnl7bkf4r85k09hl"; + rev = "48631457714b6a611b96ad4785ec16a98b639515"; + sha256 = "05zabbnrxbgnymp6iyc6gmfj3sk752679kvyzk5jiraksi32djiw"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index 66e956a0f1..4d5b532216 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -229,6 +229,12 @@ self: super: { 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; 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 9a854d58b0..4af22bd833 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -97,6 +97,7 @@ enomsg/vim-haskellConcealPlus ensime/ensime-vim ervandew/supertab esneider/YUNOcommit.vim +fannheyward/coc-rust-analyzer farmergreg/vim-lastplace fatih/vim-go FelikZ/ctrlp-py-matcher diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix index 77cf28c552..84919e07c5 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -33,39 +33,6 @@ assert gdbUseFixed -> null != gdb; let gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb"; - langComponentBinaries = stdenv.mkDerivation rec { - name = "cpptools-language-component-binaries"; - - src = fetchurl { - # Follow https://go.microsoft.com/fwlink/?linkid=2037608 - url = "https://download.visualstudio.microsoft.com/download/pr/fd05d7fd-b771-4746-9c54-b5b30afcd82e/1f443716d6156a265bf50cb6e53fa999/bin_linux.zip"; - sha256 = "198xnq709clibjmd8rrv0haniy2m3qvhn89hg9hpj6lvg9lsr7a4"; - }; - - sourceRoot = name; - - nativeBuildInputs = [ unzip ]; - - unpackPhase = '' - runHook preUnpack - unzip -d $name $src || true - runHook postUnpack - ''; - - installPhase = '' - runHook preInstall - mkdir -p "$out/bin" - cp -a -t "$out/bin" ./bin/* - runHook postInstall - ''; - - postFixup = '' - elfInterpreter="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter "$elfInterpreter" $out/bin/Microsoft.VSCode.CPP.Extension.linux - patchelf --set-interpreter "$elfInterpreter" $out/bin/Microsoft.VSCode.CPP.IntelliSense.Msvc.linux - chmod a+x $out/bin/Microsoft.VSCode.CPP.Extension.linux $out/bin/Microsoft.VSCode.CPP.IntelliSense.Msvc.linux - ''; - }; openDebugAD7Script = writeScript "OpenDebugAD7" '' #!${runtimeShell} @@ -79,24 +46,33 @@ let ''; in -vscode-utils.buildVscodeMarketplaceExtension { +vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.27.0"; - sha256 = "06l25fjlcj0m7f7883afbh0x2ikgkqi768kv8y4qi1jc1gxndpm0"; + version = "0.27.1"; }; + vsix = fetchurl { + url = "https://github.com/microsoft/vscode-cpptools/releases/download/${mktplcRef.version}/cpptools-linux.vsix"; + sha256 = "1if43zis2cy32c6y1zsh0ih0y2kpdag0flkb795b3m5iwm38rjsq"; + }; + + unpackPhase = '' + unzip $src + cd extension + ''; + buildInputs = [ jq ]; postPatch = '' - mv ./package.json ./package_ori.json + mv ./package.json ./package_orig.json # 1. Add activation events so that the extension is functional. This listing is empty when unpacking the extension but is filled at runtime. # 2. Patch `package.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. - cat ./package_ori.json | \ + cat ./package_orig.json | \ jq --slurpfile actEvts ${./package-activation-events.json} '(.activationEvents) = $actEvts[0]' | \ jq '(.contributes.debuggers[].configurationAttributes | .attach , .launch | .properties.miDebuggerPath | select(. != null) | select(.default == "/usr/bin/gdb") | .default) = "${gdbDefaultsTo}"' > \ ./package.json @@ -104,19 +80,20 @@ vscode-utils.buildVscodeMarketplaceExtension { # Prevent download/install of extensions touch "./install.lock" - # Move unused files out of the way. - mv ./debugAdapters/bin/OpenDebugAD7.exe.config ./debugAdapters/bin/OpenDebugAD7.exe.config.unused - - # Combining the language component binaries as part of our package. - find "${langComponentBinaries}/bin" -mindepth 1 -maxdepth 1 | xargs cp -p -t "./bin" - # Mono runtimes from nix package (used by generated `OpenDebugAD7`). - rm "./debugAdapters/OpenDebugAD7" + mv ./debugAdapters/OpenDebugAD7 ./debugAdapters/OpenDebugAD7_orig cp -p "${openDebugAD7Script}" "./debugAdapters/OpenDebugAD7" # Clang-format from nix package. - mkdir -p "./LLVM" + mv ./LLVM/ ./LLVM_orig + mkdir "./LLVM/" find "${clang-tools}" -mindepth 1 -maxdepth 1 | xargs ln -s -t "./LLVM" + + # Patching cpptools and cpptools-srv + elfInterpreter="$(cat $NIX_CC/nix-support/dynamic-linker)" + patchelf --set-interpreter "$elfInterpreter" ./bin/cpptools + patchelf --set-interpreter "$elfInterpreter" ./bin/cpptools-srv + chmod a+x ./bin/cpptools{-srv,} ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix index 433371e079..475d18e3ac 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -76,8 +76,8 @@ in mktplcRef = { name = "language-haskell"; publisher = "justusadam"; - version = "2.6.0"; # see the note above - sha256 = "1891pg4x5qkh151pylvn93c4plqw6vgasa4g40jbma5xzq8pygr4"; + version = "3.0.3"; + sha256 = "1sg4g8h1gww4y67zix5f33v2gf121k2fcm6l1m7lygpkn40a8dsj"; }; meta = { license = stdenv.lib.licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/skhd/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/skhd/default.nix index f4a9991f8e..d145c0d75d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/skhd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/skhd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "skhd"; - version = "0.3.0"; + version = "0.3.5"; src = fetchFromGitHub { owner = "koekeishiya"; - repo = "skhd"; + repo = pname; rev = "v${version}"; - sha256 = "13pqnassmzppy2ipv995rh8lzw9rraxvi0ph6zgy63cbsdfzbhgl"; + sha256 = "0x099979kgpim18r0vi9vd821qnv0rl3rkj0nd1nx3wljxgf7mrg"; }; buildInputs = [ Carbon ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Simple hotkey daemon for macOS"; homepage = "https://github.com/koekeishiya/skhd"; platforms = platforms.darwin; - maintainers = with maintainers; [ lnl7 periklis ]; + maintainers = with maintainers; [ cmacrae lnl7 periklis ]; 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 new file mode 100644 index 0000000000..7103c7825c --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/yabai/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge }: + +stdenv.mkDerivation rec { + pname = "yabai"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "koekeishiya"; + repo = pname; + rev = "v${version}"; + sha256 = "0ajsh85p2vx18h3s4nicasyhdbh82zg97b1ryhi6l5lkbjpdl4ah"; + }; + + buildInputs = [ Carbon Cocoa ScriptingBridge ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1/ + cp ./bin/yabai $out/bin/yabai + cp ./doc/yabai.1 $out/share/man/man1/yabai.1 + ''; + + meta = with stdenv.lib; { + description = '' + A tiling window manager for macOS based on binary space partitioning + ''; + homepage = "https://github.com/koekeishiya/yabai"; + platforms = platforms.darwin; + maintainers = [ maintainers.cmacrae ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/broadcom-sta/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/broadcom-sta/default.nix index f1b560e9f8..ecaa389604 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation { ./linux-4.12.patch ./linux-4.15.patch ./linux-5.1.patch + # source: https://salsa.debian.org/Herrie82-guest/broadcom-sta/-/commit/247307926e5540ad574a17c062c8da76990d056f + ./linux-5.6.patch ./null-pointer-fix.patch ./gcc.patch ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/broadcom-sta/linux-5.6.patch b/third_party/nixpkgs/pkgs/os-specific/linux/broadcom-sta/linux-5.6.patch new file mode 100644 index 0000000000..df5af79f77 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/broadcom-sta/linux-5.6.patch @@ -0,0 +1,87 @@ +From dd057e40a167f4febb1a7c77dd32b7d36056952c Mon Sep 17 00:00:00 2001 +From: Herman van Hazendonk +Date: Tue, 31 Mar 2020 17:09:55 +0200 +Subject: [PATCH] Add fixes for 5.6 kernel + +Use ioremap instead of ioremap_nocache and proc_ops instead of file_operations on Linux kernel 5.6 and above. + +Signed-off-by: Herman van Hazendonk +--- + src/shared/linux_osl.c | 6 +++++- + src/wl/sys/wl_linux.c | 21 ++++++++++++++++++++- + 2 files changed, 25 insertions(+), 2 deletions(-) + +diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c +index 6157d18..dcfc075 100644 +--- a/src/shared/linux_osl.c ++++ b/src/shared/linux_osl.c +@@ -942,7 +942,11 @@ osl_getcycles(void) + void * + osl_reg_map(uint32 pa, uint size) + { +- return (ioremap_nocache((unsigned long)pa, (unsigned long)size)); ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++ return (ioremap((unsigned long)pa, (unsigned long)size)); ++ #else ++ return (ioremap_nocache((unsigned long)pa, (unsigned long)size)); ++ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */ + } + + void +diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +index 0d05100..6d9dd0d 100644 +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c +@@ -582,10 +582,17 @@ wl_attach(uint16 vendor, uint16 device, ulong regs, + } + wl->bcm_bustype = bustype; + ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++ if ((wl->regsva = ioremap(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) { ++ WL_ERROR(("wl%d: ioremap() failed\n", unit)); ++ goto fail; ++ } ++ #else + if ((wl->regsva = ioremap_nocache(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) { + WL_ERROR(("wl%d: ioremap() failed\n", unit)); + goto fail; + } ++ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */ + + wl->bar1_addr = bar1_addr; + wl->bar1_size = bar1_size; +@@ -772,8 +779,13 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + if ((val & 0x0000ff00) != 0) + pci_write_config_dword(pdev, 0x40, val & 0xffff00ff); + bar1_size = pci_resource_len(pdev, 2); ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++ bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2), ++ bar1_size); ++ #else + bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2), + bar1_size); ++ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */ + wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0), PCI_BUS, pdev, + pdev->irq, bar1_addr, bar1_size); + +@@ -3335,12 +3347,19 @@ wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++static const struct proc_ops wl_fops = { ++ .proc_read = wl_proc_read, ++ .proc_write = wl_proc_write, ++}; ++#else + static const struct file_operations wl_fops = { + .owner = THIS_MODULE, + .read = wl_proc_read, + .write = wl_proc_write, + }; +-#endif ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */ ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) */ + + static int + wl_reg_proc_entry(wl_info_t *wl) 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 69c1f8de2e..cb971d452d 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.30"; + version = "0.31"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "0kiglgc02a6hqi1nhnl4d8lxax8b1fljp50pvqswrnbh7pgb5676"; + sha256 = "1qlpc906xd78fzxvvj2kxi3aikgnw0c0h3x620s131apax4qrnqa"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/g15daemon/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/g15daemon/default.nix index d00bf2f743..c670fc86d1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/g15daemon/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/g15daemon/default.nix @@ -5,7 +5,7 @@ , fetchpatch , patchelf , freetype -, libusb +, libusb-compat-0_1 }: let license = lib.licenses.gpl2; @@ -25,7 +25,7 @@ let sha256 = "1mkrf622n0cmz57lj8w9q82a9dcr1lmyyxbnrghrxzb6gvifnbqk"; }; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix index e87768a9ff..d780cade78 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix @@ -1,6 +1,28 @@ -{ config, stdenv, fetchurl, intltool, pkgconfig -, gtk3, portaudio, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null }: +{ config +, stdenv +, fetchurl +, intltool +, pkgconfig +, portaudio +, SDL2 +, ffmpeg +, udev +, libusb1 +, libv4l +, alsaLib +, gsl +, libpng +, sfml +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux +, libpulseaudio ? null +, useQt ? false +, qtbase ? null +, wrapQtAppsHook ? null +# can be turned off if used as a library +, useGtk ? true +, gtk3 ? null +, wrapGAppsHook ? null +}: assert pulseaudioSupport -> libpulseaudio != null; @@ -13,19 +35,38 @@ stdenv.mkDerivation rec { sha256 = "11byyfpkcik7wvf2qic77zjamfr2rhji97dpj1gy2fg1bvpiqf4m"; }; - buildInputs = - [ SDL2 - alsaLib - ffmpeg - gtk3 - intltool - libusb1 - libv4l - pkgconfig - portaudio - udev - gsl - ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; + nativeBuildInputs = [ + intltool + pkgconfig + ] + ++ stdenv.lib.optionals (useGtk) [ wrapGAppsHook ] + ++ stdenv.lib.optionals (useQt) [ wrapQtAppsHook ] + ; + + buildInputs = [ + SDL2 + alsaLib + ffmpeg + libusb1 + libv4l + portaudio + udev + gsl + libpng + sfml + ] + ++ stdenv.lib.optionals (pulseaudioSupport) [ libpulseaudio ] + ++ stdenv.lib.optionals (useGtk) [ gtk3 ] + ++ stdenv.lib.optionals (useQt) [ + qtbase + ] + ; + configureFlags = [ + "--enable-sfml" + ] + ++ stdenv.lib.optionals (useGtk) [ "--enable-gtk3" ] + ++ stdenv.lib.optionals (useQt) [ "--enable-qt5" ] + ; meta = with stdenv.lib; { description = "A simple interface for devices supported by the linux UVC driver"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix index 869a394cef..8152655d45 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix @@ -17,7 +17,13 @@ stdenv.mkDerivation rec { # Note: fetchurl seems to be unhappy with openwrt git # server's URLs containing semicolons. Using the github mirror instead. url = "https://raw.githubusercontent.com/openwrt/openwrt/master/package/network/services/hostapd/patches/300-noscan.patch"; - sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k";}) + sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k"; + }) + (fetchurl { + name = "CVE-2019-16275.patch"; + url = "https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch"; + sha256 = "15xjyy7crb557wxpx898b5lnyblxghlij0xby5lmj9hpwwss34dz"; + }) ]; outputs = [ "out" "man" ]; 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 02bd83d9da..be2a4ff3e5 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.6"; + version = "1.7"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "0c38c7a234cwdd5y1brq4w56xszs8zlp57rr3nvgp8z8djcy1qvx"; + sha256 = "1qi25qav1rv8gm5lbrip8ayq5vwynmyv2q4ar7bbmnjh6cglvyh2"; }; nativeBuildInputs = [ 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 0a58ed87e6..e254891b00 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 @@ -609,6 +609,9 @@ let misc = { HID_BATTERY_STRENGTH = yes; + # enabled by default in x86_64 but not arm64, so we do that here + HIDRAW = yes; + MODULE_COMPRESS = yes; MODULE_COMPRESS_XZ = yes; KERNEL_XZ = 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 eecb27cdb6..d2f6f4b3e8 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,18 +1,18 @@ { "4.14": { - "name": "linux-hardened-4.14.176.a.patch", - "sha256": "0pr3m2j63mc746fcbzg1hlwv85im9f87qkl6r4033gwnpa9brcgk", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.176.a/linux-hardened-4.14.176.a.patch" + "name": "linux-hardened-4.14.178.a.patch", + "sha256": "1klwymsd19y2sifbny5ikgry9rx9q2cbb13h1xqy42573add6q8c", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.178.a/linux-hardened-4.14.178.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.117.a.patch", - "sha256": "0c8dvh49nzypxwvsls10i896smvpdrk40x8ybljb3qk3r8j7niaw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.117.a/linux-hardened-4.19.117.a.patch" + "name": "linux-hardened-4.19.120.a.patch", + "sha256": "14l30127nd8d2q72k51alwmh8h57fyam0q6sggdljh16qlqilirl", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.120.a/linux-hardened-4.19.120.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.34.a.patch", - "sha256": "1xwpqr9nzpjg837b3wnzb8fmrl2g9rz8gz5yb55vnnllbzbz36v6", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.34.a/linux-hardened-5.4.34.a.patch" + "name": "linux-hardened-5.4.38.a.patch", + "sha256": "1aaky36azfagk0nf5k92glil3f7ymijcvx03g8rnlinlsm3i2614", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.38.a/linux-hardened-5.4.38.a.patch" }, "5.5": { "name": "linux-hardened-5.5.19.a.patch", @@ -20,8 +20,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.19.a/linux-hardened-5.5.19.a.patch" }, "5.6": { - "name": "linux-hardened-5.6.6.a.patch", - "sha256": "0jiqh0frxirjbccgfdk007fca6r6n36n0pkqq4jszkckn59ayl7r", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.6.a/linux-hardened-5.6.6.a.patch" + "name": "linux-hardened-5.6.10.a.patch", + "sha256": "0jmyk7pl9ddbyhskzadd1z9svhm18v8gdv6kgb0ca6dbhf6ggsgy", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.10.a/linux-hardened-5.6.10.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 5d7337c27f..013893c1cd 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.176"; + version = "4.14.178"; # 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 = "18jwxhf29ax54xnylmz9zfkslnxw7y3h215dbfmmvddfp9b0kbmw"; + sha256 = "1pcqxmq9ir4f963aiw5bab9w2mp4vfiwaq2bk7nksbl2bs3k6b7x"; }; } // (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 ab3d1b1a71..4edc8359c5 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.118"; + version = "4.19.120"; # 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 = "15lcq3xky59v88vb8vvnmgcsmm1fadz0m4jyrii6rynsz5jr6x49"; + sha256 = "03mjng5ws9y56id99619ysarz73qqyylgc3mlknga1yphbhh16qb"; }; } // (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 e99375ed62..09b34e26a4 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.219"; + version = "4.4.221"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1mpxqb2m24ay4n9px4n2cyklxy4lhnv9q6wlvilx13rs5qfbb62f"; + sha256 = "06rpjnvrdp71flz948mfmx7jv8x2vmdg54zz1xpkb2458mwh5hbq"; }; } // (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 78c76d12dd..0db1d2908e 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.219"; + version = "4.9.221"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0i5wlyp11ss9p035bhq73xjx8iyk5dk4ynvd7msw5qfkrs6265vb"; + sha256 = "1gh1x73xblxkb927igc3shrqnn49lcscwrq2fixmk9n7jb7q2hp6"; }; } // (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 08b28bc98d..31d485877b 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.35"; + version = "5.4.38"; # 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 = "1m06k19pbb3wz8z2dgf03jvzbbdh6q8jwwdz509s902a53vxasz1"; + sha256 = "03pks3jx5kk0wnhjkm92wxdbgw8qbdg93sfwchnx88m2wfj9yaz7"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.6.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.6.nix index a31e6e26d3..eb60cfd949 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.6.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.6.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6.7"; + version = "5.6.10"; # 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 = "1jljcva3gxg1yc2kw3jjgmhzzdm16nylzxl63zbndjza547l5813"; + sha256 = "1f81b0icn0r9gww95rckyxs5d4g8bwf4mmqkrmwxxf4xga19dp3v"; }; } // (args.argsOverride or {})) 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 9e2ccaeae2..05617f8691 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.7-rc2"; + version = "5.7-rc3"; extraMeta.branch = "5.7"; # 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 = "06h7lrif84gyzblrdgg4cirsr2v69sdbymwkk89nr3gc87hnjlvs"; + sha256 = "0gq4bdzz2px85l3fa9dq3jh3lp4c9kgph4njq6yxf9g3h0ifq7c6"; }; # Should the testing kernels ever be built on Hydra? diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix new file mode 100644 index 0000000000..6383832a7e --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, libpsm2 }: + +stdenv.mkDerivation rec { + pname = "libfabric"; + version = "1.10.0"; + + enableParallelBuilding = true; + + src = fetchFromGitHub { + owner = "ofiwg"; + repo = pname; + rev = "v${version}"; + sha256 = "0amgc5w7qg96r9a21jl92m6jzn4z2j3iyk7jf7kwyzfi4jhlkv89"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ] ; + + buildInputs = [ libpsm2 ] ; + + configureFlags = [ "--enable-psm2=${libpsm2}" ] ; + + meta = with stdenv.lib; { + homepage = "http://libfabric.org/"; + description = "Open Fabric Interfaces"; + license = with licenses; [ gpl2 bsd2 ]; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.bzizou ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix new file mode 100644 index 0000000000..b9e41380da --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, numactl, pkgconfig }: + +stdenv.mkDerivation rec { + pname = "libpsm2"; + version = "11.2.156"; + ifs_version = "10_10_2_0_44"; + + preConfigure= '' + export UDEVDIR=$out/etc/udev + substituteInPlace ./Makefile --replace "udevrulesdir}" "prefix}/etc/udev"; + ''; + + enableParallelBuilding = true; + + buildInputs = [ numactl pkgconfig ]; + + installFlags = [ + "DESTDIR=$(out)" + "UDEVDIR=/etc/udev" + "LIBPSM2_COMPAT_CONF_DIR=/etc" + ]; + + src = fetchFromGitHub { + owner = "intel"; + repo = "opa-psm2"; + rev = "IFS_RELEASE_${ifs_version}"; + sha256 = "0ckrfzih1ga9yvximxjdh0z05kn9l858ykqiblv18w6ka3gra1xz"; + }; + + postInstall = '' + mv $out/usr/* $out + rmdir $out/usr + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/intel/opa-psm2"; + description = "The PSM2 library supports a number of fabric media and stacks"; + license = with licenses; [ gpl2 bsd3 ]; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.bzizou ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix index 99afd575ee..cb93c635af 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rtl8812au-${kernel.version}-${version}"; - version = "5.2.20.2_28373.20190903"; + version = "5.6.4.2_35491.20200318"; src = fetchFromGitHub { - owner = "zebulon2"; - repo = "rtl8812au-driver-5.2.20"; - rev = "30d47a0a3f43ccb19e8fd59fe93d74a955147bf2"; - sha256 = "1fy0f8ihxd0i5kr8gmky8v8xl0ns6bhxfdn64c97c5irzdvg37sr"; + owner = "gordboy"; + repo = "rtl8812au-5.6.4.2"; + rev = "49e98ff9bfdbe2ddce843808713de383132002e0"; + sha256 = "0f4isqasm9rli5v6a7xpphyh509wdxs1zcfvgdsnyhnv8amhqxgs"; }; nativeBuildInputs = [ bc nukeReferences ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/setools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/setools/default.nix index ae632c072c..c0ed4102aa 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/setools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/setools/default.nix @@ -8,13 +8,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "setools"; - version = "4.2.2"; + version = "4.3.0"; src = fetchFromGitHub { owner = "SELinuxProject"; repo = pname; rev = version; - sha256 = "18kklv26dwm2fdjjzfflvxsq83b2svnwf4g18xq7wsfsri121a90"; + sha256 = "0vr20bi8w147z5lclqz1l0j1b34137zg2r04pkafkgqqk7qbyjk6"; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/syslinux/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/syslinux/default.nix index 94df0649ad..06b31302eb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/syslinux/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/syslinux/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchFromRepoOrCz, fetchurl, nasm, perl, python3, libuuid, mtools, makeWrapper }: +{ stdenv, fetchgit, fetchurl, fetchpatch, nasm, perl, python3, libuuid, mtools, makeWrapper }: stdenv.mkDerivation { - name = "syslinux-2019-02-07"; + pname = "syslinux"; + version = "unstable-20190207"; # This is syslinux-6.04-pre3^1; syslinux-6.04-pre3 fails to run. # Same issue here https://www.syslinux.org/archives/2019-February/026330.html - src = fetchFromRepoOrCz { - repo = "syslinux"; + src = fetchgit { + url = "https://repo.or.cz/syslinux"; rev = "b40487005223a78c3bb4c300ef6c436b3f6ec1f7"; - sha256 = "1qrxl1114sr2i2791z9rf8v53g200aq30f08808d7i8qnmgvxl2w"; + sha256 = "1acf6byx7i6vz8hq6mra526g8mf7fmfhid211y8nq0v6px7d3aqs"; + fetchSubmodules = true; }; patches = let @@ -20,9 +22,9 @@ stdenv.mkDerivation { url = mkURL "fa1349f1" "0002-gfxboot-menu-label.patch"; sha256 = "06ifgzbpjj4picpj17zgprsfi501zf4pp85qjjgn29i5rs291zni"; }) - (fetchurl { - url = mkURL "477e56d2" "0005-gnu-efi-version-compatibility.patch"; - sha256 = "041568b4abb79wynyps1n04lg4fr26rc3sbjncz99pp0mbz0ajlm"; + (fetchpatch { + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/0005-gnu-efi-version-compatibility.patch?h=packages/syslinux"; + sha256 = "0fbqz56hj8az8ws26m39hyp3l5fvcbzvzdddqz3x6n56hzdpz1p6"; }) (fetchurl { # mbr.bin: too big (452 > 440) @@ -48,6 +50,10 @@ stdenv.mkDerivation { # fix tests substituteInPlace tests/unittest/include/unittest/unittest.h \ --replace /usr/include/ "" + + # Hack to get `gcc -m32' to work without having 32-bit Glibc headers. + mkdir gnu-efi/inc/ia32/gnu + touch gnu-efi/inc/ia32/gnu/stubs-32.h ''; nativeBuildInputs = [ nasm perl python3 ]; @@ -61,12 +67,9 @@ stdenv.mkDerivation { makeFlags = [ "BINDIR=$(out)/bin" "SBINDIR=$(out)/sbin" - "LIBDIR=$(out)/lib" - "INCDIR=$(out)/include" "DATADIR=$(out)/share" "MANDIR=$(out)/share/man" "PERL=perl" - "bios" ]; doCheck = false; # fails. some fail in a sandbox, others require qemu diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/v4l2loopback/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/v4l2loopback/default.nix index db384c71d7..32ae45fbb0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "v4l2loopback-${version}-${kernel.version}"; - version = "0.12.4"; + version = "0.12.5"; src = fetchFromGitHub { owner = "umlaeute"; repo = "v4l2loopback"; rev = "v${version}"; - sha256 = "0sp7n6hprgf1z7vzwshs5gyyn6syn4pw5xx7xqrfcwkx6cja6sys"; + sha256 = "1qi4l6yam8nrlmc3zwkrz9vph0xsj1cgmkqci4652mbpbzigg7vn"; }; hardeningDisable = [ "format" "pic" ]; 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 890c774081..6348773360 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, kernel, perl, wireguard-tools }: +{ stdenv, fetchzip, kernel, perl, wireguard-tools, bc }: # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements assert stdenv.lib.versionAtLeast kernel.version "3.10"; @@ -7,29 +7,31 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20200401"; + version = "1.0.20200429"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "1q4gfpbvbyracnl219xqfz5yqfc08i6g41z6bn2skx5x8jbll3aq"; + sha256 = "161srq06qa6ag2lycqz19mfms4ha2pmwn778jhvi96729rmivjkd"; }; - preConfigure = '' - cd src - sed -i '/depmod/,+1d' Makefile - ''; - hardeningDisable = [ "pic" ]; KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - INSTALL_MOD_PATH = "\${out}"; - NIX_CFLAGS = ["-Wno-error=cpp"]; - - nativeBuildInputs = [ perl ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ perl bc ] ++ kernel.moduleBuildDependencies; + preBuild = "cd src"; buildFlags = [ "module" ]; - installTargets = [ "module-install" ]; + + INSTALL_MOD_PATH = placeholder "out"; + installFlags = [ "DEPMOD=true" ]; + enableParallelBuilding = true; + + passthru = { + # remove this when our kernel comes with native wireguard support + # and our tests no longer tests this package + inherit (wireguard-tools) tests; + }; meta = with stdenv.lib; { inherit (wireguard-tools.meta) homepage license maintainers; diff --git a/third_party/nixpkgs/pkgs/servers/blockbook/default.nix b/third_party/nixpkgs/pkgs/servers/blockbook/default.nix index b931e8cfcb..b6a1887bf8 100644 --- a/third_party/nixpkgs/pkgs/servers/blockbook/default.nix +++ b/third_party/nixpkgs/pkgs/servers/blockbook/default.nix @@ -39,9 +39,7 @@ buildGoPackage rec { packr clean && packr ''; - postInstall = '' - rm $bin/bin/{scripts,templates,trezor-common} - ''; + subPackages = [ "." ]; meta = with lib; { description = "Trezor address/account balance backend"; @@ -51,4 +49,3 @@ buildGoPackage rec { platforms = platforms.all; }; } - diff --git a/third_party/nixpkgs/pkgs/servers/brickd/default.nix b/third_party/nixpkgs/pkgs/servers/brickd/default.nix index b6c5b2a60a..4b18e73284 100644 --- a/third_party/nixpkgs/pkgs/servers/brickd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/brickd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libusb, pkgconfig, pmutils, udev} : +{ stdenv, fetchgit, libusb1, pkgconfig, pmutils, udev} : let @@ -22,7 +22,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb pmutils udev ]; + buildInputs = [ libusb1 pmutils udev ]; # shell thing didn't work so i replaced it using nix prePatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/computing/torque/default.nix b/third_party/nixpkgs/pkgs/servers/computing/torque/default.nix index 37c8d32ab6..0941ca9692 100644 --- a/third_party/nixpkgs/pkgs/servers/computing/torque/default.nix +++ b/third_party/nixpkgs/pkgs/servers/computing/torque/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux -, file, libtool, which, boost, autoreconfHook +, coreutils, file, libtool, which, boost, autoreconfHook }: stdenv.mkDerivation rec { @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { --replace "contrib/init.d contrib/systemd" "" substituteInPlace src/cmds/Makefile.am \ --replace "/etc/" "$out/etc/" + substituteInPlace src/mom_rcp/pathnames.h \ + --replace /bin/cp ${coreutils}/bin/cp + substituteInPlace src/resmom/requests.c \ + --replace /bin/cp ${coreutils}/bin/cp ''; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/servers/consul/default.nix b/third_party/nixpkgs/pkgs/servers/consul/default.nix index 8703e76cb7..299ad0bdbc 100644 --- a/third_party/nixpkgs/pkgs/servers/consul/default.nix +++ b/third_party/nixpkgs/pkgs/servers/consul/default.nix @@ -1,19 +1,17 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "consul"; version = "1.7.2"; rev = "v${version}"; - goPackagePath = "github.com/hashicorp/consul"; - - # Note: Currently only release tags are supported, because they have the Consul UI - # vendored. See - # https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834 - # If you want to use a non-release commit as `src`, you probably want to improve - # this derivation so that it can build the UI's JavaScript from source. - # See https://github.com/NixOS/nixpkgs/pull/49082 for something like that. - # Or, if you want to patch something that doesn't touch the UI, you may want + # Note: Currently only release tags are supported, because they have the Consul UI + # vendored. See + # https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834 + # If you want to use a non-release commit as `src`, you probably want to improve + # this derivation so that it can build the UI's JavaScript from source. + # See https://github.com/NixOS/nixpkgs/pull/49082 for something like that. + # Or, if you want to patch something that doesn't touch the UI, you may want # to apply your changes as patches on top of a release commit. src = fetchFromGitHub { owner = "hashicorp"; @@ -22,8 +20,14 @@ buildGoPackage rec { sha256 = "1q587d8aqfkwg4fymr56fnf038vkxbdqz5yilz96dzny27dhspj4"; }; - preBuild = '' - buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=") + # This corresponds to paths with package main - normally unneeded but consul + # has a split module structure in one repo + subPackages = ["." "connect/certgen"]; + + modSha256 = "164834gr8a7qvp72ccjpkbbg4h8idrcxvcp1fl7yi59iqsswfr7b"; + + preBuild = '' + buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=") ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/servers/coturn/default.nix b/third_party/nixpkgs/pkgs/servers/coturn/default.nix index 24dc256ba6..51502c3fd9 100644 --- a/third_party/nixpkgs/pkgs/servers/coturn/default.nix +++ b/third_party/nixpkgs/pkgs/servers/coturn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, libevent }: +{ stdenv, fetchFromGitHub, fetchpatch, openssl, libevent }: stdenv.mkDerivation rec { pname = "coturn"; @@ -13,7 +13,14 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libevent ]; - patches = [ ./pure-configure.patch ]; + patches = [ + ./pure-configure.patch + (fetchpatch { + name = "CVE-2020-6061+6062.patch"; + url = "https://sources.debian.org/data/main/c/coturn/4.5.1.1-1.2/debian/patches/CVE-2020-6061+6062.patch"; + sha256 = "0fcy1wp91bb4hlhnp96sf9bs0d9hf3pwx5f7b1r9cfvr3l5c1bk2"; + }) + ]; meta = with stdenv.lib; { homepage = "https://coturn.net/"; 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 b0be6c9b3b..4964755332 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix @@ -16,21 +16,13 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.0.1"; + version = "5.1.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "4a93264ad0cda7ea2252d1ba057e474722f77848165f2893e0c76e21ae406415"; + sha256 = "9ab179d1dccc6ba59aacac81a4cd10a039615c7a846d9f77f26b851da25d1a86"; }; - patches = [ - (fetchpatch { # merged to upstream master, remove on update - name = "zfs-cpu-usage.diff"; - url = "https://gitlab.labs.nic.cz/knot/knot-resolver/merge_requests/946.diff"; - sha256 = "0mcvx4pfnl19h6zrv2fcgxdjarqzczn2dz85sylcczsfvdmn6i5m"; - }) - ]; - outputs = [ "out" "dev" ]; # Path fixups for the NixOS service. diff --git a/third_party/nixpkgs/pkgs/servers/etcd/default.nix b/third_party/nixpkgs/pkgs/servers/etcd/default.nix index a5083a20cb..9a2bf7ce59 100644 --- a/third_party/nixpkgs/pkgs/servers/etcd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/etcd/default.nix @@ -1,33 +1,40 @@ -{ lib, libpcap, buildGoPackage, fetchFromGitHub }: - -with lib; +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "etcd"; - version = "3.3.13"; # After updating check that nixos tests pass - rev = "v${version}"; + version = "3.3.20"; + # change to "go.etcd.io/etcd" for >= 3.4 goPackagePath = "github.com/coreos/etcd"; src = fetchFromGitHub { - inherit rev; - owner = "coreos"; + owner = "etcd-io"; repo = "etcd"; - sha256 = "1kac4qfr83f2hdz35403f1ald05wc85vvhw79vxb431n61jvyaqy"; + rev = "v${version}"; + sha256 = "1iqq12kkky3cl28k7fabqqyx1i0a2wmbkq0bs8yhiwywp076k08w"; }; - subPackages = [ - "cmd/etcd" - "cmd/etcdctl" - ]; + buildPhase = '' + cd go/src/${goPackagePath} + patchShebangs . + ./build + ./functional/build + ''; - buildInputs = [ libpcap ]; + installPhase = '' + install -Dm755 bin/* bin/functional/cmd/* -t $bin/bin + ''; - meta = { + passthru.tests = with nixosTests; { + etcd = etcd; + etcd-cluster = etcd-cluster; + }; + + meta = with lib; { description = "Distributed reliable key-value store for the most critical data of a distributed system"; license = licenses.asl20; - homepage = "https://coreos.com/etcd/"; - maintainers = with maintainers; [offline]; - platforms = with platforms; linux; + homepage = "https://etcd.io/"; + maintainers = with maintainers; [ offline ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/servers/felix/default.nix b/third_party/nixpkgs/pkgs/servers/felix/default.nix index 38dad5e6fe..486474a46b 100644 --- a/third_party/nixpkgs/pkgs/servers/felix/default.nix +++ b/third_party/nixpkgs/pkgs/servers/felix/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-felix"; - version = "5.6.1"; + version = "6.0.3"; src = fetchurl { url = "mirror://apache/felix/org.apache.felix.main.distribution-${version}.tar.gz"; - sha256 = "0kis26iajzdid162j4i7g558q09x4hn9z7pqqys6ipb0fj84hz1x"; + sha256 = "1yk04q8rfbbabacbhmrsw5ywr96496x1cz4icdqimb1cfxixv1q0"; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/servers/gotify/default.nix b/third_party/nixpkgs/pkgs/servers/gotify/default.nix index f2014aac9f..3f9f59a4ae 100644 --- a/third_party/nixpkgs/pkgs/servers/gotify/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gotify/default.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "gotify-server"; - # Note that when this is updated, along with the hash, the `ui.nix` file - # should include the same changes to the version and the sha256. - version = "2.0.14"; + # should be update just like all other files imported like that via the + # `update.sh` script. + version = import ./version.nix; src = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - sha256 = "0hyy9fki2626cgd78l7fkk67lik6g1pkcpf6xr3gl07dxwcclyr8"; + sha256 = import ./source-sha.nix; }; - modSha256 = "1awhbc8qs2bwv6y2vwd92r4ys0l1bzymrb36iamr040x961682wv"; + modSha256 = import ./mod-sha.nix; postPatch = '' substituteInPlace app.go \ diff --git a/third_party/nixpkgs/pkgs/servers/gotify/mod-sha.nix b/third_party/nixpkgs/pkgs/servers/gotify/mod-sha.nix new file mode 100644 index 0000000000..16a3eddadb --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/gotify/mod-sha.nix @@ -0,0 +1 @@ +"119f249rvlvxjhwc6wh10yyk3z41488mydmvxs44b5a4p67yvjfw" \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/gotify/package.json b/third_party/nixpkgs/pkgs/servers/gotify/package.json index 1c84de17f4..00f7133707 100644 --- a/third_party/nixpkgs/pkgs/servers/gotify/package.json +++ b/third_party/nixpkgs/pkgs/servers/gotify/package.json @@ -3,9 +3,10 @@ "version": "0.2.0", "private": true, "homepage": ".", + "proxy": "http://localhost:80", "dependencies": { - "@material-ui/core": "^4.4.3", - "@material-ui/icons": "^4.4.3", + "@material-ui/core": "^4.9.5", + "@material-ui/icons": "^4.9.1", "axios": "^0.19.0", "codemirror": "^5.43.0", "detect-browser": "^3.0.0", diff --git a/third_party/nixpkgs/pkgs/servers/gotify/source-sha.nix b/third_party/nixpkgs/pkgs/servers/gotify/source-sha.nix new file mode 100644 index 0000000000..c11391fb85 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/gotify/source-sha.nix @@ -0,0 +1 @@ +"0igzgpzrxkz31njhybsap505mlr32k4qma32v5rafqdi2naz5iyl" \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/gotify/ui.nix b/third_party/nixpkgs/pkgs/servers/gotify/ui.nix index 403f01c2a8..2a7f184308 100644 --- a/third_party/nixpkgs/pkgs/servers/gotify/ui.nix +++ b/third_party/nixpkgs/pkgs/servers/gotify/ui.nix @@ -8,13 +8,13 @@ yarn2nix-moretea.mkYarnPackage rec { packageJSON = ./package.json; yarnNix = ./yarndeps.nix; - version = "2.0.14"; + version = import ./version.nix; src_all = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - sha256 = "0hyy9fki2626cgd78l7fkk67lik6g1pkcpf6xr3gl07dxwcclyr8"; + sha256 = import ./source-sha.nix; }; src = "${src_all}/ui"; diff --git a/third_party/nixpkgs/pkgs/servers/gotify/update-yarn-deps.sh b/third_party/nixpkgs/pkgs/servers/gotify/update-yarn-deps.sh deleted file mode 100755 index d25b5c429d..0000000000 --- a/third_party/nixpkgs/pkgs/servers/gotify/update-yarn-deps.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../ -i bash -p wget yarn2nix-moretea.yarn2nix - -# This script is based upon: -# pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh - -set -euo pipefail - -if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then - echo "Regenerates the Yarn dependency lock files for the gotify-server package." - echo "Usage: $0 " - exit 1 -fi - -GOTIFY_WEB_SRC="https://raw.githubusercontent.com/gotify/server/$1" - -wget "$GOTIFY_WEB_SRC/ui/package.json" -O package.json -wget "$GOTIFY_WEB_SRC/ui/yarn.lock" -O yarn.lock -yarn2nix --lockfile=yarn.lock > yarndeps.nix -rm yarn.lock diff --git a/third_party/nixpkgs/pkgs/servers/gotify/update.sh b/third_party/nixpkgs/pkgs/servers/gotify/update.sh new file mode 100755 index 0000000000..e26ffbde62 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/gotify/update.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p wget yarn2nix-moretea.yarn2nix nix-prefetch-git jq + +set -euo pipefail + +dirname="$(dirname "$0")" + +latest_release=$(curl --silent https://api.github.com/repos/gotify/server/releases/latest) +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 +tput setaf 1 +echo zeroing modSha256 in $dirname/mod-sha.nix +tput sgr0 +printf '"%s"' "0000000000000000000000000000000000000000000000000000" > $dirname/mod-sha.nix + +GOTIFY_WEB_SRC="https://raw.githubusercontent.com/gotify/server/$version" + +curl --silent "$GOTIFY_WEB_SRC/ui/package.json" -o $dirname/package.json +echo downloaded package.json +curl --silent "$GOTIFY_WEB_SRC/ui/yarn.lock" -o $dirname/yarn.lock +echo downloaded yarndeps.nix +echo running yarn2nix +yarn2nix --lockfile=$dirname/yarn.lock > $dirname/yarndeps.nix +rm $dirname/yarn.lock +echo removed yarn.lock + +echo running nix-build for ui +nix-build -A gotify-server.ui +echo running nix-build for gotify itself in order to get modSha256 +set +e +modSha256="$(nix-build -A gotify-server 2>&1 | grep "got:" | cut -d':' -f3)" +set -e +printf '"%s"' "$modSha256" > $dirname/mod-sha.nix +tput setaf 2 +echo got modSha256 of: $modSha256 +tput sgr0 +echo running nix-build -A gotify-server which should build gotify-server normally +nix-build -A gotify-server diff --git a/third_party/nixpkgs/pkgs/servers/gotify/version.nix b/third_party/nixpkgs/pkgs/servers/gotify/version.nix new file mode 100644 index 0000000000..fbd14b6742 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/gotify/version.nix @@ -0,0 +1 @@ +"2.0.15" diff --git a/third_party/nixpkgs/pkgs/servers/gotify/yarndeps.nix b/third_party/nixpkgs/pkgs/servers/gotify/yarndeps.nix index 3f74ad74cc..ef9d7cedd8 100644 --- a/third_party/nixpkgs/pkgs/servers/gotify/yarndeps.nix +++ b/third_party/nixpkgs/pkgs/servers/gotify/yarndeps.nix @@ -713,6 +713,14 @@ sha1 = "935122c74c73d2240cafd32ddb5fc2a6cd35cf1f"; }; } + { + name = "_babel_runtime___runtime_7.8.7.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.8.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.7.tgz"; + sha1 = "8fefce9802db54881ba59f90bb28719b4996324d"; + }; + } { name = "_babel_template___template_7.4.4.tgz"; path = fetchurl { @@ -762,11 +770,11 @@ }; } { - name = "_emotion_hash___hash_0.7.3.tgz"; + name = "_emotion_hash___hash_0.7.4.tgz"; path = fetchurl { - name = "_emotion_hash___hash_0.7.3.tgz"; - url = "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.3.tgz"; - sha1 = "a166882c81c0c6040975dd30df24fae8549bd96f"; + name = "_emotion_hash___hash_0.7.4.tgz"; + url = "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.4.tgz"; + sha1 = "f14932887422c9056b15a8d222a9074a7dfa2831"; }; } { @@ -890,51 +898,51 @@ }; } { - name = "_material_ui_core___core_4.4.3.tgz"; + name = "_material_ui_core___core_4.9.5.tgz"; path = fetchurl { - name = "_material_ui_core___core_4.4.3.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/core/-/core-4.4.3.tgz"; - sha1 = "65665d2c4e9cb84e018774e1471f6d0417f4535e"; + name = "_material_ui_core___core_4.9.5.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/core/-/core-4.9.5.tgz"; + sha1 = "384869f2840b243241f7881a902f5ffc48360830"; }; } { - name = "_material_ui_icons___icons_4.5.1.tgz"; + name = "_material_ui_icons___icons_4.9.1.tgz"; path = fetchurl { - name = "_material_ui_icons___icons_4.5.1.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.5.1.tgz"; - sha1 = "6963bad139e938702ece85ca43067688018f04f8"; + name = "_material_ui_icons___icons_4.9.1.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.9.1.tgz"; + sha1 = "fdeadf8cb3d89208945b33dbc50c7c616d0bd665"; }; } { - name = "_material_ui_styles___styles_4.4.3.tgz"; + name = "_material_ui_styles___styles_4.9.0.tgz"; path = fetchurl { - name = "_material_ui_styles___styles_4.4.3.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.4.3.tgz"; - sha1 = "78239177723660093cc9a277db5759c01c693c2a"; + name = "_material_ui_styles___styles_4.9.0.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.9.0.tgz"; + sha1 = "10c31859f6868cfa9d3adf6b6c3e32c9d676bc76"; }; } { - name = "_material_ui_system___system_4.4.3.tgz"; + name = "_material_ui_system___system_4.9.3.tgz"; path = fetchurl { - name = "_material_ui_system___system_4.4.3.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/system/-/system-4.4.3.tgz"; - sha1 = "68ca8cf83614255fcd5b9d3a72ce8ee58a43a5c7"; + name = "_material_ui_system___system_4.9.3.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.3.tgz"; + sha1 = "ee48990d7941237fdaf21b7b399981d614bb0875"; }; } { - name = "_material_ui_types___types_4.1.1.tgz"; + name = "_material_ui_types___types_5.0.0.tgz"; path = fetchurl { - name = "_material_ui_types___types_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/types/-/types-4.1.1.tgz"; - sha1 = "b65e002d926089970a3271213a3ad7a21b17f02b"; + name = "_material_ui_types___types_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/types/-/types-5.0.0.tgz"; + sha1 = "26d6259dc6b39f4c2e1e9aceff7a11e031941741"; }; } { - name = "_material_ui_utils___utils_4.4.0.tgz"; + name = "_material_ui_utils___utils_4.7.1.tgz"; path = fetchurl { - name = "_material_ui_utils___utils_4.4.0.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.4.0.tgz"; - sha1 = "9275421e2798a067850d201212d46f12725828ad"; + name = "_material_ui_utils___utils_4.7.1.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.7.1.tgz"; + sha1 = "dc16c7f0d2cd02fbcdd5cfe601fd6863ae3cc652"; }; } { @@ -3041,14 +3049,6 @@ sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b"; }; } - { - name = "convert_css_length___convert_css_length_2.0.1.tgz"; - path = fetchurl { - name = "convert_css_length___convert_css_length_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/convert-css-length/-/convert-css-length-2.0.1.tgz"; - sha1 = "90a76bde5bfd24d72881a5b45d02249b2c1d257c"; - }; - } { name = "convert_source_map___convert_source_map_1.6.0.tgz"; path = fetchurl { @@ -3282,11 +3282,11 @@ }; } { - name = "css_vendor___css_vendor_2.0.6.tgz"; + name = "css_vendor___css_vendor_2.0.7.tgz"; path = fetchurl { - name = "css_vendor___css_vendor_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.6.tgz"; - sha1 = "a205f73d7562e8728c86ef6ce5ee7c7e5eefd71b"; + name = "css_vendor___css_vendor_2.0.7.tgz"; + url = "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.7.tgz"; + sha1 = "4e6d53d953c187981576d6a542acc9fb57174bda"; }; } { @@ -3537,14 +3537,6 @@ sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; }; } - { - name = "deepmerge___deepmerge_4.0.0.tgz"; - path = fetchurl { - name = "deepmerge___deepmerge_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.0.0.tgz"; - sha1 = "3e3110ca29205f120d7cb064960a39c3d2087c09"; - }; - } { name = "default_gateway___default_gateway_4.2.0.tgz"; path = fetchurl { @@ -5153,6 +5145,14 @@ sha1 = "b09178f0122184fb95acf525daaecb4d8f45958b"; }; } + { + name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; + path = fetchurl { + name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; + url = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"; + sha1 = "ece0acaf71d62c2969c2ec59feff42a4b1a85b45"; + }; + } { name = "hosted_git_info___hosted_git_info_2.8.4.tgz"; path = fetchurl { @@ -5905,14 +5905,6 @@ sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; }; } - { - name = "is_plain_object___is_plain_object_3.0.0.tgz"; - path = fetchurl { - name = "is_plain_object___is_plain_object_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.0.tgz"; - sha1 = "47bfc5da1b5d50d64110806c199359482e75a928"; - }; - } { name = "is_promise___is_promise_2.1.0.tgz"; path = fetchurl { @@ -6057,14 +6049,6 @@ sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; }; } - { - name = "isobject___isobject_4.0.0.tgz"; - path = fetchurl { - name = "isobject___isobject_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz"; - sha1 = "3f1c9155e73b192022a80819bacd0343711697b0"; - }; - } { name = "isomorphic_fetch___isomorphic_fetch_2.2.1.tgz"; path = fetchurl { @@ -6546,67 +6530,67 @@ }; } { - name = "jss_plugin_camel_case___jss_plugin_camel_case_10.0.0_alpha.25.tgz"; + name = "jss_plugin_camel_case___jss_plugin_camel_case_10.0.4.tgz"; path = fetchurl { - name = "jss_plugin_camel_case___jss_plugin_camel_case_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.0.0-alpha.25.tgz"; - sha1 = "ea4389de47ccf3b4757f76e62cbb2e8b96b7a2c2"; + name = "jss_plugin_camel_case___jss_plugin_camel_case_10.0.4.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.0.4.tgz"; + sha1 = "3dedecec1e5bba0bf6141c2c05e2ab11ea4b468d"; }; } { - name = "jss_plugin_default_unit___jss_plugin_default_unit_10.0.0_alpha.25.tgz"; + name = "jss_plugin_default_unit___jss_plugin_default_unit_10.0.4.tgz"; path = fetchurl { - name = "jss_plugin_default_unit___jss_plugin_default_unit_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.0.0-alpha.25.tgz"; - sha1 = "df5b39bbc0114146101bb3cf8bc7e281e3d0f454"; + name = "jss_plugin_default_unit___jss_plugin_default_unit_10.0.4.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.0.4.tgz"; + sha1 = "df03885de20f20a1fc1c21bdb7c62e865ee400d9"; }; } { - name = "jss_plugin_global___jss_plugin_global_10.0.0_alpha.25.tgz"; + name = "jss_plugin_global___jss_plugin_global_10.0.4.tgz"; path = fetchurl { - name = "jss_plugin_global___jss_plugin_global_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.0.0-alpha.25.tgz"; - sha1 = "2b6a6a14ef6cdb9994dbadf709e480d5c871b5f6"; + name = "jss_plugin_global___jss_plugin_global_10.0.4.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.0.4.tgz"; + sha1 = "412245b56133cc88bec654a70d82d5922619f4c5"; }; } { - name = "jss_plugin_nested___jss_plugin_nested_10.0.0_alpha.25.tgz"; + name = "jss_plugin_nested___jss_plugin_nested_10.0.4.tgz"; path = fetchurl { - name = "jss_plugin_nested___jss_plugin_nested_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.0.0-alpha.25.tgz"; - sha1 = "b8e29d336e1850047914511681d56330e3ea24ac"; + name = "jss_plugin_nested___jss_plugin_nested_10.0.4.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.0.4.tgz"; + sha1 = "4d15ad13995fb6e4125618006473a096d2475d75"; }; } { - name = "jss_plugin_props_sort___jss_plugin_props_sort_10.0.0_alpha.25.tgz"; + name = "jss_plugin_props_sort___jss_plugin_props_sort_10.0.4.tgz"; path = fetchurl { - name = "jss_plugin_props_sort___jss_plugin_props_sort_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.0.0-alpha.25.tgz"; - sha1 = "dfaa1a6bf9863ae9593b99bf51cd26caea2fe0ec"; + name = "jss_plugin_props_sort___jss_plugin_props_sort_10.0.4.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.0.4.tgz"; + sha1 = "43c880ff8dfcf858f809f663ece5e65a1d945b5a"; }; } { - name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.0.0_alpha.25.tgz"; + name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.0.4.tgz"; path = fetchurl { - name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.0.0-alpha.25.tgz"; - sha1 = "35350da52334a6031808e197526227434c194277"; + name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.0.4.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.0.4.tgz"; + sha1 = "2f4cf4a86ad3eba875bb48cb9f4a7ed35cb354e7"; }; } { - name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.0.0_alpha.25.tgz"; + name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.0.4.tgz"; path = fetchurl { - name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.0.0-alpha.25.tgz"; - sha1 = "bc0c4b6dcb28d4801775cbad70ad9bc7e0c7707b"; + name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.0.4.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.0.4.tgz"; + sha1 = "1626ef612a4541cff17cf96815e1740155214ed2"; }; } { - name = "jss___jss_10.0.0_alpha.25.tgz"; + name = "jss___jss_10.0.4.tgz"; path = fetchurl { - name = "jss___jss_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss/-/jss-10.0.0-alpha.25.tgz"; - sha1 = "20a506d8159e3f6bd91e133d54ffd3df0ffd3010"; + name = "jss___jss_10.0.4.tgz"; + url = "https://registry.yarnpkg.com/jss/-/jss-10.0.4.tgz"; + sha1 = "46ebdde1c40c9a079d64f3334cb88ae28fd90bfd"; }; } { @@ -7497,14 +7481,6 @@ sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942"; }; } - { - name = "normalize_scroll_left___normalize_scroll_left_0.2.0.tgz"; - path = fetchurl { - name = "normalize_scroll_left___normalize_scroll_left_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-scroll-left/-/normalize-scroll-left-0.2.0.tgz"; - sha1 = "9445d74275f303cc661e113329aefa492f58114c"; - }; - } { name = "normalize_url___normalize_url_3.3.0.tgz"; path = fetchurl { @@ -9249,6 +9225,14 @@ sha1 = "21ca9561399aad0ff1a7701c01683e8ca981edcb"; }; } + { + name = "react_is___react_is_16.13.0.tgz"; + path = fetchurl { + name = "react_is___react_is_16.13.0.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz"; + sha1 = "0f37c3613c34fe6b37cd7f763a0d6293ab15c527"; + }; + } { name = "react_is___react_is_16.10.0.tgz"; path = fetchurl { @@ -9449,6 +9433,14 @@ sha1 = "be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"; }; } + { + name = "regenerator_runtime___regenerator_runtime_0.13.5.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_transform___regenerator_transform_0.14.1.tgz"; path = fetchurl { diff --git a/third_party/nixpkgs/pkgs/servers/hashi-ui/default.nix b/third_party/nixpkgs/pkgs/servers/hashi-ui/default.nix new file mode 100644 index 0000000000..019a8dca3b --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/hashi-ui/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "hashi-ui"; + version = "1.3.8"; + + src = fetchurl { + url = "https://github.com/jippi/hashi-ui/releases/download/v${version}/hashi-ui-linux-amd64"; + sha256 = "999a34b6e99657ffc7e6c98a15b8ea744c28420e891a8802c7d99b737752dfb6"; + }; + + dontUnpack = true; + sourceRoot = "."; + + installPhase = '' + install -m755 -D $src $out/bin/hashi-ui + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/jippi/hashi-ui"; + description = "A modern user interface for hashicorp Consul & Nomad"; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ numkem ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch b/third_party/nixpkgs/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch index 52d2daf80b..e1cf8ada01 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch @@ -1,4 +1,4 @@ -From 80f39643bb4d25f8ffcbd92804844961b303f4d0 Mon Sep 17 00:00:00 2001 +From 55cb3ba4458bd43588e7921906d091d001130ab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 9 Apr 2020 07:20:46 +0100 Subject: [PATCH] setup.py: relax dependencies @@ -8,14 +8,14 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Thalheim --- - setup.py | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + setup.py | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py -index f53af0ee1..ff4227487 100755 +index 0c56e89b67..ba04546130 100755 --- a/setup.py +++ b/setup.py -@@ -32,10 +32,10 @@ PROJECT_URLS = { +@@ -32,24 +32,24 @@ PROJECT_URLS = { PACKAGES = find_packages(exclude=["tests", "tests.*"]) REQUIRES = [ @@ -26,9 +26,16 @@ index f53af0ee1..ff4227487 100755 - "attrs==19.3.0", + "attrs>=19.3.0", "bcrypt==3.1.7", - "certifi>=2019.11.28", +- "certifi>=2020.4.5.1", ++ "certifi>=2019.11.28", "ciso8601==2.1.3", -@@ -47,9 +47,9 @@ REQUIRES = [ +- "importlib-metadata==1.6.0", ++ "importlib-metadata>=1.5.0", + "jinja2>=2.11.1", + "PyJWT==1.7.1", + # PyJWT has loose dependency. We want the latest one. +- "cryptography==2.9", ++ "cryptography>=2.9", "pip>=8.0.3", "python-slugify==4.0.0", "pytz>=2019.03", @@ -42,5 +49,5 @@ index f53af0ee1..ff4227487 100755 "voluptuous-serialize==2.3.0", ] -- -2.25.1 +2.26.1 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 d19b70c426..28c0322720 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.108.2"; + version = "0.109.0"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "acer_projector" = ps: with ps; [ pyserial]; @@ -42,11 +42,13 @@ "arduino" = ps: with ps; [ ]; # missing inputs: PyMata "arest" = ps: with ps; [ ]; "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 hbmqtt 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 + "atag" = ps: with ps; [ ]; # missing inputs: pyatag "aten_pe" = ps: with ps; [ ]; # missing inputs: atenpdu "atome" = ps: with ps; [ ]; # missing inputs: pyatome "august" = ps: with ps; [ ]; # missing inputs: py-august @@ -86,7 +88,7 @@ "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 - "braviatv" = ps: with ps; [ bravia-tv getmac]; + "braviatv" = ps: with ps; [ bravia-tv]; "broadlink" = ps: with ps; [ broadlink]; "brother" = ps: with ps; [ ]; # missing inputs: brother "brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan @@ -139,7 +141,7 @@ "datadog" = ps: with ps; [ datadog]; "ddwrt" = ps: with ps; [ ]; "deconz" = ps: with ps; [ ]; # missing inputs: pydeconz - "decora" = ps: with ps; [ ]; # missing inputs: bluepy 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 hass-nabucasa netdisco sqlalchemy zeroconf]; # missing inputs: home-assistant-frontend "delijn" = ps: with ps; [ ]; # missing inputs: pydelijn @@ -327,7 +329,7 @@ "hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16 "homeassistant" = ps: with ps; [ ]; - "homekit" = ps: with ps; [ HAP-python]; + "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors]; # missing inputs: base36 fnvhash "homekit_controller" = ps: with ps; [ ]; # missing inputs: aiohomekit[IP] "homematic" = ps: with ps; [ pyhomematic]; "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip @@ -467,7 +469,7 @@ "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; [ ]; # missing inputs: bluepy miflora + "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; [ ]; @@ -548,6 +550,7 @@ "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ ]; "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; [ ]; "opengarage" = ps: with ps; [ ]; @@ -567,7 +570,7 @@ "otp" = ps: with ps; [ pyotp]; "owntracks" = ps: with ps; [ pynacl aiohttp-cors]; "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta - "panasonic_viera" = ps: with ps; [ wakeonlan]; # missing inputs: panasonic_viera + "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 @@ -576,6 +579,7 @@ "persistent_notification" = ps: with ps; [ ]; "person" = ps: with ps; [ ]; "philips_js" = ps: with ps; [ ]; # missing inputs: ha-philipsjs + "pi4ioe5v9xxxx" = ps: with ps; [ ]; # missing inputs: pi4ioe5v9xxxx "pi_hole" = ps: with ps; [ ]; # missing inputs: hole "picotts" = ps: with ps; [ ]; "piglow" = ps: with ps; [ ]; # missing inputs: piglow @@ -603,7 +607,6 @@ "pulseaudio_loopback" = ps: with ps; [ ]; "push" = ps: with ps; [ aiohttp-cors]; "pushbullet" = ps: with ps; [ pushbullet]; - "pushetta" = ps: with ps; [ ]; # missing inputs: pushetta "pushover" = ps: with ps; [ pushover-complete]; "pushsafer" = ps: with ps; [ ]; "pvoutput" = ps: with ps; [ ]; @@ -761,8 +764,8 @@ "syncthru" = ps: with ps; [ ]; # missing inputs: pysyncthru "synology" = ps: with ps; [ ]; # missing inputs: py-synology "synology_chat" = ps: with ps; [ ]; + "synology_dsm" = ps: with ps; [ ]; # missing inputs: python-synology "synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm - "synologydsm" = ps: with ps; [ ]; # missing inputs: python-synology "syslog" = ps: with ps; [ ]; "system_health" = ps: with ps; [ aiohttp-cors]; "system_log" = ps: with ps; [ aiohttp-cors]; @@ -912,7 +915,6 @@ "yessssms" = ps: with ps; [ ]; # missing inputs: YesssSMS "yi" = ps: with ps; [ aioftp ha-ffmpeg]; "yr" = ps: with ps; [ xmltodict]; - "yweather" = ps: with ps; [ yahooweather]; "zabbix" = ps: with ps; [ ]; # missing inputs: pyzabbix "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 51b6d94860..03805344ae 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -67,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.108.2"; + hassVersion = "0.109.0"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -86,7 +86,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "0v4i1ak7pkpycas0mzdmxgc42xgfymwx2b0a2a4h13c4z46pbs2l"; + sha256 = "1b5y464yhngivxkz3cg2b7j2ssawy7fqr3si5pdmqkgz1dbqihhn"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix index 9e12016320..bcb770b8dc 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20200407.2"; + version = "20200427.1"; src = fetchPypi { inherit pname version; - sha256 = "0krwn67bkybjb69daik6dki5hm36xs4nbfwqkh0q7ami1xr1f56d"; + sha256 = "0ch669asyjqbh73y4a170j86hw9in2fw3xmxaxwh5r6sgx28k4v7"; }; # no Python tests implemented 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 1467c3b528..f802485d6c 100755 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py @@ -80,7 +80,7 @@ def parse_components(version: str = "master"): # Recursively get the requirements of a component and its dependencies def get_reqs(components, component): - requirements = set(components[component]["requirements"]) + requirements = set(components[component].get("requirements", [])) deps = components[component].get("dependencies", []) for dependency in deps: requirements.update(get_reqs(components, dependency)) diff --git a/third_party/nixpkgs/pkgs/servers/http/jetty/default.nix b/third_party/nixpkgs/pkgs/servers/http/jetty/default.nix index 4a3a3f2da0..49c11bf462 100644 --- a/third_party/nixpkgs/pkgs/servers/http/jetty/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/jetty/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "9.4.25.v20191220"; + version = "9.4.26.v20200117"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; name = "jetty-distribution-${version}.tar.gz"; - sha256 = "1jnx4hnvd2krsdisqwpws1qd1r0f8gm9a4sx4a8c7zqrmfd2zx1a"; + sha256 = "0wgh7vap0h6gkz6pk8iycvhwmybyxv25ssinwxxrnzk8jg25g89i"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix b/third_party/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix new file mode 100644 index 0000000000..57ab2a96b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, apr, jdk, openssl }: + +stdenv.mkDerivation rec { + pname = "tomcat-native"; + version = "1.2.23"; + + src = fetchurl { + url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz"; + sha512 = "89a0363961d322a87f4e752f4727f54f28ac6e4ad10fa21b6b7390c62b041d4068672d95495d9233c1cad7d6c1dc3c85fbd0186894085b3b94e476876af160ee"; + }; + + sourceRoot = "${pname}-${version}-src/native"; + + buildInputs = [ apr jdk openssl ]; + + configureFlags = [ + "--with-apr=${apr.dev}" + "--with-java-home=${jdk}" + "--with-ssl=${openssl.dev}" + ]; + + meta = with stdenv.lib; { + description = "An optional component for use with Apache Tomcat that allows Tomcat to use certain native resources for performance, compatibility, etc"; + homepage = "https://tomcat.apache.org/native-doc/"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ aanderse ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/http/unit/default.nix b/third_party/nixpkgs/pkgs/servers/http/unit/default.nix index 1e3ddb4ad8..0779a31f10 100644 --- a/third_party/nixpkgs/pkgs/servers/http/unit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/unit/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, which , withPython2 ? false, python2 , withPython3 ? true, python3, ncurses -, withPHP72 ? false, php72base -, withPHP73 ? true, php73base +, withPHP72 ? false, php72 +, withPHP73 ? true, php73 , withPerl528 ? false, perl528 , withPerl530 ? true, perl530 , withPerldevel ? false, perldevel @@ -18,16 +18,16 @@ with stdenv.lib; let phpConfig = { - config.php.embed = true; - config.php.apxs2 = false; - config.php.systemd = false; - config.php.phpdbg = false; - config.php.cgi = false; - config.php.fpm = false; + embedSupport = true; + apxs2Support = false; + systemdSupport = false; + phpdbgSupport = false; + cgiSupport = false; + fpmSupport = false; }; - php72-unit = php72base.override phpConfig; - php73-unit = php73base.override phpConfig; + php72-unit = php72.override phpConfig; + php73-unit = php73.override phpConfig; in stdenv.mkDerivation rec { version = "1.16.0"; pname = "unit"; @@ -71,8 +71,8 @@ in stdenv.mkDerivation rec { postConfigure = '' ${optionalString withPython2 "./configure python --module=python2 --config=${python2}/bin/python2-config --lib-path=${python2}/lib"} ${optionalString withPython3 "./configure python --module=python3 --config=${python3}/bin/python3-config --lib-path=${python3}/lib"} - ${optionalString withPHP72 "./configure php --module=php72 --config=${php72-unit.dev}/bin/php-config --lib-path=${php72-unit}/lib"} - ${optionalString withPHP73 "./configure php --module=php73 --config=${php73-unit.dev}/bin/php-config --lib-path=${php73-unit}/lib"} + ${optionalString withPHP72 "./configure php --module=php72 --config=${php72-unit.unwrapped.dev}/bin/php-config --lib-path=${php72-unit}/lib"} + ${optionalString withPHP73 "./configure php --module=php73 --config=${php73-unit.unwrapped.dev}/bin/php-config --lib-path=${php73-unit}/lib"} ${optionalString withPerl528 "./configure perl --module=perl528 --perl=${perl528}/bin/perl"} ${optionalString withPerl530 "./configure perl --module=perl530 --perl=${perl530}/bin/perl"} ${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"} diff --git a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix b/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix index faaad1ac7a..21caebec0f 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.11.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "1n91snf5sxsiy2r8y2nksw4ah70f70nxamy7k0ylgkpfxp4dxwb8"; + sha256 = "0lzk9nv7fbyc0jbsigw54310pvpwfrvji58z7a08j03vypc0v3x4"; rev = "v${version}"; }; - modSha256 = "1fm3s1ksah0w86xv8xjhrbf5ia0ynfg2qgajnldy3dpdbxa3yh7s"; + modSha256 = "02pj8ryis89dl4wjp2mvx6h5d0xdvskxdxiwarg7q0x23m9r7kpg"; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index 1b01ffe5d6..aaa762836b 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix @@ -2,12 +2,18 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.14.365"; + version = "0.16.175"; - src = fetchurl { - url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxAMDx64.tar.gz"; - sha256 = "0xvlknjhc75km12d8li50ifqpfyl6whymb6gd7ccwyd9lv9xxm27"; - }; + 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}"); buildInputs = [ makeWrapper ]; @@ -35,6 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Jackett/Jackett/"; license = licenses.gpl2; maintainers = with maintainers; [ edwtjo nyanloutre ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix index 5e011f17b7..c0d01855be 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,16 +2,16 @@ buildGoModule { pname = "mautrix-whatsapp-unstable"; - version = "2020-04-21"; + version = "2020-04-21-1"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; - rev = "53fe1b18184fc0967658805abc8560641f8d2cb0"; - sha256 = "0rahj9v7cgvk4w3m41jbs8vnya37dhq5wxyhyg74kwrv8a2nqxra"; + rev = "e0aea74abf090bc9dc499332b28bf03640c162f8"; + sha256 = "1gayjyh0x0axc1xak38zkdhvx6fy8pwlniqsirqy2mwcgkkll9i5"; }; - modSha256 = "0jn88a4hagwfkw9bv8cg12ywsg35znmfkmhi1v7k2qpj5qzi81w6"; + modSha256 = "1pddabyyz6q1snx9j7yv7dchasqa1y8nbpb5zrwmrpnwpns8kxl7"; meta = with stdenv.lib; { homepage = "https://github.com/tulir/mautrix-whatsapp"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix index eb4face42a..93f0531887 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kapacitor"; - version = "1.5.1"; + version = "1.5.4"; goPackagePath = "github.com/influxdata/kapacitor"; @@ -10,14 +10,14 @@ buildGoPackage rec { owner = "influxdata"; repo = "kapacitor"; rev = "v${version}"; - sha256 = "17f3my1zmqmcx7qqhdcq8n73l60bsxnnxqgvnw0cnf0xsa5g1yks"; + sha256 = "1sd0gwqwa2bk81lshs8cy49mk1nh4azjkk0283rh0rkimy90l0zz"; }; meta = with lib; { description = "Open source framework for processing, monitoring, and alerting on time series data"; license = licenses.mit; homepage = "https://influxdata.com/time-series-platform/kapacitor/"; - maintainers = with maintainers; [offline]; + maintainers = with maintainers; [ offline ]; platforms = with platforms; linux; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix index 927c7945b9..e469ee6b40 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig -, doxygen, freetype, libX11, libftdi, libusb, libusb1, ncurses, perl }: +, doxygen, freetype, libX11, libftdi, libusb-compat-0_1, libusb1, ncurses, perl }: stdenv.mkDerivation rec { pname = "lcdproc"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "--with-pidfile-dir=/run" ]; - buildInputs = [ freetype libX11 libftdi libusb libusb1 ncurses ]; + buildInputs = [ freetype libX11 libftdi libusb-compat-0_1 libusb1 ncurses ]; nativeBuildInputs = [ autoreconfHook doxygen makeWrapper pkgconfig ]; # In 0.5.9: gcc: error: libbignum.a: No such file or directory diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix index de6d834c4d..9074c19e10 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -1,4 +1,4 @@ -{ stdenv, go, buildGoPackage, fetchFromGitHub }: +{ stdenv, go, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "alertmanager"; @@ -24,9 +24,11 @@ buildGoPackage rec { -X ${t}.GoVersion=${stdenv.lib.getVersion go} ''; + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' - mkdir -p $bin/etc/bash_completion.d - $NIX_BUILD_TOP/go/bin/amtool --completion-script-bash > $bin/etc/bash_completion.d/amtool_completion.sh + $bin/bin/amtool --completion-script-bash > amtool.bash + installShellCompletion amtool.bash ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter.nix index 1e29eefba2..f845a6ef25 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage { pname = "mailexporter"; @@ -15,9 +15,11 @@ buildGoPackage { goDeps = ./mail-exporter_deps.nix; + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' - install -D -m 0444 -t $bin/share/man/man1 $src/man/mailexporter.1 - install -D -m 0444 -t $bin/share/man/man5 $src/man/mailexporter.conf.5 + installManPage $src/man/mailexporter.1 + installManPage $src/man/mailexporter.conf.5 ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index d776756719..03656470b9 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "prometheus_varnish_exporter"; - version = "1.5.2"; + version = "unstable-2020-03-26"; src = fetchFromGitHub { owner = "jonnenauha"; repo = "prometheus_varnish_exporter"; - rev = version; - sha256 = "0rpabw6a6paavv62f0gzhax9brzcgkly27rhkf0ihw8736gkw8ar"; + rev = "f0f90fc69723de8b716cda16cb419e8a025130ff"; + sha256 = "1viiiyvhpr7cnf8ykaaq4fzgg9xvn4hnlhv7cagy3jkjlmz60947"; }; - modSha256 = "0w1zg9jc2466srx9pdckw7rzn7ma4pbd0617b1h98v364wjzgj72"; + modSha256 = "1vb720axjziiqcba4bdi528r6mc97ci0pfsk0ny50isrkh0s3jzz"; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index 4785d78ab1..ab94971aa3 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.14.0"; + version = "1.14.1"; goPackagePath = "github.com/influxdata/telegraf"; @@ -14,7 +14,7 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "062j4sm7im4iv5i9afr771724srvwwcqbhkyznlzncaz06mk1sn7"; + sha256 = "17lzz0f9vzyfwr3kgwg6i6361hqzq54jnaaw9rdc132xppdx03nr"; }; modSha256 = "1q7il1x1pfyz15z23cs0kk7zyacn6b3y28b1q52bqi30l1x8bdbp"; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/eventstore/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/eventstore/default.nix index d1f4938197..239c6875c3 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/eventstore/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/eventstore/default.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "EventStore"; - version = "5.0.7"; + version = "5.0.8"; src = fetchFromGitHub { owner = "EventStore"; repo = "EventStore"; rev = "oss-v${version}"; - sha256 = "0yvprql73g4lc88b6kp1kk8h64az2hn4am5hc4gyiaxfavaww3ci"; + sha256 = "021m610gzmrp2drywl1q3y6xxpy4qayn580d855ag952z9s6w9nj"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/plex/raw.nix b/third_party/nixpkgs/pkgs/servers/plex/raw.nix index ea01919ce2..cdeaaa77c0 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.1.2645-ccb6eb67e"; + version = "1.19.2.2737-b69929dab"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "0ivv6apavkgy4zryhwam20jjfgy8sxpccqp0bi5ylh33jpxhm096"; + sha256 = "00s3ab66wnpwkjrp0ng8srcy3l32sh5ibv0i9m6l4d0a19hr01fs"; }; outputs = [ "out" "basedb" ]; diff --git a/third_party/nixpkgs/pkgs/servers/roundcube/default.nix b/third_party/nixpkgs/pkgs/servers/roundcube/default.nix index 939424ff2b..a1dc25e6e2 100644 --- a/third_party/nixpkgs/pkgs/servers/roundcube/default.nix +++ b/third_party/nixpkgs/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "1gsl9rpdkv388i6zvciladhb15fw94a8xjyh4ai1664nkwl51wi4"; + sha256 = "1my726p0wmsn21nbdsjx02h6hnbh8nidzipzdy0gk0qgda1j729b"; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/third_party/nixpkgs/pkgs/servers/serviio/default.nix b/third_party/nixpkgs/pkgs/servers/serviio/default.nix index 6b1fdd1099..006c2fdff3 100644 --- a/third_party/nixpkgs/pkgs/servers/serviio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/serviio/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://serviio.org"; + homepage = "https://serviio.org"; description = "UPnP Media Streaming Server"; longDescription = '' Serviio is a free media server. It allows you to stream your media files (music, video or images) diff --git a/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix b/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix index 8f3d2a7b28..fb62ee5847 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix @@ -1,6 +1,7 @@ { stdenv, buildGoPackage, fetchurl , cmake, xz, which, autoconf , ncurses6, libedit, libunwind +, installShellFiles }: let @@ -8,7 +9,7 @@ let linuxDeps = [ ncurses6 ]; buildInputs = if stdenv.isDarwin then darwinDeps else linuxDeps; - nativeBuildInputs = [ cmake xz which autoconf ]; + nativeBuildInputs = [ installShellFiles cmake xz which autoconf ]; in buildGoPackage rec { @@ -42,7 +43,7 @@ buildGoPackage rec { runHook preInstall install -D cockroachoss $bin/bin/cockroach - install -D cockroach.bash $bin/share/bash-completion/completions/cockroach.bash + installShellCompletion cockroach.bash mkdir -p $man/share/man cp -r man $man/share/man diff --git a/third_party/nixpkgs/pkgs/servers/uftp/default.nix b/third_party/nixpkgs/pkgs/servers/uftp/default.nix index 13efb08ec6..02607155d4 100644 --- a/third_party/nixpkgs/pkgs/servers/uftp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/uftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "uftp"; - version = "4.10.2"; + version = "5.0"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "01c54mqz37157dfq47zjqvfy7v98vbi9zn9mzrxszsz0gyq6mazc"; + sha256 = "1q08schd765fsm9647ac4ic2x70ys2x48mqz97mibdi4bbm72bsn"; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix b/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix index 29b807f179..0f0d2c23e4 100644 --- a/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix @@ -8,8 +8,8 @@ }: let php-embed = php.override { - config.php.embed = true; - config.php.apxs2 = false; + embedSupport = true; + apxs2Support = false; }; pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" { diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/restya-board/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/restya-board/default.nix index 0dca4acc6b..89e22b2336 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/restya-board/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/restya-board/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Web-based kanban board"; license = licenses.osl3; - homepage = "http://restya.com"; + homepage = "https://restya.com"; maintainers = with maintainers; [ tstrobel ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix b/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix index 0d552e9e11..702da004b4 100644 --- a/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix +++ b/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg +{ stdenv, fetchurl, lib, libidn, openssl, makeWrapper, fetchhg , lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop , withLibevent ? true, luaevent ? null , withDBI ? true, luadbi ? null @@ -16,7 +16,16 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "0.11.5"; # 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 + # default setup. + nixosModuleDeps = [ + "bookmarks" + "cloud_notify" + "vcard_muc" + "smacks" + "http_upload" + ]; src = fetchurl { url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; sha256 = "12s0hn6hvjbi61cdw3165l6iw0878971dmlvfg663byjsmjvvy2m"; @@ -52,7 +61,7 @@ stdenv.mkDerivation rec { postInstall = '' ${concatMapStringsSep "\n" (module: '' cp -r $communityModules/mod_${module} $out/lib/prosody/modules/ - '') (withCommunityModules ++ withOnlyInstalledCommunityModules)} + '') (lib.lists.unique(nixosModuleDeps ++ withCommunityModules ++ withOnlyInstalledCommunityModules))} wrapProgram $out/bin/prosody \ --prefix LUA_PATH ';' "$LUA_PATH" \ --prefix LUA_CPATH ';' "$LUA_CPATH" diff --git a/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix b/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix index c223985c2f..8463b1750d 100644 --- a/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix +++ b/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # - ignore test_screen because it assumes vt terminals exist checkPhase = '' pytest . \ - ${stdenv.lib.optionalString (stdenv.hostPlatform.isAarch64) "--ignore=test/t/test_gcc.py"} \ + ${stdenv.lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) "--ignore=test/t/test_gcc.py"} \ --ignore=test/t/test_chsh.py \ --ignore=test/t/test_ether_wake.py \ --ignore=test/t/test_ifdown.py \ diff --git a/third_party/nixpkgs/pkgs/shells/fish/default.nix b/third_party/nixpkgs/pkgs/shells/fish/default.nix index bea56bd8c5..0f18eb79d2 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/default.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/default.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchurl, coreutils, utillinux, - which, gnused, gnugrep, - groff, man-db, getent, libiconv, pcre2, - gettext, ncurses, python3, - cmake - , fetchpatch - - , writeText - , nixosTests - , useOperatingSystemEtc ? true +{ stdenv +, lib +, fetchurl +, coreutils +, utillinux +, which +, gnused +, gnugrep +, groff +, man-db +, getent +, libiconv +, pcre2 +, gettext +, ncurses +, python3 +, cmake +, writeText +, nixosTests +, useOperatingSystemEtc ? true }: - -with stdenv.lib; - let - etcConfigAppendixText = '' + etcConfigAppendix = writeText "config.fish.appendix" '' ############### ↓ Nix hook for sourcing /etc/fish/config.fish ↓ ############### # # # Origin: @@ -46,7 +53,7 @@ let ############### ↑ Nix hook for sourcing /etc/fish/config.fish ↑ ############### ''; - fishPreInitHooks = '' + fishPreInitHooks = writeText "__fish_build_paths_suffix.fish" '' # source nixos environment # note that this is required: # 1. For all shells, not just login shells (mosh needs this as do some other command-line utilities) @@ -90,40 +97,49 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.1.0"; - - etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText; + version = "3.1.2"; src = fetchurl { - # There are differences between the release tarball and the tarball github packages from the tag - # Hence we cannot use fetchFromGithub + # There are differences between the release tarball and the tarball GitHub + # packages from the tag. Specifically, it comes with a file containing its + # version, which is used in `build_tools/git_version_gen.sh` to determine + # the shell's actual version (and what it displays when running `fish + # --version`), as well as the local documentation for all builtins (and + # maybe other things). url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0s2356mlx7fp9kgqgw91lm5ds2i9iq9hq071fbqmcp3875l1xnz5"; + sha256 = "1vblmb3x2k2cb0db5jdyflppnlqsm7i6jjaidyhmvaaw7ch2gffm"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ ncurses libiconv pcre2 ]; + # We don't have access to the codesign executable, so we patch this out. + # For more information, see: https://github.com/fish-shell/fish-shell/issues/6952 + patches = lib.optional stdenv.isDarwin ./dont-codesign-on-mac.diff; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + ncurses + libiconv + pcre2 + ]; preConfigure = '' patchShebangs ./build_tools/git_version_gen.sh ''; - patches = [ - # Fixes compilation on old Apple SDKs - (fetchpatch { - url = "https://github.com/fish-shell/fish-shell/commit/10385d422b3e2a823faebfdaf13edd0e7f48a27f.patch"; - sha256 = "0hj13kyjf5wr9j5afd4mfylcr7mz68ilbncbcf307drk1lv1lvrn"; - }) - ]; - # Required binaries during execution # Python: Autocompletion generated from manpages and config editing propagatedBuildInputs = [ - coreutils gnugrep gnused - python3 groff gettext - ] ++ optional (!stdenv.isDarwin) man-db; + coreutils + gnugrep + gnused + python3 + groff + gettext + ] ++ lib.optional (!stdenv.isDarwin) man-db; - postInstall = '' + postInstall = with lib; '' sed -r "s|command grep|command ${gnugrep}/bin/grep|" \ -i "$out/share/fish/functions/grep.fish" sed -i "s|which |${which}/bin/which |" \ @@ -148,6 +164,13 @@ let sed -i "s|/usr/local/sbin /sbin /usr/sbin||" \ $out/share/fish/completions/{sudo.fish,doas.fish} + cat > $out/share/fish/functions/__fish_anypython.fish <> webconfig.py - # and check whether the message appears on the page - cat (${python3}/bin/python ./webconfig.py \ - | tail -n1 | sed -ne 's|.*\(/tmp/.*\)|\1|p' \ - ) | grep 'a href="http://localhost.*Start the Fish Web config' + let + fishScript = writeText "test.fish" '' + set -x __fish_bin_dir ${fish}/bin + echo $__fish_bin_dir + cp -r ${fish}/share/fish/tools/web_config/* . + chmod -R +w * + # we delete everything after the fileurl is assigned + sed -e '/fileurl =/q' -i webconfig.py + echo "print(fileurl)" >> webconfig.py + # and check whether the message appears on the page + cat (${python3}/bin/python ./webconfig.py \ + | tail -n1 | sed -ne 's|.*\(/tmp/.*\)|\1|p' \ + ) | grep 'a href="http://localhost.*Start the Fish Web config' - # cannot test the http server because it needs a localhost port - ''; + # cannot test the http server because it needs a localhost port + ''; in '' HOME=$(mktemp -d) ${fish}/bin/fish ${fishScript} @@ -210,6 +234,6 @@ let }; # FIXME(Profpatsch) replace withTests stub - withTests = flip const; - -in withTests tests fish + withTests = with lib; flip const; +in +withTests tests fish diff --git a/third_party/nixpkgs/pkgs/shells/fish/dont-codesign-on-mac.diff b/third_party/nixpkgs/pkgs/shells/fish/dont-codesign-on-mac.diff new file mode 100644 index 0000000000..c61350b054 --- /dev/null +++ b/third_party/nixpkgs/pkgs/shells/fish/dont-codesign-on-mac.diff @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7d220a032..786b60e6e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -183,7 +183,6 @@ ENDFUNCTION(CODESIGN_ON_MAC target) + # Define a function to link dependencies. + FUNCTION(FISH_LINK_DEPS_AND_SIGN target) + TARGET_LINK_LIBRARIES(${target} fishlib) +- CODESIGN_ON_MAC(${target}) + ENDFUNCTION(FISH_LINK_DEPS_AND_SIGN) + + # Define libfish.a. diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix index 43e0d2cb56..9dbce58d09 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0cy3rm0yr4ay4hcgw202w5k1sqw09kd75a0yyk0s0v0cxpmssf5n"; + sha256 = "1n92wcd3f6p38iwp9sc4bfhmaxb61ff6vvn0zvy3h4q8wmvxpiky"; }; - cargoSha256 = "0q89841jwbsvl4c90sl8wgnjjl8q0bb3kw7sl7k9dpnfmj5j144x"; + cargoSha256 = "0dyszvy0nmbjill3wfyqprqkh911r070rvkxc1ls9s3yhxhwlhzq"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; 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 f11ef6a6cd..6e679f16e3 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 @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-04-10"; + version = "2020-04-30"; pname = "oh-my-zsh"; - rev = "d53355ab38763c6f637008d019c8e8b98f19b714"; + rev = "06b0276675e978d80535259915fbb44011e10101"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1rf086f26plqsyx4h19acqacwyr99amavhn1lk0g13kk58kcq9v6"; + sha256 = "1y1c8v2akxwffrmcq8lmxvdnirqkxbxbrhcws76dlcgp2m3drvgq"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 7fac0fb8ab..169173a42e 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.5.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "0r8vccgfy85ryswaigzgwmvhvrhlap7nrg7bi66w63877znqlksj"; + sha256 = "04j37qmgzj62gixysj3di9dccfib4hx1c4ld9kcms3ag7k403bgj"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/admin/awsweeper/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awsweeper/default.nix index 661747c2fd..fda773b48c 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awsweeper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awsweeper/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "awsweeper"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "cloudetc"; repo = pname; rev = "v${version}"; - sha256 = "0sbd1jgzz3rxxwgbni885zvvcznfc51imaxwv7f064290iqlbrv4"; + sha256 = "1ybrrpnp6rh7rcwihww43cvhfhzzyy51rdk1hwy9ljpkg37k4y28"; }; - modSha256 = "14yvf0svh7xqpc2y7xr94pc6r7d3iv2nsr8qs3f5q29hdc5hv3fs"; + modSha256 = "07zz6wf9cq3wylihi9fx0rd85iybnq5z5c9gqw1lhpvqcrad4491"; meta = with lib; { description = "A tool to clean out your AWS account"; 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 13fdf6dcd0..f226a04242 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.2.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "0bqkvx1gp4bhpjn5nrjc08lq8wldl1icrz6q1llaxgvqqmc8hcgp"; + sha256 = "1j0h75cxrxa5yrijr7jfip7q5qrddaaqapd90f0qp2r4k9qb0y41"; }; # put packages that needs to be overriden in the py package scope @@ -23,8 +23,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { substituteInPlace setup.py \ --replace "javaproperties==0.5.1" "javaproperties" \ --replace "pytz==2019.1" "pytz" \ - --replace "mock~=2.0" "mock" \ - --replace "azure-mgmt-reservations==0.3.1" "azure-mgmt-reservations~=0.3.1" + --replace "mock~=4.0" "mock" # remove namespace hacks # remove urllib3 because it was added as 'urllib3[secure]', which doesn't get handled well @@ -93,6 +92,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-mgmt-rdbms azure-mgmt-recoveryservices azure-mgmt-recoveryservicesbackup + azure-mgmt-redhatopenshift azure-mgmt-redis azure-mgmt-relay azure-mgmt-reservations 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 3c598e67a7..b43b9bd2cb 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 @@ -55,6 +55,7 @@ let argcomplete azure-common azure-cli-telemetry + azure-mgmt-core azure-mgmt-resource colorama humanfriendly @@ -63,6 +64,7 @@ let msrest msrestazure paramiko + pkginfo psutil pygments pyjwt @@ -111,20 +113,26 @@ let ''; }; - azure-batch = overrideAzureMgmtPackage super.azure-batch "8.0.0" "zip" - "1j8nibnics9vakhqiwnjv7bwril7mfyz1svcvvsrb9a4wbdd12wi"; + azure-batch = overrideAzureMgmtPackage super.azure-batch "9.0.0" "zip" + "112d73gxjqng348mcvi36ska6pxyg8qc3qswvhf5x4a0lr86zjj7"; + + azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "0.1.0" "zip" + "06bqqkn5mx127x1z7ycm6rl8ajxlrmrm2kcdpgkbl4baii1x6iax"; azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.4.0" "zip" "1b69rz9wm0jvc54vx3b7h633x8gags51xwxrkp6myar40jggxw6g"; - azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "2.0.0" "zip" - "19z0lpq6bpidlflwa263y51549xgcg4m040k872m7fmy7jm2xcbb"; + azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "2.2.0" "zip" + "1iz1pf28ajrzbq8nab1jbjbgfbv0g6ni036xayy6xylvga4l8czr"; + + azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "0.4.0" "zip" + "0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rz1"; azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip" "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd"; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "8.0.1" "zip" - "0gngm7w17r5922ji11pnpa6gp5vh5z6la025v9cda6smsnx0fxx7"; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "9.0.0" "zip" + "00bmdbr7hdwb3ibr9sfbgbmmr6626qlz19cdi84d87rcisczf4nw"; azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.4.0" "zip" "1dn5585nsizszjivx6lp677ka0mrg0ayqgag4yzfdz9ml8mj1xl5"; @@ -132,14 +140,14 @@ let azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "5.0.0" "zip" "1m7v3rfkvmdgghrpz15fm8pvmmhi40lcwfxdm2kxh7mx01r5l906"; - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "11.0.0" "zip" - "1dnlql4z9wawf8gc1v4rr386pifwcnx3ycr4gdccqwkgimgpsdg4"; + azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "12.0.0" "zip" + "0vzq93g2fpnij4rykkk3391xq2knhlbz87vhim4zvj8s45sx6z8q"; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "8.1.0" "zip" - "07vpzhvi2946v5dn9cb2hkd1b9vj5c6zl32958bg2bxsjg9vvyi1"; + azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "9.0.1" "zip" + "11nqjpi9qypb0xvfy63l98q5m5jfv5iqx15mliksm96vkdkmji3y"; azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.12.0" "zip" "07c0hr7nha9789x1wz0ndca0sr0zscq63m9vd8pm1c6y0ss4iyn5"; @@ -150,11 +158,11 @@ let azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.2.1" "zip" "0mwlvy4x5nr3hsz7wdpdhpzwarzzwz4225bfpd68hr0pcjgzspky"; - azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "0.8.2" "zip" - "0w3w1d156rnkwjdarv3qvycklxr3z2j7lry7a3jfgj3ykzny12rq"; + azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "0.11.0" "zip" + "11887zf61ji1dh62czrsgxwz8idybw93m6iwahjy777jkdyviyzn"; - azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "2.0.0" "zip" - "1fql0j28d2r6slgabb7b438gdga513iskqh4al6c7dsmj1yzdzwa"; + azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "3.0.0" "zip" + "0iq04hvivq3fvg2lhax95gx0x35avk5hps42227z3qna5i2cznpn"; azure-mgmt-kusto = overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip" "1pmcdgimd66h964a3d5m2j2fbydshcwhrk87wblhwhfl3xwbgf4y"; @@ -162,14 +170,17 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "2.2.0" "zip" "15lpyv9z8ss47rjmg1wx5akh22p9br2vckaj7jk3639vi38ac5nl"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.7.0" "zip" - "0cf4pknb5y2yz4jqwg7xm626zkfx8i8hqcr3dkvq21lrx7fz96r3"; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.8.0" "zip" + "0vbg5mpahrnnnbj80flgzxxiffic94wsc9srm4ir85y2j5rprpv7"; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip" "1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p"; - azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "9.0.0" "zip" - "12bsdbh37xiz42hvrp8ghszyqkiali3pk50x44f3aip12pgx6kix"; + azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "0.2.0" "zip" + "11kx4ck58nhhn9zf5vq0rqh7lfh2yj758s6ainrqyqadxvq5ycf7"; + + azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "10.1.0" "zip" + "0fmsdwzyn167lwh87yyadq1bdc4q6rfz3gj5bh1mgavi9ghhxb75"; azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "1.1.1" "zip" "16wk0ksycrscsn3n14qk4vvf7i567vq6f96lwf5dwbc81wx6n32x"; @@ -180,6 +191,9 @@ let azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.44.0" "zip" "05dqakhfi301k2jnvccxdkigqvwnf9xz858pqg9vsri3dq69f1rw"; + azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "0.1.0" "zip" + "1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn"; + azure-mgmt-redis = overrideAzureMgmtPackage super.azure-mgmt-redis "7.0.0rc1" "zip" "086wk31wsl8dx14qpd0g1bly8i9a8fix007djlj9cybva2f2bk6k"; @@ -189,8 +203,8 @@ let azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.1.0" "zip" "1cb466722bs0ribrirb32kc299716pl0pwivz3jyn40dd78cwhhx"; - azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.17.0" "zip" - "1kp1wzcydgyc2mzkxigfv6rqzwzf3d0cnbqc6w7h907qbb4lw2r0"; + azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.18.0" "zip" + "0i9lnhcx85xccddvz1wdz5j0idm6sw2cn3066dww5993nmg0ijlr"; azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.5.0" "zip" "1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm"; @@ -204,17 +218,17 @@ let azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "3.0.0" "zip" "05c6isg13dslds94kv28v6navxj4bp4c5lsd9df0g3ndsxvpdrxp"; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "2.1.0" "zip" - "1ikv8b2h1r91fa0srz95ymn54qpqgb5a4faxwp4hf92r5h85c8j9"; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "2.2.0" "zip" + "1r5ww9ndya6sifafrbp4cr5iyyaww2ns7wrbqm6hc6aqxcpf30qq"; azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "4.1.0rc1" "zip" "00q5723gvc57kg2w1iyhfchp018skwd89ibrw23p7ngm2bb76g45"; - azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc9" "zip" - "060m4hqi1h5h53imj0vmpbzhqkwis7h91nwinpcvjs422figcv0i"; + azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc11" "zip" + "1ixh2wmrbm1v2xlrnmy1l513jpqch6b5vyh9x77flm649x1cff2q"; - azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.7.0" "zip" - "1pprvk5255b6brbw73g0g13zygwa7a2px5x08wy3153rqlzan5l2"; + azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.9.0" "zip" + "170jyr1qzwhv5ihyrsg5d8qzjylqmg31dscd31jzi4i7bwqf3sb8"; azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "2.0.1" "zip" "1wsfkprdrn22mwm24y2zlcms8ppp7jwq3s86r3ymbl29pbaxca8r"; @@ -225,14 +239,14 @@ let azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.52.0" "zip" "0357laxgldb7lvvws81r8xb6mrq9dwwnr1bnwdnyj4bw6p21i9hn"; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "8.0.0" "zip" - "0cxcdyy974ya1yi7s14sw54rwpc8qjngxr0jqb8vxki3528phrv3"; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "9.0.0" "zip" + "198r51av2rd1mr3q9j8jibhd14w0v8k59ipc3czsm4g1n44adgkl"; azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.4.0" "zip" "1x18grkjf2p2r1ihlwv607sna9yjvsr2jwnkjc55askrgrwx5jx2"; - azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.3.0" "zip" - "1r7isr7hzq2dv1idwwa9xxxgk8wh0ncka45r4rdcsl1p7kd2kqam"; + azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.4.0" "zip" + "0zmmfj7z1zrayjqwqybcn3bwm47d2ngyxm1g6fh2iw5c2f9czycv"; azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec { version = "0.60.0"; @@ -297,6 +311,16 @@ let ''; }); + knack = super.knack.overridePythonAttrs(oldAttrs: rec { + version = "0.7.0rc3"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "1mazy5a3505wqa68fxq7h55m0vbmjygv2wbgmxmrrrgw3w84q5r7"; + }; + }); + }; }; in diff --git a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix index 6bdcedd97a..9fec8ec904 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -2,23 +2,22 @@ buildGoModule rec { pname = "eksctl"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "0ck096qfj4wp166bymvync8qyb0q2az86hckjk3hrzqdj8vwhrza"; + sha256 = "15dzivnndzsiw7g6qzccpk1hqb5amfn0zba1rzkvcslhl1y9gsfi"; }; - modSha256 = "024fqknv6f1zzcpxfl3c12d7ya7ynsyy7hf7zsnmpsnrksvbkfvc"; + modSha256 = "13gqvr1y1b2yi2iar0p8y9hpajgy5w9xp4az5n6b5xhzcbn19f2k"; subPackages = [ "cmd/eksctl" ]; buildFlags = [ "-tags netgo" "-tags release" ]; - postInstall = - '' + postInstall = '' mkdir -p "$out/share/"{bash-completion/completions,zsh/site-functions} $out/bin/eksctl completion bash > "$out/share/bash-completion/completions/eksctl" diff --git a/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix index 72c61ceeca..ce250d33e9 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix @@ -22,6 +22,6 @@ buildGoModule rec { description = "Let's Encrypt client and ACME library written in Go"; license = licenses.mit; homepage = "https://go-acme.github.io/lego/"; - maintainers = with maintainers; [ andrew-d ]; + maintainers = teams.acme.members; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix index 19fbff747f..6051c16e91 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -5,6 +5,7 @@ , writeShellScriptBin, apparmor-profiles, apparmor-parser , criu , bash +, installShellFiles }: buildGoPackage rec { @@ -39,11 +40,10 @@ buildGoPackage rec { '') ]} - mkdir -p "$bin/share/bash-completion/completions/" - cp -av go/src/github.com/lxc/lxd/scripts/bash/lxd-client "$bin/share/bash-completion/completions/lxc" + installShellCompletion --bash go/src/github.com/lxc/lxd/scripts/bash/lxd-client ''; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ installShellFiles pkgconfig makeWrapper ]; buildInputs = [ lxc acl libcap libco-canonical.dev dqlite.dev raft-canonical.dev sqlite-replication udev.dev ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pebble/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pebble/default.nix index efd9bfe059..4813f86ea6 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pebble/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pebble/default.nix @@ -21,6 +21,6 @@ in buildGoPackage { homepage = "https://github.com/letsencrypt/pebble"; description = "A miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA"; license = [ lib.licenses.mpl20 ]; - maintainers = with lib.maintainers; [ emily ]; + maintainers = lib.teams.acme.members; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix index 180764bd8c..a4998d8546 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "1bgsxvb9wxi4sz8jfamhdwaq9f2q2k7c3cdkk60k86mkmas8ibxz"; + sha256 = "0waqkb1l66yk2gbqzybrh3yzf72gvyjsrvv3zyxpxzsgawrcx85g"; }; - cargoSha256 = "0zf41clf3rqxmal894gqp9fn9bnas99wna13fc43fxdlvh92v4yh"; + cargoSha256 = "0z4m7aslgwvbfm6af03d8ql6c4w83h0kwgbgy6sfsx1gf7kv6q6z"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix index 68c20493d1..f9b608ebc4 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec{ pname = "scaleway-cli"; - version = "1.17"; + version = "1.20"; goPackagePath = "github.com/scaleway/scaleway-cli"; @@ -10,7 +10,7 @@ buildGoPackage rec{ owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "0v50wk6q8537880whi6w83dia9y934v0s2xr1z52cn3mrsjghsnd"; + sha256 = "14likzp3hl04nq9nmpmh9m5zqjyspy5cyk20dkh03c1nhkd4vcnx"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/archivers/afio/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/afio/default.nix index e2fe3d90ee..3b4eb6a5ea 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/afio/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/afio/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl } : +{ stdenv, fetchFromGitHub } : stdenv.mkDerivation rec { version = "2.5.2"; pname = "afio"; - src = fetchurl { - url = "http://members.chello.nl/~k.holtman/${pname}-${version}.tgz"; - sha256 = "1fa29wlqv76hzf8bxp1qpza1r23pm2f3m7rcf0jpwm6z150s2k66"; + src = fetchFromGitHub { + owner = "kholtman"; + repo = "afio"; + rev = "v${version}"; + sha256 = "1vbxl66r5rp5a1qssjrkfsjqjjgld1cq57c871gd0m4qiq9rmcfy"; }; /* @@ -18,7 +20,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; meta = { - homepage = "http://members.chello.nl/~k.holtman/afio.html"; + homepage = "https://github.com/kholtman/afio"; description = "Fault tolerant cpio archiver targeting backups"; platforms = stdenv.lib.platforms.all; /* diff --git a/third_party/nixpkgs/pkgs/tools/archivers/p7zip/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/p7zip/default.nix index 3f0c2487c9..b7a97b3766 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/p7zip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/p7zip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, enableUnfree ? false }: +{ stdenv, fetchurl, fetchpatch, lib, enableUnfree ? false }: stdenv.mkDerivation rec { pname = "p7zip"; @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { patches = [ ./12-CVE-2016-9296.patch ./13-CVE-2017-17969.patch + (fetchpatch { + url = "https://raw.githubusercontent.com/termux/termux-packages/master/packages/p7zip/3-CVE-2018-5996.patch"; + sha256 = "1zivvkazmza0653i498ccp3zbpbpc7dvxl3zxwllbx41b6n589yp"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/termux/termux-packages/master/packages/p7zip/4-CVE-2018-10115.patch"; + sha256 = "1cr7q8gnrk9yp6dcvxaqi1yhdbgp964nkv65ls41mw1kdfm44zn6"; + }) ]; # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional @@ -49,6 +57,11 @@ stdenv.mkDerivation rec { description = "A port of the 7-zip archiver"; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.raskin ]; + knownVulnerabilities = [ + # p7zip is abandoned, according to this thread on its forums: + # https://sourceforge.net/p/p7zip/discussion/383043/thread/fa143cf2/#1817 + "p7zip is abandoned and may not receive important security fixes" + ]; # RAR code is under non-free UnRAR license, but we remove it license = if enableUnfree then lib.licenses.unfree else lib.licenses.lgpl2Plus; }; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unar/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/unar/default.nix index 259238cdec..9fdbada9ab 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/unar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/unar/default.nix @@ -1,52 +1,54 @@ -{ stdenv, fetchurl, gnustep, unzip, bzip2, zlib, icu, openssl }: +{ stdenv, fetchFromGitHub, installShellFiles, gnustep, bzip2, zlib, icu, openssl, wavpack }: -let +stdenv.mkDerivation rec { pname = "unar"; + version = "1.10.7"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "1.10.1"; - - src = fetchurl { - url = "http://unarchiver.c3.cx/downloads/${pname}${version}_src.zip"; - sha256 = "0aq9zlar5vzr5qxphws8dm7ax60bsfsw77f4ciwa5dq5lla715j0"; + src = fetchFromGitHub { + owner = "MacPaw"; + # the unar repo contains a shallow clone of both XADMaster and universal-detector + repo = "unar"; + rev = "v${version}"; + sha256 = "0p846q1l66k3rnd512sncp26zpv411b8ahi145sghfcsz9w8abc4"; }; - buildInputs = [ gnustep.base bzip2 icu openssl zlib ]; - - nativeBuildInputs = [ gnustep.make unzip ]; - - enableParallelBuilding = true; - postPatch = '' for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do substituteInPlace $f \ - --replace "CC = gcc" "CC=cc" \ - --replace "CXX = g++" "CXX=c++" \ - --replace "OBJCC = gcc" "OBJCC=cc" \ - --replace "OBJCXX = g++" "OBJCXX=c++" + --replace "= gcc" "=cc" \ + --replace "= g++" "=c++" done + + # we need to build inside this directory as well, so we have to make it writeable + chmod +w ../UniversalDetector -R ''; + buildInputs = [ gnustep.base bzip2 icu openssl wavpack zlib ]; + + nativeBuildInputs = [ gnustep.make installShellFiles ]; + + enableParallelBuilding = true; + + dontConfigure = true; + makefile = "Makefile.linux"; - sourceRoot = "./The Unarchiver/XADMaster"; + sourceRoot = "./source/XADMaster"; installPhase = '' runHook preInstall - install -Dm755 -t $out/bin lsar unar - install -Dm644 -t $out/share/man/man1 ../Extra/{lsar,unar}.1 - - mkdir -p $out/etc/bash_completion.d - cp ../Extra/lsar.bash_completion $out/etc/bash_completion.d/lsar - cp ../Extra/unar.bash_completion $out/etc/bash_completion.d/unar + install -Dm555 -t $out/bin lsar unar + for f in lsar unar; do + installManPage ./Extra/$f.? + installShellCompletion --bash --name $f ./Extra/$f.bash_completion + done runHook postInstall ''; meta = with stdenv.lib; { - homepage = "http://unarchiver.c3.cx/unarchiver"; + homepage = "https://theunarchiver.com"; description = "An archive unpacker program"; longDescription = '' The Unarchiver is an archive unpacker program with support for the popular \ @@ -55,7 +57,8 @@ in stdenv.mkDerivation rec { Compact Pro, Packit, cpio, compress (.Z), ARJ, ARC, PAK, ACE, ZOO, LZH, \ ADF, DMS, LZX, PowerPacker, LBR, Squeeze, Crunch, and other old formats. ''; - license = with licenses; [ lgpl21Plus ]; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/audio/pasystray/default.nix b/third_party/nixpkgs/pkgs/tools/audio/pasystray/default.nix index 648dcad42b..8b0580ba98 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/pasystray/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/pasystray/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { sha256 = "0xx1bm9kimgq11a359ikabdndqg5q54pn1d1dyyjnrj0s41168fk"; }; + patches = [ + # https://github.com/christophgysin/pasystray/issues/90#issuecomment-306190701 + ./fix-wayland.patch + ]; + nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ]; buildInputs = [ gnome3.adwaita-icon-theme diff --git a/third_party/nixpkgs/pkgs/tools/audio/pasystray/fix-wayland.patch b/third_party/nixpkgs/pkgs/tools/audio/pasystray/fix-wayland.patch new file mode 100644 index 0000000000..17c4e2e6d6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/audio/pasystray/fix-wayland.patch @@ -0,0 +1,34 @@ +--- a/src/x11-property.c ++++ b/src/x11-property.c +@@ -43,11 +43,15 @@ static Window window; + void x11_property_init() + { + display = gdk_x11_get_default_xdisplay(); ++ if (!GDK_IS_X11_DISPLAY(display)) return; ++ Screen* scr = ScreenOfDisplay(display, 0); ++ + window = RootWindow(display, 0); + } + + void x11_property_set(const char* key, const char* value) + { ++ if (!GDK_IS_X11_DISPLAY(display)) return; + g_debug("[x11-property] setting '%s' to '%s'", key, value); + + Atom atom = XInternAtom(display, key, False); +@@ -57,6 +61,7 @@ void x11_property_set(const char* key, c + + void x11_property_del(const char* key) + { ++ if (!GDK_IS_X11_DISPLAY(display)) return; + g_debug("[x11-property] deleting '%s'", key); + + Atom atom = XInternAtom(display, key, False); +@@ -65,6 +70,7 @@ void x11_property_del(const char* key) + + char* x11_property_get(const char* key) + { ++ if (!GDK_IS_X11_DISPLAY(display)) return NULL; + Atom property = XInternAtom(display, key, False); + Atom actual_type; + int actual_format; diff --git a/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix b/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix index e49d87c697..8e4014eea9 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix @@ -19,11 +19,11 @@ let in pythonPackages.buildPythonApplication rec { pname = "duplicity"; - version = "0.8.11.1596"; + version = "0.8.12.1612"; src = fetchurl { url = "https://code.launchpad.net/duplicity/${majorMinor version}-series/${majorMinorPatch version}/+download/duplicity-${version}.tar.gz"; - sha256 = "1qdaaybwdc13nfwnwrqij4lc23iwy73lyqn5lb4iznq6axp6m0h9"; + sha256 = "06n58pwqg6kfigckjlslz2kx1lsykz1kn9a0r1cl8r3kn93zhk07"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix b/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix index 5d086abf78..046fe130ff 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "monolith"; - version = "2.2.2"; + version = "2.2.4"; src = fetchFromGitHub { owner = "Y2Z"; repo = pname; rev = "v${version}"; - sha256 = "08xbpn6kdfiyvz5pwx9hkzbgb40z6dicmiry7frclw0aibal9avi"; + sha256 = "0am992dhqv0vpk4zsc9wwnbzhpdx98wm9dxi89bq2yr3l77lml3d"; }; - cargoSha256 = "10zwyg54f05m6ldpnchqzxjkb6rlpcl80crdnk8s6wkf18qny4i3"; + cargoSha256 = "03nd8pzrd66rv12l7qr9i4kdrdr8hk1mz8ihvd982cjd2dlisipd"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix b/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix index f8dbeadff0..df9d613ee4 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, nixosTests}: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, installShellFiles, nixosTests}: buildGoPackage rec { pname = "restic"; @@ -13,23 +13,19 @@ buildGoPackage rec { sha256 = "0lydll93n1lcn1fl669b9cikmzz9d6vfpc8ky3ng5fi8kj3v1dz7"; }; + subPackages = [ "cmd/restic" ]; + + nativeBuildInputs = [ installShellFiles ]; + passthru.tests.restic = nixosTests.restic; - # Use a custom install phase here as by default the - # build-release-binaries and prepare-releases binaries are - # installed. - installPhase = '' - mkdir -p "$bin/bin" - cp go/bin/restic "$bin/bin" - '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' - mkdir -p \ - $bin/etc/bash_completion.d \ - $bin/share/zsh/vendor-completions \ - $bin/share/man/man1 + postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' $bin/bin/restic generate \ - --bash-completion $bin/etc/bash_completion.d/restic.sh \ - --zsh-completion $bin/share/zsh/vendor-completions/_restic \ - --man $bin/share/man/man1 + --bash-completion restic.bash \ + --zsh-completion restic.zsh \ + --man . + installShellCompletion restic.{bash,zsh} + installManPage *.1 ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/obex-data-server/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/obex-data-server/default.nix index 15661d6e36..f95869e789 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus-glib, bluez, openobex, dbus }: +{ stdenv, fetchurl, pkgconfig, libusb-compat-0_1, glib, dbus-glib, bluez, openobex, dbus }: stdenv.mkDerivation rec { name = "obex-data-server-0.4.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb glib dbus-glib bluez openobex dbus ]; + buildInputs = [ libusb-compat-0_1 glib dbus-glib bluez openobex dbus ]; patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/openobex/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/openobex/default.nix index ccf2eee1bb..7ac0234852 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/openobex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/openobex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bluez, libusb, cmake }: +{ stdenv, fetchurl, pkgconfig, bluez, libusb-compat-0_1, cmake }: stdenv.mkDerivation rec { name = "openobex-1.7.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ bluez libusb ]; + buildInputs = [ bluez libusb-compat-0_1 ]; configureFlags = [ "--enable-apps" ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/catcli/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/catcli/default.nix index 4ac6c1d5b2..25de04467e 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/catcli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/catcli/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "catcli"; - version = "0.5.13"; + version = "0.6.0"; src = fetchFromGitHub { owner = "deadc0de6"; repo = pname; rev = "v${version}"; - sha256 = "04mrkqmm2c8fhi1h1hddc4yh3dqhcvkmcwzhj0ggn34v7wavgb5i"; + sha256 = "0myhvflph4fayl2bg8m9a7prh5pcnvnb75p0jb4jpmbx7jyn7ihp"; }; propagatedBuildInputs = [ docopt anytree ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ciopfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ciopfs/default.nix index 5beff7bf1c..8b633ecbe0 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ciopfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ciopfs/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; meta = { - homepage = "http://www.brain-dump.org/projects/ciopfs/"; + homepage = "https://www.brain-dump.org/projects/ciopfs/"; description = "A case-insensitive filesystem layered on top of any other filesystem"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix index 3548cf0a3d..43823e5b51 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; meta = { - homepage = "http://www.darlinghq.org/"; + homepage = "https://www.darlinghq.org/"; description = "Darling lets you open macOS dmgs on Linux"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pgf/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pgf/default.nix index 88684541fc..d3f01fa7d1 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pgf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pgf/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { # configureFlags = optional static "--enable-static --disable-shared"; meta = { - homepage = "http://www.libpgf.org/"; + homepage = "https://www.libpgf.org/"; description = "Progressive Graphics Format command line program"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/misc/aptly/default.nix b/third_party/nixpkgs/pkgs/tools/misc/aptly/default.nix index c163fdad3a..792b12688a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/aptly/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/aptly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, gnupg, bzip2, xz, graphviz }: +{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper, gnupg, bzip2, xz, graphviz }: let @@ -29,11 +29,10 @@ buildGoPackage { goPackagePath = "github.com/aptly-dev/aptly"; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; postInstall = '' - mkdir -p $bin/share/bash-completion/completions - ln -s ${aptlyCompletionSrc}/aptly $bin/share/bash-completion/completions + installShellCompletion --bash ${aptlyCompletionSrc}/aptly wrapProgram "$bin/bin/aptly" \ --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg bzip2 xz graphviz ]}" ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/bat-extras/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bat-extras/default.nix new file mode 100644 index 0000000000..0f98b819b0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/bat-extras/default.nix @@ -0,0 +1,147 @@ +{ stdenv, callPackage, fetchFromGitHub, bash, makeWrapper, ncurses, bat +# batgrep and batwatch +, less +# batgrep +, ripgrep +# prettybat +, withShFmt ? shfmt != null, shfmt ? null +, withPrettier ? nodePackages?prettier, nodePackages ? null +, withClangTools ? clang-tools != null, clang-tools ? null +, withRustFmt ? rustfmt != null, rustfmt ? null +# batwatch +, withEntr ? entr != null, entr ? null + }: + +let + # Core derivation that all the others are based on. + # This includes the complete source so the per-script derivations can run the tests. + core = stdenv.mkDerivation rec { + pname = "bat-extras"; + version = "20200408"; + + src = fetchFromGitHub { + owner = "eth-p"; + repo = pname; + rev = "v${version}"; + sha256 = "184d5rwasfpgbj2k98alg3wy8jmzna2dgfik98w2a297ky67s51v"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ bash makeWrapper ]; + + dontConfigure = true; + + postPatch = '' + substituteInPlace lib/constants.sh \ + --replace 'EXECUTABLE_BAT="bat"' 'EXECUTABLE_BAT="${bat}/bin/bat"' + + patchShebangs --build test.sh test/shimexec .test-framework/bin/best.sh + wrapProgram .test-framework/bin/best.sh \ + --prefix PATH : "${ncurses}/bin" + ''; + + buildPhase = '' + runHook preBuild + bash ./build.sh --minify=none --no-verify + runHook postBuild + ''; + + # Run the library tests as they don't have external dependencies + doCheck = true; + checkPhase = '' + runHook preCheck + # test list repeats suites. Unique them + declare -A test_suites + while read -r action arg _; do + [[ "$action" == "test_suite" && "$arg" == lib_* ]] && + test_suites+=(["$arg"]=1) + done <<<"$(bash ./test.sh --compiled --list --porcelain)" + (( ''${#test_suites[@]} != 0 )) || { + echo "Couldn't find any library test suites" + exit 1 + } + bash ./test.sh --compiled $(printf -- "--suite %q\n" "''${!test_suites[@]}") + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + cp -a . $out + runHook postInstall + ''; + + # A few random files have shebangs. Don't patch them, they don't make it into the final output. + # The per-script derivations will go ahead and patch the files they actually install. + dontPatchShebangs = true; + + meta = with stdenv.lib; { + description = "Bash scripts that integrate bat with various command line tools"; + homepage = "https://github.com/eth-p/bat-extras"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ bbigras lilyball ]; + platforms = platforms.all; + }; + }; + script = + name: # the name of the script + dependencies: # the tools we need to prefix onto PATH + stdenv.mkDerivation { + pname = "${core.pname}-${name}"; + inherit (core) version; + + src = core; + + nativeBuildInputs = [ bash makeWrapper ]; + # Make the dependencies available to the tests. + buildInputs = dependencies; + + # Patch shebangs now because our tests rely on them + postPatch = '' + patchShebangs --host bin/${name} + ''; + + dontConfigure = true; + dontBuild = true; # we've already built + + doCheck = true; + checkPhase = '' + runHook preCheck + bash ./test.sh --compiled --suite ${name} + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp -p bin/${name} $out/bin/${name} + '' + stdenv.lib.optionalString (dependencies != []) '' + wrapProgram $out/bin/${name} \ + --prefix PATH : ${stdenv.lib.makeBinPath dependencies} + '' + '' + runHook postInstall + ''; + + # We already patched + dontPatchShebangs = true; + + inherit (core) meta; + }; + optionalDep = cond: dep: + assert cond -> dep != null; + stdenv.lib.optional cond dep; +in +{ + batgrep = script "batgrep" [ less ripgrep ]; + batman = (script "batman" []).overrideAttrs (drv: { + doCheck = stdenv.isDarwin; # test fails on Linux due to SIGPIPE (eth-p/bat-extras#19) + }); + batwatch = script "batwatch" ([ less ] ++ optionalDep withEntr entr); + prettybat = (script "prettybat" ([] + ++ optionalDep withShFmt shfmt + ++ optionalDep withPrettier nodePackages.prettier + ++ optionalDep withClangTools clang-tools + ++ optionalDep withRustFmt rustfmt) + ).overrideAttrs (drv: { + doCheck = stdenv.isDarwin; # test fails on Linux due to SIGPIPE (eth-p/bat-extras#19) + }); +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix index 201ad5ed03..d08a609735 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix @@ -4,17 +4,17 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "0wxmn3ifrgpfq44xs747qqik2p2vazdw5zi4imxqap2krha4k2ms"; + sha256 = "07yng5bwhin7yqj1hihmxgi8w0n45nks05a8795zwsw92k373ib4"; fetchSubmodules = true; }; - cargoSha256 = "0bs6pqrg0vdam2h2ddikmgmksqlfjljqacc52rh6p546is6jcp2s"; + cargoSha256 = "1xqbpij6lr0bqyi0cfwgp3d4hcjhibpdc4dfm9gb39mmbgradrzf"; nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix index 5d31570aac..bf5d569bab 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.13.5b"; + version = "0.13.6"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "0gcv9w79r9q3rzrdqiq9xgh68ya653sq84vzgf0fb154zmzjkxfv"; + sha256 = "08d0zddqqymxj1qcp8c78r7mpii1piy6awaf135jxhzwi775sqqv"; }; - cargoSha256 = "0534jykfnqs1gfnmijkpcf91ddpbggw7p25h4arci14lgd2wrmgd"; + cargoSha256 = "1cxvx51zkmhszmgwsi0aj469xz98v5nk79zvqfyma27gsnh8jczr"; nativeBuildInputs = [ installShellFiles ]; @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' # install shell completion files - OUT_DIR=target/release/build/broot-*/out + OUT_DIR=$releaseDir/build/broot-*/out installShellCompletion --bash $OUT_DIR/{br,broot}.bash installShellCompletion --fish $OUT_DIR/{br,broot}.fish diff --git a/third_party/nixpkgs/pkgs/tools/misc/clipman/default.nix b/third_party/nixpkgs/pkgs/tools/misc/clipman/default.nix index 15eeb8b7b8..e75ddaa5ba 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/clipman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/clipman/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clipman"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "yory8"; repo = pname; rev = "v${version}"; - sha256 = "0d5w94cylrzhwyb4zfgidh6rr1h82dx5y7cxfa37wx5xxcjyyja1"; + sha256 = "15s7np57pvh7mqmq016mvhz34f189wd1vrfiamzmps37mdz2nq9i"; }; modSha256 = "1sim3x794kj3wdw0g432zbgh1cimdmmg1hjgynh9jgm3y8w9q7ij"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index 0ce0e1be32..39a137d3c0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -9,13 +9,15 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "138"; + version = "143"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "171nz5n4dayr7bj04h0x282vdk92kp7lgarnb3x0md91m2i9x997"; + sha256 = "09vvhzsxxgjvdnd48hdfz50i2svacdnwc2idirj4b27czi7c3czb"; }; + outputs = [ "out" "man" ]; + patches = [ ./ignore_links.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/dmg2img/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dmg2img/default.nix index df084579b7..267983dd43 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dmg2img/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dmg2img/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, bzip2, openssl }: +{ stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }: stdenv.mkDerivation rec { name = "dmg2img-1.6.7"; @@ -8,11 +8,20 @@ stdenv.mkDerivation rec { sha256 = "066hqhg7k90xcw5aq86pgr4l7apzvnb4559vj5s010avbk8adbh2"; }; - buildInputs = [zlib bzip2 openssl]; + buildInputs = [ zlib bzip2 openssl ]; + + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/85fa66a9/dmg2img/openssl-1.1.diff"; + sha256 = "076sz69hf3ryylplg025vl8sj991cb81g3yazsmrf8anrd7ffmxx"; + }) + ]; + + patchFlags = [ "-p0" ]; installPhase = '' - mkdir -p $out/bin - cp dmg2img $out/bin + install -D dmg2img $out/bin/dmg2img + install -D vfdecrypt $out/bin/vfdecrypt ''; meta = { diff --git a/third_party/nixpkgs/pkgs/tools/misc/fd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fd/default.nix index 5cc1c12f64..ab94a8aa6b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fd/default.nix @@ -18,9 +18,8 @@ rustPlatform.buildRustPackage rec { preFixup = '' installManPage "$src/doc/fd.1" - (cd target/release/build/fd-find-*/out - installShellCompletion fd.{bash,fish} - installShellCompletion --zsh _fd) + installShellCompletion $releaseDir/build/fd-find-*/out/fd.{bash,fish} + installShellCompletion --zsh $releaseDir/build/fd-find-*/out/_fd ''; meta = with lib; { 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 0933e6eae9..38f2145df4 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.4.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "1xfbghaylzsh48ag4aw77nmzm1cds4nx53m4s1fiy0r31sm8vqwl"; + sha256 = "1x5izsm0b3514i2vl1b3x40chjlzidr5zssn5cpgrw9a8w4jpv6h"; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix index e508eb02ad..d979e1e1a0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.6.9"; + version = "0.6.10"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "0cgzvzdsy8vbiapgk1l5dp48c3kq0xmx53yfi486mx8nwvz3ksc0"; + sha256 = "17dz0qj2981plvzp72yisyrjnyz1sy3pqyvhx76ws2754vjgq4ra"; }; - cargoSha256 = "0mjd9nmaggsszf0kx68yrvy3fqbn35v34c7q3584fv50ipqn6drb"; + cargoSha256 = "19b05gx717xjg4arn4zgrqh7ckzgzx0ygg9gkfzsg7phz7f01626"; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/gnokii/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gnokii/default.nix index c0e516a15a..25c3166619 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gnokii/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gnokii/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, perl, gettext, libusb, pkgconfig, bluez +{ stdenv, fetchurl, intltool, perl, gettext, libusb-compat-0_1, pkgconfig, bluez , readline, pcsclite, libical, gtk2, glib, libXpm }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - perl intltool gettext libusb + perl intltool gettext libusb-compat-0_1 glib gtk2 pkgconfig bluez readline libXpm pcsclite libical ]; 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 a64df86698..4e00a4ddd4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, flex, bison, python, autoconf, automake, gnulib, libtool -, gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig +, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkgconfig , fuse # only needed for grub-mount , zfs ? null , efiSupport ? false @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ bison flex python pkgconfig autoconf automake ]; - buildInputs = [ ncurses libusb freetype gettext lvm2 fuse libtool ] + 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/grub/trusted.nix b/third_party/nixpkgs/pkgs/tools/misc/grub/trusted.nix index 27676c4745..f14758a3ae 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grub/trusted.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grub/trusted.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake -, gettext, ncurses, libusb, freetype, qemu, lvm2 +, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2 , for_HP_laptop ? false }: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; - buildInputs = [ ncurses libusb freetype gettext lvm2 ] + buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ] ++ optional doCheck qemu; hardeningDisable = [ "stackprotector" "pic" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/heatseeker/default.nix b/third_party/nixpkgs/pkgs/tools/misc/heatseeker/default.nix index 22a7d8ec4a..e0b8c02a08 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/heatseeker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/heatseeker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, coreutils }: rustPlatform.buildRustPackage rec { pname = "heatseeker"; @@ -13,6 +13,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0jnlcm7v29m4nc318qgf7r7jvs80s7n04fw83imm506vwr9rxbx9"; + # https://github.com/rschmitt/heatseeker/issues/42 + # I've suggested using `/usr/bin/env stty`, but doing that isn't quite as simple + # as a substitution, and this works since we have the path to coreutils stty. + patchPhase = '' + substituteInPlace src/screen/unix.rs --replace "/bin/stty" "${coreutils}/bin/stty" + ''; + # some tests require a tty, this variable turns them off for Travis CI, # which we can also make use of TRAVIS = "true"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/hpcg/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hpcg/default.nix new file mode 100644 index 0000000000..6274178c26 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/hpcg/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, openmpi } : + +stdenv.mkDerivation rec { + pname = "hpcg"; + version = "3.1"; + + src = fetchurl { + url = "http://www.hpcg-benchmark.org/downloads/${pname}-${version}.tar.gz"; + sha256 = "197lw2nwmzsmfsbvgvi8z7kj69n374kgfzzp8pkmk7mp2vkk991k"; + }; + + dontConfigure = true; + + enableParallelBuilding = true; + + buildInputs = [ openmpi ]; + + makeFlags = [ "arch=Linux_MPI" ]; + + installPhase = '' + mkdir -p $out/bin $out/share/hpcg + + cp bin/xhpcg $out/bin + cp bin/hpcg.dat $out/share/hpcg + ''; + + meta = with stdenv.lib; { + description = "HPC conjugate gradient benchmark"; + homepage = "https://www.hpcg-benchmark.org"; + platforms = platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.markuskowa ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix b/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix new file mode 100644 index 0000000000..8a2412f86e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix @@ -0,0 +1,25 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "intermodal"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "casey"; + repo = pname; + rev = "v${version}"; + sha256 = "05wjzx1ibd7cyl5lgmmn5y8dhsk71wz2bnimbmq7z51ds6cbyw5i"; + }; + + cargoSha256 = "04xqk1mmbrz8bjn36nxabwla3y62wfdly5bckkya6y2dhf1vkdjq"; + + # include_hidden test tries to use `chflags` on darwin + checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; + + meta = with stdenv.lib; { + description = "User-friendly and featureful command-line BitTorrent metainfo utility"; + homepage = "https://github.com/casey/intermodal"; + license = licenses.cc0; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix index 6291ad013e..73dcbd3bc3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - installShellCompletion target/release/build/lsd-*/out/{_lsd,lsd.{bash,fish}} + installShellCompletion $releaseDir/build/lsd-*/out/{_lsd,lsd.{bash,fish}} ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix index 9f029ee5de..f2adadc084 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix @@ -1,4 +1,4 @@ -{ fetchzip, lib, p7zip, stdenv }: +{ fetchzip, lib, stdenv, mtools }: stdenv.mkDerivation rec { pname = "memtest86-efi"; @@ -22,19 +22,19 @@ stdenv.mkDerivation rec { stripRoot = false; }; - nativeBuildInputs = [ p7zip ]; + nativeBuildInputs = [ mtools ]; installPhase = '' - mkdir -p $out + mkdir -p $out $TEMP/memtest86-files # memtest86 is distributed as a bootable USB image. It contains the actual # memtest86 EFI app. # - # The following command uses p7zip to extract the actual EFI app from the + # The following uses dd and mcopy to extract the actual EFI app from the # usb image so that it can be installed directly on the hard drive. - 7z x -o$TEMP/temp-efi-dirs $src/memtest86-usb.img - 7z x -o$TEMP/memtest86-files $TEMP/temp-efi-dirs/EFI\ System\ Partition.img - cp -r $TEMP/memtest86-files/EFI/BOOT/* $out/ + dd if=$src/memtest86-usb.img of=$TEMP/ESP.img skip=2048 + mcopy -i $TEMP/ESP.img ::/EFI/BOOT/ $TEMP/memtest86-files/ + mv $TEMP/memtest86-files/BOOT/* $out/ ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix index 97628da67f..8c7e5b8bcf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libusb, makeWrapper}: +{stdenv, fetchurl, libusb-compat-0_1, makeWrapper}: stdenv.mkDerivation { name = "pk2cmd-1.20"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1yjpi2qshnqfpan4w3ggakkr3znfrx5cxkny92ka7v9na3g2fc4h"; }; - makeFlags = [ "LIBUSB=${libusb.dev}" "linux" ]; + makeFlags = [ "LIBUSB=${libusb-compat-0_1.dev}" "linux" ]; installPhase = '' mkdir -p $out/bin $out/share/pk2 @@ -16,7 +16,7 @@ stdenv.mkDerivation { wrapProgram $out/bin/pk2cmd --prefix PATH : $out/share/pk2 ''; - buildInputs = [ libusb makeWrapper ]; + buildInputs = [ libusb-compat-0_1 makeWrapper ]; meta = { homepage = "https://www.microchip.com/pickit2"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/shadowenv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/shadowenv/default.nix index a464ea638b..7c9352d331 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/shadowenv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/shadowenv/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowenv"; - version = "2.0.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = version; - sha256 = "1fjqm4qr85wb0i3vazp0w74izfzvkycdii7dlpdp5zs8jgb35pdh"; + sha256 = "1x5i5km6wblqbc0fibdjdlqkamqswxwhy8p6cbfz2nvcia7fgsf1"; }; - cargoSha256 = "1n8qh730nhdmpm08mm2ppcl3nkcgm50cyz9q5h6dlzq4bv4rijp4"; + cargoSha256 = "1hrsbd6025sfgnwr7smp43yzi7w2lfyfbdxhapgizrpwbq8y7xzd"; nativeBuildInputs = [ installShellFiles ]; @@ -20,6 +20,9 @@ rustPlatform.buildRustPackage rec { postInstall = '' installManPage man/man1/shadowenv.1 installManPage man/man5/shadowlisp.5 + installShellCompletion --bash sh/completions/shadowenv.bash + installShellCompletion --fish sh/completions/shadowenv.fish + installShellCompletion --zsh sh/completions/_shadowenv ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/sixpair/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sixpair/default.nix index fafee99db5..f738ed71ec 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sixpair/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sixpair/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb }: +{ stdenv, fetchurl, libusb-compat-0_1 }: stdenv.mkDerivation { name = "sixpair-2007-04-18"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { # hcitool is depricated patches = [ ./hcitool.patch ]; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; unpackPhase = '' cp $src sixpair.c diff --git a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix index 5503c8ecc5..6e720bf103 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.40.1"; + version = "0.41.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "0jnm586wx5by1b6v78v78a84qzg05n1ha1hlmnjfyzhgjkbkayp1"; + sha256 = "1m5pi49g3pj2qr5slyasda5xp9lz3xhz3qb9k0pa6fvcn9581r9q"; }; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; - cargoSha256 = "1jrlzihcq543z6hb1gq8zq6hqvgralzsknj3xnb6gia1n49b3zxz"; + cargoSha256 = "18z1p8xj1v9w6amc52gc2vcn5f4z8k71ig20zmj005v24si9pfwf"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix index 1aa221bd59..4d17768b8d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { pname = "tmux"; - version = "3.0a"; + version = "3.1a"; outputs = [ "out" "man" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "0y9lv1yr0x50v3k70vzkc8hfr7yijlsi30p7dr7i8akp3lwmmc7h"; + sha256 = "1j85d5mj7zf3k17wsrm45m79ygc6dljc4as3crvp12r45k8xg9k6"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix index d19b9cd5db..ae8e7926eb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix @@ -1,4 +1,4 @@ -{ lib, buildRubyGem, ruby }: +{ lib, buildRubyGem, ruby, installShellFiles }: # Cannot use bundleEnv because bundleEnv create stub with # BUNDLE_FROZEN='1' environment variable set, which broke everything @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "1.1.4"; - source.sha256 = "06ajfvsmq2040b7nk2ifih3sqxgwzih5j1d25nh4ilgjlrfmha98"; + version = "2.0.0"; + source.sha256 = "1q5z6f548138792mc7aksxdgngfgdsyf8s117b4flyb2hqgmv24b"; erubis = buildRubyGem rec { inherit ruby; @@ -37,6 +37,12 @@ buildRubyGem rec { propagatedBuildInputs = [ erubis thor xdg ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion $GEM_HOME/gems/${gemName}-${version}/completion/tmuxinator.{bash,zsh,fish} + ''; + meta = with lib; { description = "Manage complex tmux sessions easily"; homepage = "https://github.com/tmuxinator/tmuxinator"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/urjtag/default.nix b/third_party/nixpkgs/pkgs/tools/misc/urjtag/default.nix index 67b25eaca8..2056fb9d0a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/urjtag/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/urjtag/default.nix @@ -1,5 +1,5 @@ { stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison -, flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb, readline +, flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb-compat-0_1, readline , python3 , svfSupport ? true , bsdlSupport ? true @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext autoconf automake libtool bison flex which - subversion makeWrapper readline libftdi libusb python3 ]; + subversion makeWrapper readline libftdi libusb-compat-0_1 python3 ]; configureFlags = [ (stdenv.lib.enableFeature svfSupport "svf") diff --git a/third_party/nixpkgs/pkgs/tools/misc/vdirsyncer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vdirsyncer/default.nix index eee4e5648e..61c9b9df87 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vdirsyncer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vdirsyncer/default.nix @@ -65,7 +65,7 @@ python3Packages.buildPythonApplication rec { checkPhase = '' rm -rf vdirsyncer - make DETERMINISTIC_TESTS=true test + make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/unit/utils/test_vobject.py::test_replace_uid --deselect=tests/unit/sync/test_sync.py::TestSyncMachine" test ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/vdirsyncer/stable.nix b/third_party/nixpkgs/pkgs/tools/misc/vdirsyncer/stable.nix index d3fe47001d..ada70678e3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vdirsyncer/stable.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vdirsyncer/stable.nix @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { ''; checkPhase = '' - make DETERMINISTIC_TESTS=true test + make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/system/cli/test_sync.py::test_verbosity" test ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/woeusb/default.nix b/third_party/nixpkgs/pkgs/tools/misc/woeusb/default.nix index 4c235b4866..991ab62249 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/woeusb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/woeusb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, makeWrapper -, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, p7zip, utillinux, wget +, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, utillinux, wget , wxGTK30 }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # should be patched with a less useless default PATH, but for now # we add everything we need manually. wrapProgram "$out/bin/woeusb" \ - --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted utillinux wget p7zip ]}' + --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted utillinux wget ]}' ''; doInstallCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix index 4804599932..12acbcfbe1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libusb, libusb1, autoconf, automake, libconfuse, pkgconfig +{ stdenv, fetchgit, libusb-compat-0_1, libusb1, autoconf, automake, libconfuse, pkgconfig , gccCross ? null }: @@ -30,7 +30,7 @@ stdenv.mkDerivation { dontCrossStrip = true; nativeBuildInputs = [ autoconf automake pkgconfig ]; - buildInputs = [ libusb libusb1 libconfuse ] ++ + buildInputs = [ libusb-compat-0_1 libusb1 libconfuse ] ++ stdenv.lib.optional (gccCross != null) gccCross; meta = { 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 7b58ccfa85..0a45c27a7a 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.03.24"; + version = "2020.05.03"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "05l4asakakxn53wrvxn6c03fd80zdizdbj6r2cj8c1ja3sj9i8s5"; + sha256 = "0qigk1bml6vkck4rs0wnmr46j5gkz04zn30jvnw1r4czjs7vnpal"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/yubikey-personalization/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yubikey-personalization/default.nix index 41cb53d9d3..5ef828762f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yubikey-personalization/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb, libyubikey, json_c }: +{ stdenv, fetchurl, pkgconfig, libusb1, libyubikey, json_c }: stdenv.mkDerivation rec { pname = "yubikey-personalization"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb libyubikey json_c ]; + buildInputs = [ libusb1 libyubikey json_c ]; configureFlags = [ "--with-backend=libusb-1.0" diff --git a/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix index a43d41637b..d2abd143ce 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "1sad18d0pxfdy9gvjmixzgdskg1l7djvzp0aipx7pz0lyi6gs23z"; + sha256 = "1qkvmjrkcivfzbm6swl5lgvpqz9av9jxcn9i8ms3wz4vfsibmlxv"; }; buildInputs = [ fzf ]; - cargoSha256 = "1sx3s1jnfxylbjr3x6v6j8a6zkl7hfyj4alzlyrsw36b1b64pwqm"; + cargoSha256 = "1w921f7b6kzc1mjzff1bcs3mg4cp9h48698w2zlv5jzjs7nwgb8n"; meta = with lib; { description = "A fast cd command that learns your habits"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix b/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix index 6398c4b91f..be6d05ef42 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.5.4"; + version = "3.5.5"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "0sxcyrlgqajmlsicr4j2b8hq2fzw8ai1xsq176bz0f33q9m9wvhf"; + sha256 = "1w93ia9jr2afgkbaklx2rj0ccd0ghg1qbdg363aqqvyw40ccya1r"; }; - modSha256 = "1yjvwkm2zaf017lai5xl088x1z1ifwsbw56dagyf8z9jk9lhkcj7"; + modSha256 = "051fxfh7lwrj3hzsgr2c2ga6hksz56673lg35y36sz4d93yldj6f"; outputs = [ "out" "wordlists" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix index 667eb9feb0..055f92141b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix @@ -12,21 +12,13 @@ let ]); in stdenv.mkDerivation rec { - name = "dnsmasq-2.80"; + name = "dnsmasq-2.81"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; - sha256 = "1fv3g8vikj3sn37x1j6qsywn09w1jipvlv34j3q5qrljbrwa5ayd"; + sha256 = "1yzq6anwgr5rlnwydpszb51cyhp2vjq29b24ck19flbwac1sk73l"; }; - patches = [ - # Fix build with nettle 3.5 - (fetchpatch { - name = "nettle-3.5.patch"; - url = "thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=patch;h=ab73a746a0d6fcac2e682c5548eeb87fb9c9c82e"; - sha256 = "1hnixij3jp1p6zc3bx2dr92yyf9jp1ahhl9hiiq7bkbhbrw6mbic"; - }) - ]; postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' sed '1i#include ' -i src/dhcp.c ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index 6f57e98123..3877e6f0e1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.24.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "1jwy2qi99ks6zcas6h1n0zq3b0k47036ayas0mprdips60azw0hg"; + sha256 = "0nsj75aw5dym1pzn18p6fzh17vcryz1xs4xly6ga79dkpyijr9j8"; }; - modSha256 = "0kba3jay6m9ir1pc7i833p7ylbs610g0lkp8kc3gm47xnxy7j4gz"; + modSha256 = "1m8565hkn981b6xld8jyrbxay48ww8lzr94kgakx0rg5548kd7v5"; meta = with stdenv.lib; { description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix index f44e220864..438740600c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frp"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "1hj3xy7ihwl66hyxc1m8k3fwgz5jyx1bd32f80d7266klhjqf6nw"; + sha256 = "1z914p20n3i1bf4hx5iq2fylx1s49knb70cbg53ji2n7nrm1q33r"; }; modSha256 = "1v90w5grc0vjpcp0m56d73zi0qnbswgz1rcvcwrjfa3rwqhigbal"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/httplz/cargo-lock.patch b/third_party/nixpkgs/pkgs/tools/networking/httplz/cargo-lock.patch index 5ded54799a..293d65f7a2 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/httplz/cargo-lock.patch +++ b/third_party/nixpkgs/pkgs/tools/networking/httplz/cargo-lock.patch @@ -1,1269 +1,1275 @@ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 0000000..4b798fc +index 0000000..722bfbd --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,1263 @@ +@@ -0,0 +1,1269 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "adler32" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" + +[[package]] +name = "aho-corasick" -+version = "0.7.6" ++version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" +dependencies = [ -+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "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.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", +] + +[[package]] +name = "antidote" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ -+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi", ++ "libc", ++ "winapi", +] + +[[package]] +name = "autocfg" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" + +[[package]] +name = "autocfg" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" + +[[package]] +name = "base64" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" +dependencies = [ -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder", ++ "safemem", +] + +[[package]] +name = "base64" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +dependencies = [ -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder", +] + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "bitstring" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3e54f7b7a46d7b183eb41e2d82965261fa8a1597c68b50aced268ee1fc70272d" + +[[package]] +name = "brotli-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" +dependencies = [ -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", ++ "libc", +] + +[[package]] +name = "brotli2" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" +dependencies = [ -+ "brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "brotli-sys", ++ "libc", +] + +[[package]] +name = "byteorder" -+version = "1.3.2" ++version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" + +[[package]] +name = "bzip2" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" +dependencies = [ -+ "bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bzip2-sys", ++ "libc", +] + +[[package]] +name = "bzip2-sys" -+version = "0.1.7" ++version = "0.1.8+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05305b41c5034ff0e93937ac64133d109b5a2660114ec45e9760bc6816d83038" +dependencies = [ -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "c2-chacha" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", ++ "libc", +] + +[[package]] +name = "cc" -+version = "1.0.50" ++version = "1.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "cidr" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2da1cf0f275bb8dc1867a7f40cdb3b746951db73a183048e6e37fa89ed81bd01" ++dependencies = [ ++ "bitstring", ++] + +[[package]] +name = "clap" +version = "2.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" +dependencies = [ -+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", +] + +[[package]] +name = "cloudabi" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", +] + +[[package]] +name = "core-foundation" -+version = "0.6.4" ++version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" +dependencies = [ -+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys", ++ "libc", +] + +[[package]] +name = "core-foundation-sys" -+version = "0.6.2" ++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 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", +] + +[[package]] +name = "ctrlc" -+version = "3.1.3" ++version = "3.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a4ba686dff9fa4c1c9636ce1010b0cf98ceb421361b0bb3d6faeec43bd217a7" +dependencies = [ -+ "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nix", ++ "winapi", +] + +[[package]] +name = "dtoa" -+version = "0.4.4" ++version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3" + +[[package]] +name = "either" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" + +[[package]] +name = "embed-resource" -+version = "1.3.1" ++version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1f6b0b4403da80c2fd32333937dd468292c001d778c587ae759b75432772715d" +dependencies = [ -+ "vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vswhom", ++ "winreg", +] + +[[package]] +name = "flate2" -+version = "1.0.13" ++version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2cfff41391129e0a856d6d822600b8d71179d46879e310417eb9c762eb178b42" +dependencies = [ -+ "cfg-if 0.1.10 (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.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "crc32fast", ++ "libc", ++ "miniz_oxide", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ -+ "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "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 = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[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.14" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "wasi", +] + +[[package]] +name = "hermit-abi" -+version = "0.1.6" ++version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a0d737e0f947a1864e93d33fdef4af8445a00d1ed8dc0c8ddb73139ea6abf15" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", +] + +[[package]] +name = "httparse" +version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" + +[[package]] +name = "https" -+version = "1.8.0" ++version = "1.9.2" +dependencies = [ -+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "embed-resource 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "md6 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "os-str-generic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rfsapi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tabwriter 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -+ "trivial_colours 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "base64 0.10.1", ++ "brotli2", ++ "bzip2", ++ "cc", ++ "cidr", ++ "clap", ++ "ctrlc", ++ "embed-resource", ++ "flate2", ++ "hyper-native-tls", ++ "iron", ++ "itertools", ++ "lazy_static", ++ "lazysort", ++ "libc", ++ "md6", ++ "mime_guess", ++ "os-str-generic", ++ "percent-encoding 2.1.0", ++ "rand 0.7.3", ++ "regex", ++ "rfsapi", ++ "serde", ++ "serde_json", ++ "tabwriter", ++ "time", ++ "trivial_colours", ++ "unicase 2.6.0", ++ "walkdir", ++ "winapi", ++ "xml-rs", +] + +[[package]] +name = "hyper" +version = "0.10.16" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273" +dependencies = [ -+ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -+ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "base64 0.9.3", ++ "httparse", ++ "language-tags", ++ "log 0.3.9", ++ "mime", ++ "num_cpus", ++ "time", ++ "traitobject", ++ "typeable", ++ "unicase 1.4.2", ++ "url", +] + +[[package]] +name = "hyper-native-tls" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d375598f442742b0e66208ee12501391f1c7ac0bafb90b4fe53018f81f06068" +dependencies = [ -+ "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "antidote", ++ "hyper", ++ "native-tls", +] + +[[package]] +name = "idna" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +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.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches", ++ "unicode-bidi", ++ "unicode-normalization", +] + +[[package]] +name = "iron" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c6d308ca2d884650a8bf9ed2ff4cb13fbb2207b71f64cda11dc9b892067295e8" +dependencies = [ -+ "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper", ++ "hyper-native-tls", ++ "log 0.3.9", ++ "mime_guess", ++ "modifier", ++ "num_cpus", ++ "plugin", ++ "typemap", ++ "url", +] + +[[package]] +name = "itertools" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" +dependencies = [ -+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "either", +] + +[[package]] +name = "itoa" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" + +[[package]] +name = "language-tags" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazysort" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f" + +[[package]] +name = "libc" -+version = "0.2.66" ++version = "0.2.69" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" + +[[package]] +name = "log" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" +dependencies = [ -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8", +] + +[[package]] +name = "log" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", +] + +[[package]] +name = "matches" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" + +[[package]] +name = "md6" -+version = "2.0.0" ++version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "21baf112ff708069b0d0544843236583c9c18675cc1af78ba4ace0f60f63fb31" +dependencies = [ -+ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gcc", ++ "libc", +] + +[[package]] +name = "memchr" -+version = "2.3.0" ++version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" + +[[package]] +name = "mime" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" +dependencies = [ -+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.3.9", +] + +[[package]] +name = "mime_guess" -+version = "1.8.7" ++version = "1.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "216929a5ee4dd316b1702eedf5e74548c123d370f47841ceaac38ca154690ca3" +dependencies = [ -+ "mime 0.2.6 (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)", ++ "mime", ++ "phf", ++ "phf_codegen", ++ "unicase 1.4.2", +] + +[[package]] +name = "miniz_oxide" -+version = "0.3.5" ++version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5" +dependencies = [ -+ "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "adler32", +] + +[[package]] +name = "modifier" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58" + +[[package]] +name = "native-tls" -+version = "0.2.3" ++version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" +dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (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.26 (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.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", ++ "libc", ++ "log 0.4.8", ++ "openssl", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "security-framework", ++ "security-framework-sys", ++ "tempfile", +] + +[[package]] +name = "nix" -+version = "0.14.1" ++version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" +dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "cc", ++ "cfg-if", ++ "libc", ++ "void", +] + +[[package]] +name = "num-traits" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" +dependencies = [ -+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.11", +] + +[[package]] +name = "num-traits" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" +dependencies = [ -+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.0", +] + +[[package]] +name = "num_cpus" -+version = "1.12.0" ++version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ -+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi", ++ "libc", +] + +[[package]] +name = "openssl" -+version = "0.10.26" ++version = "0.10.29" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd" +dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (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.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "cfg-if", ++ "foreign-types", ++ "lazy_static", ++ "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.53" ++version = "0.9.55" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7717097d810a0f2e2323f9e5d11e71608355e24828410b55b9d4f18aa5f9a5d8" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.0", ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", +] + +[[package]] +name = "os-str-generic" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "78f3d620827b89763f54b7f1da3029bd4e0ca7eb1ae61a5c4d3b0bc0dca5157e" + +[[package]] +name = "percent-encoding" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] +name = "phf" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" +dependencies = [ -+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" +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)", ++ "phf_generator", ++ "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" +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)", ++ "phf_shared", ++ "rand 0.6.5", +] + +[[package]] +name = "phf_shared" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" +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)", ++ "siphasher", ++ "unicase 1.4.2", +] + +[[package]] +name = "pkg-config" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" + +[[package]] +name = "plugin" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0" +dependencies = [ -+ "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "typemap", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" + +[[package]] +name = "quote" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" + +[[package]] +name = "rand" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (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.2 (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.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7", ++ "libc", ++ "rand_chacha 0.1.1", ++ "rand_core 0.4.2", ++ "rand_hc 0.1.0", ++ "rand_isaac", ++ "rand_jitter", ++ "rand_os", ++ "rand_pcg", ++ "rand_xorshift", ++ "winapi", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ -+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (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.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom", ++ "libc", ++ "rand_chacha 0.2.2", ++ "rand_core 0.5.1", ++ "rand_hc 0.2.0", +] + +[[package]] +name = "rand_chacha" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7", ++ "rand_core 0.3.1", +] + +[[package]] +name = "rand_chacha" -+version = "0.2.1" ++version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ -+ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ppv-lite86", ++ "rand_core 0.5.1", +] + +[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +dependencies = [ -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ -+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +dependencies = [ -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1", +] + +[[package]] +name = "rand_isaac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +dependencies = [ -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", +] + +[[package]] +name = "rand_jitter" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "rand_core 0.4.2", ++ "winapi", +] + +[[package]] +name = "rand_os" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +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.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.2 (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.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cloudabi", ++ "fuchsia-cprng", ++ "libc", ++ "rand_core 0.4.2", ++ "rdrand", ++ "winapi", +] + +[[package]] +name = "rand_pcg" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7", ++ "rand_core 0.4.2", +] + +[[package]] +name = "rand_xorshift" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +dependencies = [ -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", +] + +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", +] + +[[package]] +name = "redox_syscall" +version = "0.1.56" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" + +[[package]] +name = "regex" -+version = "1.3.3" ++version = "1.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692" +dependencies = [ -+ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++ "thread_local", +] + +[[package]] +name = "regex-syntax" -+version = "0.6.13" ++version = "0.6.17" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" + +[[package]] +name = "remove_dir_all" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" +dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", +] + +[[package]] +name = "rfsapi" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1b6fbc119d00459f80252adb96e554766d75de071ed5d3c49f46a000d137cd49" +dependencies = [ -+ "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper", ++ "mime", ++ "serde", ++ "serde_derive", ++ "time", +] + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ -+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util", +] + +[[package]] +name = "schannel" -+version = "0.1.16" ++version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "039c25b130bd8c1321ee2d7de7fde2659fa9c2744e4bb29711cfc852ea53cd19" +dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", ++ "winapi", +] + +[[package]] +name = "security-framework" -+version = "0.3.4" ++version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f331b9025654145cd425b9ded0caf8f5ae0df80d418b326e2dc1c3dc5eb0620" +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.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "core-foundation", ++ "core-foundation-sys", ++ "libc", ++ "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" -+version = "0.3.3" ++version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" +dependencies = [ -+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys", ++ "libc", +] + +[[package]] +name = "serde" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" + +[[package]] +name = "serde_codegen_internals" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc888bd283bd2420b16ad0d860e35ad8acb21941180a83a189bb2046f9d00400" +dependencies = [ -+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn", +] + +[[package]] +name = "serde_derive" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "978fd866f4d4872084a81ccc35e275158351d3b9fe620074e7d7504b816b74ba" +dependencies = [ -+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote", ++ "serde_codegen_internals", ++ "syn", +] + +[[package]] +name = "serde_json" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1" +dependencies = [ -+ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dtoa", ++ "itoa", ++ "num-traits 0.1.43", ++ "serde", +] + +[[package]] +name = "siphasher" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" + +[[package]] +name = "smallvec" -+version = "1.1.0" ++version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "syn" +version = "0.11.11" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" +dependencies = [ -+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote", ++ "synom", ++ "unicode-xid", +] + +[[package]] +name = "synom" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" +dependencies = [ -+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid", +] + +[[package]] +name = "tabwriter" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "36205cfc997faadcc4b0b87aaef3fbedafe20d38d4959a7ca6ff803564051111" +dependencies = [ -+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width", +] + +[[package]] +name = "tempfile" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.7.3 (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.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "rand 0.7.3", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ -+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width", +] + +[[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 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", +] + +[[package]] +name = "time" -+version = "0.1.42" ++version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +dependencies = [ -+ "libc 0.2.66 (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.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "winapi", +] + +[[package]] +name = "traitobject" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" + +[[package]] +name = "trivial_colours" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7153365ea16c5a0ce2eebc4da1b33339a6b21d90c49f670e82130639656bb458" + +[[package]] +name = "typeable" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" + +[[package]] +name = "typemap" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" +dependencies = [ -+ "unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unsafe-any", +] + +[[package]] +name = "unicase" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" +dependencies = [ -+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "version_check 0.1.5", +] + +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ -+ "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "version_check 0.9.1", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +dependencies = [ -+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches", +] + +[[package]] +name = "unicode-normalization" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" +dependencies = [ -+ "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" + +[[package]] +name = "unicode-xid" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" + +[[package]] +name = "unsafe-any" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" +dependencies = [ -+ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "traitobject", +] + +[[package]] +name = "url" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" +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)", ++ "idna", ++ "matches", ++ "percent-encoding 1.0.1", +] + +[[package]] +name = "vcpkg" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" + +[[package]] +name = "vec_map" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" + +[[package]] +name = "version_check" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" + +[[package]] +name = "version_check" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" + +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + +[[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532" +dependencies = [ -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", ++ "libc", +] + +[[package]] +name = "walkdir" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" +dependencies = [ -+ "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "same-file", ++ "winapi", ++ "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.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +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)", ++ "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-util" -+version = "0.1.3" ++version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", +] + +[[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 = "winreg" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" +dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", +] + +[[package]] +name = "xml-rs" -+version = "0.8.0" ++version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[metadata] -+"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" -+"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 antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" -+"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -+"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" -+"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -+"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+"checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" -+"checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" -+"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" -+"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.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" -+"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" -+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" -+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -+"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 crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -+"checksum ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7dfd2d8b4c82121dfdff120f818e09fc4380b0b7e17a742081a89b94853e87f" -+"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" -+"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" -+"checksum embed-resource 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bbaba4684ab0af1cbb3ef0b1f540ddc4b57b31940c920ea594efe09ab86e2a6c" -+"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f" -+"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 gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" -+"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -+"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" -+"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" -+"checksum hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273" -+"checksum hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d375598f442742b0e66208ee12501391f1c7ac0bafb90b4fe53018f81f06068" -+"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -+"checksum iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d308ca2d884650a8bf9ed2ff4cb13fbb2207b71f64cda11dc9b892067295e8" -+"checksum itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" -+"checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" -+"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" -+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+"checksum lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f" -+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" -+"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -+"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -+"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -+"checksum md6 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "54e5826684849cecd3fa05a6a5052c50a3542f163a9917ff0b91379426a2e45d" -+"checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223" -+"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" -+"checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7" -+"checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625" -+"checksum modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58" -+"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" -+"checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" -+"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -+"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" -+"checksum num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6" -+"checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585" -+"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -+"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f" -+"checksum os-str-generic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "78f3d620827b89763f54b7f1da3029bd4e0ca7eb1ae61a5c4d3b0bc0dca5157e" -+"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" -+"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -+"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.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" -+"checksum plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0" -+"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" -+"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" -+"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -+"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -+"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.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" -+"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -+"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 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 regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b5508c1941e4e7cb19965abef075d35a9a8b5cdf0846f30b4050e9b55dc55e87" -+"checksum regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e734e891f5b408a29efbf8309e656876276f49ab6a6ac208600b4419bd893d90" -+"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -+"checksum rfsapi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b6fbc119d00459f80252adb96e554766d75de071ed5d3c49f46a000d137cd49" -+"checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" -+"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -+"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" -+"checksum security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df" -+"checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895" -+"checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" -+"checksum serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc888bd283bd2420b16ad0d860e35ad8acb21941180a83a189bb2046f9d00400" -+"checksum serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "978fd866f4d4872084a81ccc35e275158351d3b9fe620074e7d7504b816b74ba" -+"checksum serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1" -+"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -+"checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4" -+"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" -+"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" -+"checksum tabwriter 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "36205cfc997faadcc4b0b87aaef3fbedafe20d38d4959a7ca6ff803564051111" -+"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -+"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" -+"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" -+"checksum trivial_colours 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7153365ea16c5a0ce2eebc4da1b33339a6b21d90c49f670e82130639656bb458" -+"checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" -+"checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" -+"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" -+"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -+"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -+"checksum unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" -+"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" -+"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" -+"checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" -+"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -+"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" -+"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 version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" -+"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -+"checksum vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" -+"checksum vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532" -+"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" -+"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+"checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80" -+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+"checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" -+"checksum xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5" ++checksum = "2bb76e5c421bbbeb8924c60c030331b345555024d56261dae8f3e786ed817c23" diff --git a/third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix b/third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix index c4f003f884..bf0a5b9038 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "httplz"; - version = "1.8.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "thecoshman"; repo = "http"; rev = "v${version}"; - sha256 = "0i41hqig8v6w1qb6498239iix1rss0lznm5lcl9m3i439c2zv7pw"; + sha256 = "154alxxclz78r29m656c8yahnzq0vd64s4sp19h0ca92dfw4s46y"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--bin httplz" ]; cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "13hk9m09jff3bxbixsjvksiir4j4mak4ckvlq45bx5d5lh8sapxl"; + cargoSha256 = "1rpwzrr9bvw375vn97y5fqhraqz35d3ani9kfflvn2758x3g8gwf"; postInstall = '' wrapProgram $out/bin/httplz \ diff --git a/third_party/nixpkgs/pkgs/tools/networking/inadyn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/inadyn/default.nix index 9f7d79bdd8..2a551c5676 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/inadyn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/inadyn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "inadyn"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "troglobit"; repo = "inadyn"; rev = "v${version}"; - sha256 = "013kxlglxliajv3lrsix4w88w40g709rvycajb6ad6gbh8giqv47"; + sha256 = "00jhayx0hfl9dw78d58bdxa5390bvxq73lz26q9h1gg1xw76adan"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix index b3b150d4b8..3bd03f3856 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2020-03-06T23-29-45Z"; + version = "2020-04-04T05-28-55Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "1vqvp7mn841s5g9vvas3c8j4y9lp90maw5y49hdv7zcsqncqvzkv"; + sha256 = "09z28fq492d4l0089d1knq4zah9p2b212pkz777vznw9lzfqqip8"; }; - modSha256 = "1qjfsqmcc6i0nixwvdmm3vnnv19yvqaaza096cpdf5rl35knsp5i"; + modSha256 = "0cv824ar5ifsg93sylrfjmax6zqm5073y95hqqfcc1dfp0mv2ki3"; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix index aa1e004d1a..c103637c68 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "0q2ik7fj5k9i76js4ijyxbgrwqff437lass0sd5if2r40rqh0as0"; + sha256 = "1i9chd8ks1q4g5pyscsir6pw4kahkx3k8ckzbi8j3gr6jz1qzzsg"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/pykms/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pykms/default.nix index e1a13b7312..345999c00b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/pykms/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/pykms/default.nix @@ -44,16 +44,14 @@ in buildPythonApplication rec { propagatedBuildInputs = [ systemd pytz tzlocal ]; + # Fix https://github.com/SystemRage/py-kms/issues/64 : + patches = [ ./log-to-current-directory-by-default.patch ]; + postPatch = '' siteDir=$out/${python3.sitePackages} substituteInPlace pykms_DB2Dict.py \ --replace "'KmsDataBase.xml'" "'$siteDir/KmsDataBase.xml'" - - # we are logging to journal - sed -i pykms_Misc.py \ - -e '6ifrom systemd import journal' \ - -e 's/log_obj.addHandler(log_handler)/log_obj.addHandler(journal.JournalHandler())/' ''; format = "other"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch b/third_party/nixpkgs/pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch new file mode 100644 index 0000000000..7c8c65b63a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch @@ -0,0 +1,20 @@ +# By default, create log files in current directory, instead of the script directory. +--- ../original/py-kms/pykms_Client.py ++++ py-kms/pykms_Client.py +@@ -48,5 +48,5 @@ + 'choi' : ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG", "MINI"]}, + 'lfile' : {'help' : 'Use this option to set an output log file. The default is \"pykms_logclient.log\" or type \"STDOUT\" to view log info on stdout.', +- 'def' : os.path.dirname(os.path.abspath( __file__ )) + "/pykms_logclient.log", 'des' : "logfile"}, ++ 'def' : "pykms_logclient.log", 'des' : "logfile"}, + 'lsize' : {'help' : 'Use this flag to set a maximum size (in MB) to the output log file. Desactivated by default.', 'def' : 0, 'des': "logsize"}, + } +--- ../original/py-kms/pykms_Server.py ++++ py-kms/pykms_Server.py +@@ -85,5 +85,5 @@ + 'choi' : ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG", "MINI"]}, + 'lfile' : {'help' : 'Use this option to set or not an output log file. The default is \"pykms_logserver.log\" or type \"STDOUT\" to view log info on stdout.', +- 'def' : os.path.dirname(os.path.abspath( __file__ )) + "/pykms_logserver.log", 'des' : "logfile"}, ++ 'def' : "pykms_logserver.log", 'des' : "logfile"}, + 'lsize' : {'help' : 'Use this flag to set a maximum size (in MB) to the output log file. Desactivated by default.', 'def' : 0, 'des': "logsize"}, + } + ''); diff --git a/third_party/nixpkgs/pkgs/tools/networking/rtptools/default.nix b/third_party/nixpkgs/pkgs/tools/networking/rtptools/default.nix index a713331d7c..5d439f183d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/rtptools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/rtptools/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; meta = { description = "A number of small applications that can be used for processing RTP data"; - homepage = "http://www.cs.columbia.edu/irt/software/rtptools/"; + homepage = "https://www.cs.columbia.edu/irt/software/rtptools/"; maintainers = [ lib.maintainers.lheckemann ]; platforms = lib.platforms.unix; license = lib.licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tox-node/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tox-node/default.nix index 1124c2ab55..feeceef81f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tox-node/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tox-node/default.nix @@ -24,7 +24,7 @@ buildRustPackage rec { installPhase = '' runHook preInstall - install -D target/release/tox-node $out/bin/tox-node + install -D $releaseDir/tox-node $out/bin/tox-node runHook postInstall ''; 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 0a86d7dec8..4fac72f7d0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix @@ -1,12 +1,12 @@ -{ - stdenv, fetchzip, - - iptables ? null, - iproute ? null, - makeWrapper ? null, - openresolv ? null, - procps ? null, - wireguard-go ? null, +{ stdenv +, fetchzip +, nixosTests +, iptables ? null +, iproute ? null +, makeWrapper ? null +, openresolv ? null +, procps ? null +, wireguard-go ? null }: with stdenv.lib; @@ -47,7 +47,12 @@ stdenv.mkDerivation rec { done ''; - passthru.updateScript = ./update.sh; + passthru = { + updateScript = ./update.sh; + tests = { + inherit (nixosTests) wireguard wg-quick wireguard-generated wireguard-namespaces; + }; + }; meta = { description = "Tools for the WireGuard secure network tunnel"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/wormhole/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wormhole/default.nix new file mode 100644 index 0000000000..2b826224f4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/wormhole/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, openssl +, pkg-config +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "wormhole"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "agrinman"; + repo = pname; + rev = version; + sha256 = "0aq2myzqd9xqz4zdl03jhdd7f22y9k39xdhiark6ymhwcxijsq8y"; + }; + + cargoSha256 = "1gjqiv8sgdab0i461v72zcvh91cpqmmpcc3qyx3svq0391rwzp46"; + + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + buildInputs = [ ] + ++ stdenv.lib.optionals stdenv.isLinux [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { + description = "Expose your local web server to the internet with a public URL"; + homepage = "https://tunnelto.dev"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix index dfd7eb63b1..b55ac647b3 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -1,16 +1,25 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "nixpkgs-fmt"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - sha256 = "0b9wwv77bpq24yxky44ndgvxsx2zgsl15lvl6wklbkr41mwz3xis"; + sha256 = "09lhi8aidw9qf94n07mgs2nfac32a96wkx50glj35dhn06iwzwqr"; }; - cargoSha256 = "1vv2gypbmgd9lksrk5h2z3agcs1269p1i3im9529nhcsl62ckj7n"; + patches = [ + # Fixes debug output on stdout mangling some files. Fixed in next release. + # https://github.com/nix-community/nixpkgs-fmt/issues/201 + (fetchpatch { + url = "https://github.com/nix-community/nixpkgs-fmt/commit/648f46e1d5507592b246311618f467da282bf1b5.patch"; + sha256 = "18n4criyl0lydxmjqfkcmwx0pniyqzfgfxcjwz6czqwmx5y7b4rb"; + }) + ]; + + cargoSha256 = "15m40d9354412h51zn806pxsqjai48xiw8chf8slbi0cjxd268j9"; meta = with lib; { description = "Nix code formatter for nixpkgs"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix index 623c8e2065..c6e8b4803c 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix @@ -6,18 +6,18 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "1.23.2"; + version = "1.24.0"; src = fetchFromGitHub { owner = "mmstick"; repo = pname; - rev = "367910e0020de93f45c175c92a37a53ee401978f"; - sha256 = "1s0xv818rlafdzpb70c1ldv5iq3hh2jxj7g3l6p7v20q1wx0nnvv"; + rev = "b49351f6770aa7aeb053dd1d4a02d6b086caad2a"; + sha256 = "1hs96yv0awgi7ggpxp7k3n21jpv642sm0529b21hs9ib6kp4vs8s"; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0ffzq2gm0f56vyfkmdzxfs5z1xsdj2kcsyc1fdrk4k1cylqn2f47"; + cargoSha256 = "1vqnnqn6rzkdi239bh3lk7gaxr7w6v3c4ws4ya1ah04g6v9hkzlw"; meta = with lib; { description = "Generate Debian packages from information in Cargo.toml"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix index bb91697ab5..389d1feb34 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.2.15"; + version = "0.2.19"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "1h1z18m504kflzv9wcybkgc4xr5w9l9d7qsjri0an57lxv6dpv0f"; + sha256 = "0vw0axnb7gil6lr72rixp4v3pspi0jq99x8h954mdcff2jr031x5"; }; - cargoSha256 = "1wfxy4py2xwf1m0i52jq1f9xgzc7v5m55crl0xbp8f0raflksaxk"; + cargoSha256 = "118rxiwvi9k6jq5y0k7yn4w9zlb0fd6xdcyrv38ipr8qrj16cjrq"; meta = with lib; { description = "Mirror installed software on multiple machines"; 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 fa1394242d..417962733a 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 @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1a6svl89dcdb5fpvs2i32i6agyhl0sx7kkkw70rqr17fyzl5psai"; doCheck = true; - checkInputs = [ graphviz ]; + checkInputs = [ nix graphviz ]; buildInputs = [ boost 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 b6455cc170..922546009f 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.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - sha256 = "0qkvjl4f8a1905yj3ml32rfdr5q76igz21gn3dcya0pfqhrnb28i"; + sha256 = "1v988jsxx2r82q6mf3503130cny088hin2as00yi26jzxjkrjcli"; }; makeWrapperArgs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/afl/default.nix b/third_party/nixpkgs/pkgs/tools/security/afl/default.nix index df5e372894..e32aa03487 100644 --- a/third_party/nixpkgs/pkgs/tools/security/afl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/afl/default.nix @@ -47,6 +47,11 @@ let # has totally different semantics in that case(?) - and also set a # proper AFL_CC and AFL_CXX so we don't pick up the wrong one out # of $PATH. + # first though we need to replace the afl-clang-fast++ symlink with + # a real copy to prevent wrapProgram skipping the symlink and confusing + # nix's cc wrapper + rm $out/bin/afl-clang-fast++ + cp $out/bin/afl-clang-fast $out/bin/afl-clang-fast++ for x in $out/bin/afl-clang-fast $out/bin/afl-clang-fast++; do wrapProgram $x \ --prefix AFL_PATH : "$out/lib/afl" \ @@ -68,7 +73,7 @@ let also useful for seeding other, more labor or resource-intensive testing regimes down the road. ''; - homepage = "http://lcamtuf.coredump.cx/afl/"; + homepage = "https://lcamtuf.coredump.cx/afl/"; license = stdenv.lib.licenses.asl20; platforms = ["x86_64-linux" "i686-linux"]; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ris ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/afl/libdislocator.nix b/third_party/nixpkgs/pkgs/tools/security/afl/libdislocator.nix index 953c59e435..103786d124 100644 --- a/third_party/nixpkgs/pkgs/tools/security/afl/libdislocator.nix +++ b/third_party/nixpkgs/pkgs/tools/security/afl/libdislocator.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = "http://lcamtuf.coredump.cx/afl/"; + homepage = "https://lcamtuf.coredump.cx/afl/"; description = '' Drop-in replacement for the libc allocator which improves the odds of bumping into heap-related security bugs in diff --git a/third_party/nixpkgs/pkgs/tools/security/brutespray/default.nix b/third_party/nixpkgs/pkgs/tools/security/brutespray/default.nix index be7c99f525..78dd789047 100644 --- a/third_party/nixpkgs/pkgs/tools/security/brutespray/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/brutespray/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "brutespray"; - version = "1.6.6"; + version = "1.6.8"; src = fetchFromGitHub { owner = "x90skysn3k"; repo = pname; rev = "brutespray-${version}"; - sha256 = "1rj8fkq1xz4ph1pmldphlsa25mg6xl7i7dranb0qjx00jhfxjxjh"; + sha256 = "1pi4d5vcvvjsby39dq995dlhpxdicmfhqsiw23hr25m38ccfm3rh"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/crowbar/default.nix b/third_party/nixpkgs/pkgs/tools/security/crowbar/default.nix new file mode 100644 index 0000000000..cd4e7db871 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/crowbar/default.nix @@ -0,0 +1,42 @@ +{ fetchFromGitHub +, freerdp +, nmap +, openvpn +, python3Packages +, stdenv +, tigervnc +}: + +python3Packages.buildPythonApplication rec { + pname = "crowbar"; + version = "unstable-2020-04-23"; + + src = fetchFromGitHub { + owner = "galkan"; + repo = pname; + rev = "500d633ff5ddfcbc70eb6d0b4d2181e5b8d3c535"; + sha256 = "05m9vywr9976pc7il0ak8nl26mklzxlcqx0p8rlfyx1q766myqzf"; + }; + + propagatedBuildInputs = [ python3Packages.paramiko ]; + + patchPhase = '' + sed -i 's,/usr/bin/xfreerdp,${freerdp}/bin/xfreerdp,g' lib/main.py + sed -i 's,/usr/bin/vncviewer,${tigervnc}/bin/vncviewer,g' lib/main.py + sed -i 's,/usr/sbin/openvpn,${openvpn}/bin/openvpn,g' lib/main.py + + sed -i 's,/usr/bin/nmap,${nmap}/bin/nmap,g' lib/nmap.py + ''; + + # Sanity check + checkPhase = '' + $out/bin/crowbar --help > /dev/null + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/galkan/crowbar"; + description = "A brute forcing tool that can be used during penetration tests"; + license = licenses.mit; + maintainers = with maintainers; [ pamplemousse ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/doas/default.nix b/third_party/nixpkgs/pkgs/tools/security/doas/default.nix index ce8b582564..58ada1086b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/doas/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/doas/default.nix @@ -1,15 +1,19 @@ -{ stdenv, lib, fetchFromGitHub, bison, pam }: +{ stdenv +, lib +, fetchFromGitHub +, bison +, pam +}: stdenv.mkDerivation rec { pname = "doas"; - - version = "6.0"; + version = "6.6.1"; src = fetchFromGitHub { owner = "Duncaen"; repo = "OpenDoas"; rev = "v${version}"; - sha256 = "1j50l3jvbgvg8vmp1nx6vrjxkbj5bvfh3m01bymzfn25lkwwhz1x"; + sha256 = "07kkc5729p654jrgfsc8zyhiwicgmq38yacmwfvay2b3gmy728zn"; }; # otherwise confuses ./configure @@ -26,6 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Duncaen/OpenDoas"; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ cole-h cstrahan ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/gnupg/20.nix b/third_party/nixpkgs/pkgs/tools/security/gnupg/20.nix index ea90016075..f5b693fed3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gnupg/20.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gnupg/20.nix @@ -4,7 +4,7 @@ # Each of the dependencies below are optional. # Gnupg can be built without them at the cost of reduced functionality. , pinentry ? null, guiSupport ? false -, openldap ? null, bzip2 ? null, libusb ? null, curl ? null +, openldap ? null, bzip2 ? null, libusb-compat-0_1 ? null, curl ? null }: with stdenv.lib; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline zlib libgpgerror libgcrypt libassuan libksba pth - openldap bzip2 libusb curl libiconv ]; + openldap bzip2 libusb-compat-0_1 curl libiconv ]; patches = [ ./gpgkey2ssh-20.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix index 8af24bf7ab..410b63ec7d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix @@ -1,20 +1,22 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, wl-clipboard, makeWrapper }: +{ stdenv, buildGoModule, fetchFromGitHub, git, gnupg, xclip, wl-clipboard, installShellFiles, makeWrapper }: -buildGoPackage rec { +buildGoModule rec { pname = "gopass"; - version = "1.8.6"; + version = "1.9.0"; - goPackagePath = "github.com/gopasspw/gopass"; - - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; src = fetchFromGitHub { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "0v3sx9hb03bdn4rvsv2r0jzif6p1rx47hrkpsbnwva31k396mck2"; + sha256 = "1cssiglhxnrk1wl8phqkhmljqig5ms5a23sdzf8lywk5f6w2gayh"; }; + modSha256 = "01p3zv6dq1l68in1qqvlsh7i3ydhhanf54dyf7288x35js8wnmqa"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" ]; + wrapperPath = stdenv.lib.makeBinPath ([ git gnupg @@ -22,17 +24,14 @@ buildGoPackage rec { ] ++ stdenv.lib.optional stdenv.isLinux wl-clipboard); postInstall = '' - mkdir -p \ - $bin/share/bash-completion/completions \ - $bin/share/zsh/site-functions \ - $bin/share/fish/vendor_completions.d - $bin/bin/gopass completion bash > $bin/share/bash-completion/completions/_gopass - $bin/bin/gopass completion zsh > $bin/share/zsh/site-functions/_gopass - $bin/bin/gopass completion fish > $bin/share/fish/vendor_completions.d/gopass.fish + for shell in bash fish zsh; do + $out/bin/gopass completion $shell > gopass.$shell + installShellCompletion gopass.$shell + done ''; postFixup = '' - wrapProgram $bin/bin/gopass \ + wrapProgram $out/bin/gopass \ --prefix PATH : "${wrapperPath}" ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix b/third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix index f1c2cee9f3..6a2eee4714 100644 --- a/third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { - pname = "hxcdumptool"; + pname = "hcxdumptool"; version = "6.0.5"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/tools/security/hcxtools/default.nix b/third_party/nixpkgs/pkgs/tools/security/hcxtools/default.nix index 84517ce2bd..5634ee6cff 100644 --- a/third_party/nixpkgs/pkgs/tools/security/hcxtools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/hcxtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxtools"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "ZerBea"; repo = pname; rev = version; - sha256 = "0r7pjz89chgb7zl2pqgw3zb1z8cgwp0nxmqvmkv0jn1m9dw3f44f"; + sha256 = "0a36184igdgs2h83zr4zihc5acps91ipmgph37jakvzwrsn64ma6"; }; buildInputs = [ curl openssl zlib ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix b/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix index 2d8957a9d5..bbc99c2ac4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "keybase"; - version = "5.3.1"; + version = "5.4.2"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/kbnm" "go/keybase" ]; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "1a1h2c8jr4r20w4gyvyrpsslmh69bl8syl3jbr0fcr2kka7vqnzg"; + sha256 = "08lw5aw962f75xi42bwbgba94hiql2n2jnsxrkx84czi0ijs1wlr"; }; patches = [ @@ -35,7 +35,7 @@ buildGoPackage rec { homepage = "https://www.keybase.io/"; description = "The Keybase official command-line utility and service."; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ carlsverre np rvolosatovs filalex77 ]; + maintainers = with maintainers; [ avaq carlsverre np rvolosatovs filalex77 ]; license = licenses.bsd3; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/keybase/gui.nix b/third_party/nixpkgs/pkgs/tools/security/keybase/gui.nix index 9c34d78aee..0549078439 100644 --- a/third_party/nixpkgs/pkgs/tools/security/keybase/gui.nix +++ b/third_party/nixpkgs/pkgs/tools/security/keybase/gui.nix @@ -4,16 +4,16 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20200320154633.3e235215b3"; + versionSuffix = "20200424214931.7b0bbf1e3c"; in stdenv.mkDerivation rec { pname = "keybase-gui"; - version = "5.3.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "5.4.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "00k1xg27arbqpa836c55fhkxjvjbhjgkf6jqzprjzz76zksfdcx4"; + sha256 = "06iksmrr959mlzxc3nwd70apmvhij1xarxvvflys5qa31vravizs"; }; nativeBuildInputs = [ @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { homepage = "https://www.keybase.io/"; description = "The Keybase official GUI"; platforms = platforms.linux; - maintainers = with maintainers; [ rvolosatovs puffnfresh np filalex77 ]; + maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np filalex77 ]; license = licenses.bsd3; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/keybase/kbfs.nix b/third_party/nixpkgs/pkgs/tools/security/keybase/kbfs.nix index 20fadee6a4..e9284e7230 100644 --- a/third_party/nixpkgs/pkgs/tools/security/keybase/kbfs.nix +++ b/third_party/nixpkgs/pkgs/tools/security/keybase/kbfs.nix @@ -16,7 +16,7 @@ buildGoPackage { homepage = "https://keybase.io/docs/kbfs"; description = "The Keybase filesystem"; platforms = platforms.unix; - maintainers = with maintainers; [ rvolosatovs bennofs np ]; + maintainers = with maintainers; [ avaq rvolosatovs bennofs np ]; license = licenses.bsd3; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/libacr38u/default.nix b/third_party/nixpkgs/pkgs/tools/security/libacr38u/default.nix index 45d0279099..b56c15af3d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/libacr38u/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/libacr38u/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pcsclite , libusb }: +{ stdenv, fetchurl, pkgconfig, pcsclite , libusb-compat-0_1 }: stdenv.mkDerivation { version = "1.7.11"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { doCheck = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pcsclite libusb ]; + buildInputs = [ pcsclite libusb-compat-0_1 ]; preBuild = '' makeFlagsArray=(usbdropdir="$out/pcsc/drivers"); diff --git a/third_party/nixpkgs/pkgs/tools/security/p0f/default.nix b/third_party/nixpkgs/pkgs/tools/security/p0f/default.nix index 1e618cdce1..02d888b725 100644 --- a/third_party/nixpkgs/pkgs/tools/security/p0f/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/p0f/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Passive network reconnaissance and fingerprinting tool"; - homepage = "http://lcamtuf.coredump.cx/p0f3/"; + homepage = "https://lcamtuf.coredump.cx/p0f3/"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/0001-Make-it-possible-to-run-the-tests-offline.patch b/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/0001-Make-it-possible-to-run-the-tests-offline.patch deleted file mode 100644 index 36faf3140c..0000000000 --- a/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/0001-Make-it-possible-to-run-the-tests-offline.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 37c2b4d2940476555aeec20fe1e5e3fa0492a94e Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Sun, 15 Mar 2020 19:58:53 +0100 -Subject: [PATCH] Make it possible to run the tests offline - -Helpful when developing without network access, also makes sure that -the test actually depend on the API's data like number of breaches -(which will change in time). ---- - tests/commons.py | 25 +++++++++++++++++++++++++ - tests/test_audit.py | 8 +++++--- - tests/test_pass_audit.py | 10 +++++++++- - tests/test_pwned.py | 8 +++++--- - 4 files changed, 44 insertions(+), 7 deletions(-) - -diff --git a/tests/commons.py b/tests/commons.py -index 13c4cb1..4f1ecd8 100644 ---- a/tests/commons.py -+++ b/tests/commons.py -@@ -56,3 +56,28 @@ class TestPass(TestBase): - for path in self.store.list(root): - data[path] = self.store.show(path) - return data -+ -+ -+def mock_request(*args, **kwargs): -+ class MockResponse: -+ def __init__(self): -+ data = [ -+ "D5EE0CB1A41071812CCED2F1930E6E1A5D2:2", -+ "2DC183F740EE76F27B78EB39C8AD972A757:52579", -+ "CF164D7A51A1FD864B1BF9E1CE8A3EC171B:4", -+ "D0B910E7A3028703C0B30039795E908CEB2:7", -+ "AD6438836DBE526AA231ABDE2D0EEF74D42:3", -+ "EBAB0A7CE978E0194608B572E4F9404AA21:3", -+ "17727EAB0E800E62A776C76381DEFBC4145:120", -+ "5370372AC65308F03F6ED75EC6068C8E1BE:1386", -+ "1E4C9B93F3F0682250B6CF8331B7EE68FD8:3730471", -+ "437FAA5A7FCE15D1DDCB9EAEAEA377667B8:123422", -+ "944C22589AC652B0F47918D58CA0CDCCB63:411" -+ ] -+ -+ self.text = "\r\n".join(data) -+ -+ def raise_for_status(self): -+ pass -+ -+ return MockResponse() -diff --git a/tests/test_audit.py b/tests/test_audit.py -index d8c7a9a..5e0a9cf 100644 ---- a/tests/test_audit.py -+++ b/tests/test_audit.py -@@ -17,12 +17,13 @@ - # - - from .. import pass_audit --from tests.commons import TestPass -- -+from tests.commons import TestPass, mock_request -+from unittest import mock - - class TestPassAudit(TestPass): - passwords_nb = 7 - -+ @mock.patch('requests.get', mock_request) - def test_password_notpwned(self): - """Testing: pass audit for password not breached with K-anonymity method.""" - data = self._getdata("Password/notpwned") -@@ -30,9 +31,10 @@ class TestPassAudit(TestPass): - breached = audit.password() - self.assertTrue(len(breached) == 0) - -+ @mock.patch('requests.get', mock_request) - def test_password_pwned(self): - """Testing: pass audit for password breached with K-anonymity method.""" -- ref_counts = [51259, 3, 114, 1352, 3645804, 78773, 396] -+ ref_counts = [52579, 3, 120, 1386, 3730471, 123422, 411] - data = self._getdata("Password/pwned") - audit = pass_audit.PassAudit(data) - breached = audit.password() -diff --git a/tests/test_pass_audit.py b/tests/test_pass_audit.py -index 4c10f87..2c949f7 100644 ---- a/tests/test_pass_audit.py -+++ b/tests/test_pass_audit.py -@@ -19,7 +19,8 @@ - import os - - from .. import pass_audit --from tests.commons import TestPass -+from tests.commons import TestPass, mock_request -+from unittest import mock - - - class TestPassAuditCMD(TestPass): -@@ -47,6 +48,7 @@ class TestPassAuditCMD(TestPass): - cmd = ['--not-an-option', '-q'] - self._passaudit(cmd, 2) - -+ @mock.patch('requests.get', mock_request) - def test_pass_audit_StoreNotInitialized(self): - """Testing: store not initialized.""" - cmd = ['Password/', '-v'] -@@ -56,6 +58,7 @@ class TestPassAuditCMD(TestPass): - os.rename(os.path.join(self.store.prefix, 'backup.gpg-id'), - os.path.join(self.store.prefix, '.gpg-id')) - -+ @mock.patch('requests.get', mock_request) - def test_pass_audit_InvalidID(self): - """Testing: invalid user ID.""" - os.rename(os.path.join(self.store.prefix, '.gpg-id'), -@@ -66,26 +69,31 @@ class TestPassAuditCMD(TestPass): - os.rename(os.path.join(self.store.prefix, 'backup.gpg-id'), - os.path.join(self.store.prefix, '.gpg-id')) - -+ @mock.patch('requests.get', mock_request) - def test_pass_audit_NotAFile(self): - """Testing: pass audit not_a_file.""" - cmd = ['not_a_file'] - self._passaudit(cmd, 1) - -+ @mock.patch('requests.get', mock_request) - def test_pass_audit_passwords_notpwned(self): - """Testing: pass audit Password/notpwned.""" - cmd = ['Password/notpwned'] - self._passaudit(cmd) - -+ @mock.patch('requests.get', mock_request) - def test_pass_audit_passwords_pwned(self): - """Testing: pass audit Password/pwned.""" - cmd = ['Password/pwned'] - self._passaudit(cmd) - -+ @mock.patch('requests.get', mock_request) - def test_pass_audit_passwords_good(self): - """Testing: pass audit Password/good.""" - cmd = ['Password/good'] - self._passaudit(cmd) - -+ @mock.patch('requests.get', mock_request) - def test_pass_audit_passwords_all(self): - """Testing: pass audit .""" - cmd = [''] -diff --git a/tests/test_pwned.py b/tests/test_pwned.py -index 5ce6bc6..c28939a 100644 ---- a/tests/test_pwned.py -+++ b/tests/test_pwned.py -@@ -17,7 +17,8 @@ - # - - from .. import pass_audit --from tests.commons import TestPass -+from tests.commons import TestPass, mock_request -+from unittest import mock - - - class TestPwnedAPI(TestPass): -@@ -25,12 +26,13 @@ class TestPwnedAPI(TestPass): - def setUp(self): - self.api = pass_audit.PwnedAPI() - -+ @mock.patch('requests.get', mock_request) - def test_password_range(self): - """Testing: https://api.haveibeenpwned.com/range API.""" - prefix = '21BD1' - Hash = '21BD12DC183F740EE76F27B78EB39C8AD972A757' - hashes, counts = self.api.password_range(prefix) - self.assertIn(Hash, hashes) -- self.assertTrue(counts[hashes.index(Hash)] == 51259) -+ self.assertTrue(counts[hashes.index(Hash)] == 52579) - self.assertTrue(len(hashes) == len(counts)) -- self.assertTrue(len(hashes) == 527) -+ self.assertTrue(len(hashes) == 11) --- -2.25.0 - diff --git a/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix b/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix index 5f8e0f7b1c..144d13238f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix @@ -5,23 +5,24 @@ let in stdenv.mkDerivation rec { pname = "pass-audit"; - version = "1.0.1"; + version = "1.1"; src = fetchFromGitHub { owner = "roddhjav"; repo = "pass-audit"; rev = "v${version}"; - sha256 = "1mdckw0dwcnv8smp1za96y0zmdnykbkw2606v7mzfnzbz4zjdlwl"; + sha256 = "1vapymgpab91kh798mirgs1nb7j9qln0gm2d3321cmsghhb7xs45"; }; patches = [ - ./0001-Make-it-possible-to-run-the-tests-offline.patch ./0002-Fix-audit.bash-setup.patch ]; postPatch = '' substituteInPlace audit.bash \ - --replace '/usr/bin/env python3' "${pythonEnv}/bin/python3" + --replace 'python3' "${pythonEnv}/bin/python3" + substituteInPlace Makefile \ + --replace "install --root" "install --prefix ''' --root" ''; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/default.nix b/third_party/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/default.nix index b400d628fd..62f4c3e855 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, libusb }: +{ stdenv, fetchurl, unzip, libusb-compat-0_1 }: let arch = if stdenv.hostPlatform.system == "i686-linux" then "32" @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { cp -r proprietary/*.bundle $out/pcsc/drivers ''; - libPath = stdenv.lib.makeLibraryPath [ libusb ]; + libPath = stdenv.lib.makeLibraryPath [ libusb-compat-0_1 ]; fixupPhase = '' patchelf --set-rpath $libPath \ diff --git a/third_party/nixpkgs/pkgs/tools/security/prey/default.nix b/third_party/nixpkgs/pkgs/tools/security/prey/default.nix deleted file mode 100644 index c667560123..0000000000 --- a/third_party/nixpkgs/pkgs/tools/security/prey/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchurl, fetchgit, curl, scrot, imagemagick, xawtv, inetutils, makeWrapper, coreutils -, apiKey ? "" -, deviceKey ? "" }: - -# TODO: this should assert keys are set, somehow if set through .override assertion fails -#assert apiKey != ""; -#assert deviceKey != ""; - -let - modulesSrc = fetchgit { - url = "git://github.com/prey/prey-bash-client-modules.git"; - rev = "aba260ef110834cb2e92923a31f50c15970639ee"; - sha256 = "9cb1ad813d052a0a3e3bbdd329a8711ae3272e340379489511f7dd578d911e30"; - }; -in stdenv.mkDerivation rec { - pname = "prey-bash-client"; - version = "0.6.0"; - - src = fetchurl { - url = "https://github.com/prey/prey-bash-client/archive/v${version}.tar.gz"; - sha256 = "09cb15jh4jdwvix9nx048ajkw2r5jaflk68y3rkha541n8n0qwh0"; - }; - - buildInputs = [ curl scrot imagemagick xawtv makeWrapper ]; - - phases = "unpackPhase installPhase"; - - installPhase = '' - substituteInPlace config --replace api_key=\'\' "api_key='${apiKey}'" - substituteInPlace config --replace device_key=\'\' "device_key='${deviceKey}'" - - substituteInPlace prey.sh --replace /bin/bash $(type -Pp bash) - mkdir -p $out/modules - cp -R . $out - cp -R ${modulesSrc}/* $out/modules/ - wrapProgram "$out/prey.sh" \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ xawtv imagemagick curl scrot inetutils coreutils ]}" \ - --set CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt" - ''; - - meta = with stdenv.lib; { - homepage = "https://preyproject.com"; - description = "Proven tracking software that helps you find, lock and recover your devices when stolen or missing"; - maintainers = with maintainers; [ domenkozar ]; - license = licenses.gpl3; - platforms = with platforms; linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix index 54be477cfe..0520db1ff8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix @@ -1,28 +1,30 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: +{ stdenv, fetchFromGitHub, buildGoPackage, installShellFiles }: buildGoPackage rec { pname = "vault"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "13ycg9shara4ycbi79wj28z6nimnsqgisbf35ca3q9w066ac0ja2"; + sha256 = "0fbbvihvlzh95rrk65bwxfcam6y57q0yffq8dzvcbm3i0ap7ndar"; }; goPackagePath = "github.com/hashicorp/vault"; subPackages = [ "." ]; + nativeBuildInputs = [ installShellFiles ]; + buildFlagsArray = [ "-tags='vault'" "-ldflags=\"-X github.com/hashicorp/vault/sdk/version.GitCommit='v${version}'\"" ]; postInstall = '' - mkdir -p $bin/share/bash-completion/completions - echo "complete -C $bin/bin/vault vault" > $bin/share/bash-completion/completions/vault + echo "complete -C $bin/bin/vault vault" > vault.bash + installShellCompletion vault.bash ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix b/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix index 50146f0aad..78e92e01c6 100644 --- a/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bfs"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "0qrxd1vdz2crk7jf7cdda5bhm1f841hjvin7fn497wymwr5qyjah"; + sha256 = "1jkz99i10y6dwc4dyh2vp3p549jscgwjdp6x17mcw561bnam2287"; }; buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/collectd/default.nix b/third_party/nixpkgs/pkgs/tools/system/collectd/default.nix index 9118fc55ea..f625a441ba 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.10.0"; + version = "5.11.0"; pname = "collectd"; src = fetchurl { url = "https://collectd.org/files/${pname}-${version}.tar.bz2"; - sha256 = "0nrpq09q6vbbv0hjc1vfa36z8j5802500hy75m678gh2cgsmjcx0"; + sha256 = "1cjxksxdqcqdccz1nbnc2fp6yy84qq361ynaq5q8bailds00mc9p"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/colorls/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/system/colorls/Gemfile.lock index ebbcd0fdb0..1b84a550e4 100644 --- a/third_party/nixpkgs/pkgs/tools/system/colorls/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/system/colorls/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: clocale (0.0.4) - colorls (1.2.0) + colorls (1.3.3) clocale (~> 0) filesize (~> 0) manpages (~> 0) diff --git a/third_party/nixpkgs/pkgs/tools/system/colorls/default.nix b/third_party/nixpkgs/pkgs/tools/system/colorls/default.nix index 4401d841ff..8243590cd7 100644 --- a/third_party/nixpkgs/pkgs/tools/system/colorls/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/colorls/default.nix @@ -12,7 +12,7 @@ bundlerApp { description = "Prettified LS"; homepage = "https://github.com/athityakumar/colorls"; license = with licenses; mit; - maintainers = with maintainers; [ lukebfox nicknovitski ]; + maintainers = with maintainers; [ lukebfox nicknovitski cbley ]; platforms = ruby.meta.platforms; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/colorls/gemset.nix b/third_party/nixpkgs/pkgs/tools/system/colorls/gemset.nix index e7264a895a..c16f87f457 100644 --- a/third_party/nixpkgs/pkgs/tools/system/colorls/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/system/colorls/gemset.nix @@ -15,10 +15,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bcrig88ipzj43lnkrb5qmimdrml4lx15rcrhr6m2hxb0pks8932"; + sha256 = "07rvm3g65slnqzal718qwfmgsjnkysx00jn8dnv96317yx0mxfx6"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.3"; }; filesize = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix b/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix index 560985a94f..51a443b9bd 100644 --- a/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool -, pkgconfig, dbus, dbus-glib, libxml2 }: +, pkgconfig, dbus, dbus-glib, libxml2, autoconf-archive }: stdenv.mkDerivation rec { pname = "thermald"; - version = "1.9.1"; + version = "2.1"; src = fetchFromGitHub { - owner = "01org"; + owner = "intel"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "0iagc3jqpnh6q2fa1gx4wx6r8qg0556j60xr159zqg95djr4dv99"; + sha256 = "1k8svy03k57ld6p5d29i0ccrd1gics6kbyx1bkfmw9fh1bbljyf7"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool dbus dbus-glib libxml2 ]; + buildInputs = [ autoconf automake libtool dbus dbus-glib libxml2 autoconf-archive ]; patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am''; diff --git a/third_party/nixpkgs/pkgs/tools/text/gjo/default.nix b/third_party/nixpkgs/pkgs/tools/text/gjo/default.nix index fd9a150fee..fd06129acf 100644 --- a/third_party/nixpkgs/pkgs/tools/text/gjo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/gjo/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gjo"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "skanehira"; repo = "gjo"; rev = version; - sha256 = "1m5nkv42ri150fgj590nrl24wp90p7ygg9xdh9zblibmnqrvbz4z"; + sha256 = "07halr0jzds4rya6hlvp45bjf7vg4yf49w5q60mch05hk8qkjjdw"; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix index c794b4ba33..9eba451c54 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix @@ -30,9 +30,9 @@ rustPlatform.buildRustPackage rec { ++ (stdenv.lib.optional stdenv.isDarwin Security); preFixup = '' - (cd target/release/build/ripgrep-*/out - installManPage rg.1 - installShellCompletion rg.{bash,fish}) + installManPage $releaseDir/build/ripgrep-*/out/rg.1 + + installShellCompletion $releaseDir/build/ripgrep-*/out/rg.{bash,fish} installShellCompletion --zsh "$src/complete/_rg" ''; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix index 31ea1cb2a9..2c2444de4e 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchFromGitHub , curl , json_c @@ -8,22 +9,20 @@ stdenv.mkDerivation rec { pname = "google-compute-engine-oslogin"; - version = "1.5.3"; - # from packages/google-compute-engine-oslogin/packaging/debian/changelog + version = "20200325.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; - repo = "compute-image-packages"; - rev = "20190522"; - sha256 = "16jbbrnz49g843h813r408dbvfa2hicf8canxwbfxr2kzhv7ycmm"; + repo = "guest-oslogin"; + rev = version; + sha256 = "03hk95pgzcgy6ginp8zdy0fbk88m6n65qq22jq490z1xwbjffm8r"; }; - sourceRoot = "source/packages/google-compute-engine-oslogin"; postPatch = '' # change sudoers dir from /var/google-sudoers.d to /run/google-sudoers.d (managed through systemd-tmpfiles) - substituteInPlace pam_module/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d + substituteInPlace src/pam/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d # fix "User foo not allowed because shell /bin/bash does not exist" - substituteInPlace compat.h --replace /bin/bash ${bashInteractive}/bin/bash + substituteInPlace src/include/compat.h --replace /bin/bash ${bashInteractive}/bin/bash ''; buildInputs = [ curl.dev pam ]; @@ -31,15 +30,15 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="-I${json_c.dev}/include/json-c"; NIX_CFLAGS_LINK="-L${json_c}/lib"; - installPhase = '' - mkdir -p $out/{bin,lib} - - install -Dm755 libnss_cache_google-compute-engine-oslogin-${version}.so $out/lib/libnss_cache_oslogin.so.2 - install -Dm755 libnss_google-compute-engine-oslogin-${version}.so $out/lib/libnss_oslogin.so.2 - - install -Dm755 pam_oslogin_admin.so pam_oslogin_login.so $out/lib - install -Dm755 google_{oslogin_nss_cache,authorized_keys} $out/bin - ''; + makeFlags = [ + "VERSION=${version}" + "DESTDIR=${placeholder "out"}" + "PREFIX=/" + "BINDIR=/bin" + "LIBDIR=/lib" + "PAMDIR=/lib" + "MANDIR=/share/man" + ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/Gemfile b/third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/Gemfile new file mode 100644 index 0000000000..87c9aeebb9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/Gemfile @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +gem "vpsfree-client" diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock new file mode 100644 index 0000000000..9b8fd4b918 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock @@ -0,0 +1,75 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (6.0.2.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + concurrent-ruby (1.1.6) + cookiejar (0.3.3) + curses (1.3.2) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + em-http-request (1.1.5) + addressable (>= 2.3.4) + cookiejar (!= 0.3.1) + em-socksify (>= 0.3) + eventmachine (>= 1.0.3) + http_parser.rb (>= 0.6.0) + em-socksify (0.3.2) + eventmachine (>= 1.0.0.beta.4) + eventmachine (1.0.9.1) + haveapi-client (0.13.2) + activesupport (>= 4.0) + highline (~> 1.7.8) + json + require_all (~> 2.0.0) + rest-client (~> 2.0.2) + ruby-progressbar (~> 1.7.5) + highline (1.7.10) + http-cookie (1.0.3) + domain_name (~> 0.5) + http_parser.rb (0.6.0) + i18n (1.8.2) + concurrent-ruby (~> 1.0) + json (2.3.0) + mime-types (3.3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2020.0425) + minitest (5.14.0) + netrc (0.11.0) + public_suffix (4.0.4) + require_all (2.0.0) + rest-client (2.0.2) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + ruby-progressbar (1.7.5) + thread_safe (0.3.6) + tzinfo (1.2.7) + thread_safe (~> 0.1) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.7) + vpsadmin-client (3.0.0.master.20190517.pre.0.3ab5ddfe) + curses + em-http-request (~> 1.1.3) + eventmachine (~> 1.0.3) + haveapi-client (~> 0.13.0) + json + vpsfree-client (0.11.0) + vpsadmin-client (= 3.0.0.master.20190517.pre.0.3ab5ddfe) + zeitwerk (2.3.0) + +PLATFORMS + ruby + +DEPENDENCIES + vpsfree-client + +BUNDLED WITH + 2.1.4 diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/default.nix new file mode 100644 index 0000000000..17d5704148 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerApp, bundlerUpdateScript }: + +bundlerApp { + pname = "vpsfree-client"; + gemdir = ./.; + exes = [ "vpsfreectl" ]; + + passthru.updateScript = bundlerUpdateScript "vpsfree-client"; + + meta = with lib; { + description = "Ruby API and CLI for the vpsFree.cz API"; + homepage = "https://github.com/vpsfreecz/vpsfree-client"; + maintainers = with maintainers; [ zimbatm ]; + license = licenses.gpl3; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/gemset.nix b/third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/gemset.nix new file mode 100644 index 0000000000..366c5836bd --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/gemset.nix @@ -0,0 +1,316 @@ +{ + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1md98dkbirc8mq5nbz1vqq3hwqjiv7b54q7180w8wyxgd4k1awwb"; + type = "gem"; + }; + version = "6.0.2.2"; + }; + addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + type = "gem"; + }; + version = "2.7.0"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; + type = "gem"; + }; + version = "1.1.6"; + }; + cookiejar = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q0kmbks9l3hl0wdq744hzy97ssq9dvlzywyqv9k9y1p3qc9va2a"; + type = "gem"; + }; + version = "0.3.3"; + }; + curses = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hic9kq09dhh8jqjx3k1991rnqhlj3glz82w0g7ndcri52m1hgqg"; + type = "gem"; + }; + version = "1.3.2"; + }; + domain_name = { + dependencies = ["unf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + type = "gem"; + }; + version = "0.5.20190701"; + }; + em-http-request = { + dependencies = ["addressable" "cookiejar" "em-socksify" "eventmachine" "http_parser.rb"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13rxmbi0fv91n4sg300v3i9iiwd0jxv0i6xd0sp81dx3jlx7kasx"; + type = "gem"; + }; + version = "1.1.5"; + }; + em-socksify = { + dependencies = ["eventmachine"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rk43ywaanfrd8180d98287xv2pxyl7llj291cwy87g1s735d5nk"; + type = "gem"; + }; + version = "0.3.2"; + }; + eventmachine = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17jr1caa3ggg696dd02g2zqzdjqj9x9q2nl7va82l36f7c5v6k4z"; + type = "gem"; + }; + version = "1.0.9.1"; + }; + haveapi-client = { + dependencies = ["activesupport" "highline" "json" "require_all" "rest-client" "ruby-progressbar"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wn5zvyy3w3q74m2fsb4jwxfdbdnpyyzxdf9iklpggcdmjhb78z0"; + type = "gem"; + }; + version = "0.13.2"; + }; + highline = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y"; + type = "gem"; + }; + version = "1.7.10"; + }; + http-cookie = { + dependencies = ["domain_name"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + type = "gem"; + }; + version = "1.0.3"; + }; + "http_parser.rb" = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + type = "gem"; + }; + version = "0.6.0"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm"; + type = "gem"; + }; + version = "1.8.2"; + }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; + type = "gem"; + }; + version = "2.3.0"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; + type = "gem"; + }; + version = "3.3.1"; + }; + mime-types-data = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zin0q26wc5p7zb7glpwary7ms60s676vcq987yv22jgm6hnlwlh"; + type = "gem"; + }; + version = "3.2020.0425"; + }; + minitest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; + type = "gem"; + }; + version = "5.14.0"; + }; + netrc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; + type = "gem"; + }; + version = "0.11.0"; + }; + public_suffix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l1kqw75asziwmzrig8rywxswxz8l91sc3pvns02ffsqac1a3wiz"; + type = "gem"; + }; + version = "4.0.4"; + }; + require_all = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sjf2vigdg4wq7z0xlw14zyhcz4992s05wgr2s58kjgin12bkmv8"; + type = "gem"; + }; + version = "2.0.0"; + }; + rest-client = { + dependencies = ["http-cookie" "mime-types" "netrc"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j"; + type = "gem"; + }; + version = "2.0.2"; + }; + ruby-progressbar = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hynaavnqzld17qdx9r7hfw00y16ybldwq730zrqfszjwgi59ivi"; + type = "gem"; + }; + version = "1.7.5"; + }; + thread_safe = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + type = "gem"; + }; + version = "1.2.7"; + }; + unf = { + dependencies = ["unf_ext"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; + type = "gem"; + }; + version = "0.1.4"; + }; + unf_ext = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; + type = "gem"; + }; + version = "0.0.7.7"; + }; + vpsadmin-client = { + dependencies = ["curses" "em-http-request" "eventmachine" "haveapi-client" "json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ki3204pkg3f9wk9plbq5n9lrnsmc364smfxyrbq32gi8ag2y2s8"; + type = "gem"; + }; + version = "3.0.0.master.20190517.pre.0.3ab5ddfe"; + }; + vpsfree-client = { + dependencies = ["vpsadmin-client"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cs2ibl9kl39hnpzyhyczaqv4i58pn106vx2m6lds9p3av5mcbxs"; + type = "gem"; + }; + version = "0.11.0"; + }; + zeitwerk = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1akpm3pwvyiack2zk6giv9yn3cqb8pw6g40p4394pdc3xmy3s4k0"; + type = "gem"; + }; + version = "2.3.0"; + }; +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index a115a70d44..66a2e36fa1 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -60,6 +60,8 @@ mapAliases ({ bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 + buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26 + buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 bundler_HEAD = bundler; # added 2015-11-15 cantarell_fonts = cantarell-fonts; # added 2018-03-03 catfish = xfce.catfish; # added 2019-12-22 @@ -166,6 +168,7 @@ mapAliases ({ gnuradio-rds = gr-rds; # added 2019-05-27 gnuradio-osmosdr = gr-osmosdr; # added 2019-05-27 gnustep-make = gnustep.make; # added 2016-7-6 + go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26 go-pup = pup; # added 2017-12-19 gobjectIntrospection = gobject-introspection; # added 2018-12-02 goimports = gotools; # added 2018-09-16 @@ -212,6 +215,7 @@ mapAliases ({ keepassx-reboot = keepassx-community; # added 2017-02-01 keepassx2-http = keepassx-reboot; # added 2016-10-17 keybase-go = keybase; # added 2016-08-24 + kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # 2020-04-28 kicad-with-packages3d = kicad; # added 2019-11-25 krename-qt5 = krename; # added 2017-02-18 keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10 @@ -249,7 +253,9 @@ mapAliases ({ libtxc_dxtn = throw "removed 2020-03-16, now integrated in Mesa"; libtxc_dxtn_s2tc = throw "removed 2020-03-16, now integrated in Mesa"; libudev = udev; # added 2018-04-25 + libusb = libusb1; # added 2020-04-28 libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10 + libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09 links = links2; # added 2016-01-31 linux_rpi0 = linux_rpi1; linuxPackages_rpi0 = linuxPackages_rpi1; @@ -333,48 +339,50 @@ mapAliases ({ pg_tmp = ephemeralpg; # added 2018-01-16 php-embed = throw '' - php*-embed has been dropped, you can build the same package by using - something similar with this following snippet: - (php74.override { config.php.embed = true; config.php.apxs2 = false; }) + php*-embed has been dropped, you can build something similar + with the following snippet: + php74.override { embedSupport = true; apxs2Support = false; } ''; # added 2020-04-01 php72-embed = php-embed; # added 2020-04-01 php73-embed = php-embed; # added 2020-04-01 php74-embed = php-embed; # added 2020-04-01 phpPackages-embed = throw '' - php*Packages-embed has been dropped, you can build the same package by using - something similar with this following snippet: - (php74.override { config.php.embed = true; config.php.apxs2 = false; }).packages + php*Packages-embed has been dropped, you can build something + similar with the following snippet: + (php74.override { embedSupport = true; apxs2Support = false; }).packages ''; # added 2020-04-01 php74Packages-embed = phpPackages-embed; php73Packages-embed = phpPackages-embed; php72Packages-embed = phpPackages-embed; php-unit = throw '' - php*-unit has been dropped, you can build the same package by using - something similar with this following snippet: - (php74.override { - config.php.embed = true; - config.php.apxs2 = false; - config.php.systemd = false; - config.php.phpdbg = false; - config.php.cgi = false; - config.php.fpm = false; }) + php*-unit has been dropped, you can build something similar with + the following snippet: + php74.override { + embedSupport = true; + apxs2Support = false; + systemdSupport = false; + phpdbgSupport = false; + cgiSupport = false; + fpmSupport = false; + } ''; # added 2020-04-01 php72-unit = php-unit; # added 2020-04-01 php73-unit = php-unit; # added 2020-04-01 php74-unit = php-unit; # added 2020-04-01 phpPackages-unit = throw '' - php*Packages-unit has been dropped, you can build the same package by using - something similar with this following snippet: + php*Packages-unit has been dropped, you can build something + similar with this following snippet: (php74.override { - config.php.embed = true; - config.php.apxs2 = false; - config.php.systemd = false; - config.php.phpdbg = false; - config.php.cgi = false; - config.php.fpm = false; }).packages + embedSupport = true; + apxs2Support = false; + systemdSupport = false; + phpdbgSupport = false; + cgiSupport = false; + fpmSupport = false; + }).packages ''; # added 2020-04-01 php74Packages-unit = phpPackages-unit; php73Packages-unit = phpPackages-unit; @@ -432,6 +440,7 @@ mapAliases ({ quake3game = ioquake3; # added 2016-01-14 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 rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21 rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 @@ -523,6 +532,7 @@ mapAliases ({ spice_gtk = spice-gtk; # added 2018-02-25 spice_protocol = spice-protocol; # added 2018-02-25 spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_60 instead."; # added 2019-10-16 + spring-boot = spring-boot-cli; # added 2020-04-24 sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22 sqliteInteractive = sqlite-interactive; # added 2014-12-06 squid4 = squid; # added 2019-08-22 @@ -568,6 +578,7 @@ mapAliases ({ transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; truecrypt = veracrypt; # added 2018-10-24 tshark = wireshark-cli; # added 2018-04-25 + uberwriter = apostrophe; # added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 ucsFonts = ucs-fonts; # added 2016-07-15 ultrastardx-beta = ultrastardx; # added 2017-08-12 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index bbcdaf3a5a..d1adb4e0eb 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -292,11 +292,7 @@ in packer = callPackage ../development/tools/packer { }; - packr = callPackage ../development/libraries/packr { - # Version 2.6.0 fails to build with go 1.13 due to nested modules: - # go: directory v2/packr2 is outside main module - buildGoModule = buildGo112Module; - }; + packr = callPackage ../development/libraries/packr { }; pet = callPackage ../development/tools/pet { }; @@ -450,7 +446,7 @@ in singularity-tools = callPackage ../build-support/singularity-tools { }; - srcOnly = args: callPackage ../build-support/src-only args; + srcOnly = callPackage ../build-support/src-only { }; substituteAll = callPackage ../build-support/substitute/substitute-all.nix { }; @@ -877,6 +873,8 @@ in ctrtool = callPackage ../tools/archivers/ctrtool { }; + crowbar = callPackage ../tools/security/crowbar { }; + crumbs = callPackage ../applications/misc/crumbs { }; crc32c = callPackage ../development/libraries/crc32c { }; @@ -1176,6 +1174,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + bat-extras = recurseIntoAttrs (callPackages ../tools/misc/bat-extras { }); + bc = callPackage ../tools/misc/bc { }; bdf2psf = callPackage ../tools/misc/bdf2psf { }; @@ -1240,14 +1240,9 @@ in charles4 ; - inherit (libsForQt5.callPackage ../development/libraries/libqmatrixclient { }) - libqmatrixclient_0_4 - libqmatrixclient_0_5 - libqmatrixclient; + libquotient = libsForQt5.callPackage ../development/libraries/libquotient {}; - inherit (libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }) - quaternion - quaternion-git; + quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }; tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; @@ -1502,11 +1497,7 @@ in compactor = callPackage ../applications/networking/compactor { }; - consul = callPackage ../servers/consul { - # Version 1.6.0 fails to build with go 1.13 due to broken dependency: - # go/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http_status.pb.go:11:2: code in directory /build/go/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/protoc-gen-validate/validate expects import "github.com/lyft/protoc-gen-validate/validate" - buildGoPackage = buildGo112Package; - }; + consul = callPackage ../servers/consul { }; consul-alerts = callPackage ../servers/monitoring/consul-alerts { }; @@ -2089,6 +2080,8 @@ in xkbd = callPackage ../applications/misc/xkbd { }; + libpsm2 = callPackage ../os-specific/linux/libpsm2 { }; + optar = callPackage ../tools/graphics/optar {}; obinskit = callPackage ../applications/misc/obinskit {}; @@ -2775,11 +2768,7 @@ in curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { }; - curlie = callPackage ../tools/networking/curlie { - # Version 1.2.0 fails to build with go 1.13 due to: - # verifying golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: Get https://sum.golang.org/lookup/golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:49088->[::1]:53: read: connection refused - buildGoModule = buildGo112Module; - }; + curlie = callPackage ../tools/networking/curlie { }; cunit = callPackage ../tools/misc/cunit { }; bcunit = callPackage ../tools/misc/bcunit { }; @@ -2940,9 +2929,7 @@ in dmd = callPackage ../development/compilers/dmd { }; - dmg2img = callPackage ../tools/misc/dmg2img { - openssl = openssl_1_0_2; - }; + dmg2img = callPackage ../tools/misc/dmg2img { }; docbook2odf = callPackage ../tools/typesetting/docbook2odf { }; @@ -3077,6 +3064,8 @@ in kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { }; + magic-vlsi = callPackage ../applications/science/electronics/magic-vlsi { }; + mcrcon = callPackage ../tools/networking/mcrcon {}; rage = callPackage ../tools/security/rage { @@ -3131,6 +3120,8 @@ in wob = callPackage ../tools/misc/wob { }; + xkcdpass = with pythonPackages; toPythonApplication xkcdpass; + xob = callPackage ../tools/X11/xob { }; z-lua = callPackage ../tools/misc/z-lua { }; @@ -3903,9 +3894,7 @@ in grpcurl = callPackage ../tools/networking/grpcurl { }; - grpcui = callPackage ../tools/networking/grpcui { - buildGoModule = buildGo112Module; - }; + grpcui = callPackage ../tools/networking/grpcui { }; grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6; @@ -4304,6 +4293,8 @@ in intel-media-sdk = callPackage ../development/libraries/intel-media-sdk { }; + intermodal = callPackage ../tools/misc/intermodal { }; + invoice2data = callPackage ../tools/text/invoice2data { }; inxi = callPackage ../tools/system/inxi { }; @@ -4328,12 +4319,7 @@ in iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; - ipfs = callPackage ../applications/networking/ipfs { - # Version 0.4.22 fails to build with go 1.13 due to version validation: - # go: github.com/go-critic/go-critic@v0.0.0-20181204210945-ee9bf5809ead: invalid pseudo-version: does not match version-control timestamp (2019-02-10T22:04:43Z) - # This is fixed in master, but release containing the fix does not exist yet. - buildGoModule = buildGo112Module; - }; + ipfs = callPackage ../applications/networking/ipfs { }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; @@ -4806,10 +4792,14 @@ in nodejs-slim-13_x = callPackage ../development/web/nodejs/v13.nix { enableNpm = false; }; + nodejs-14_x = callPackage ../development/web/nodejs/v14.nix { }; + nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix { + enableNpm = false; + }; # Update this when adding the newest nodejs major version! - nodejs_latest = nodejs-13_x; - nodejs-slim_latest = nodejs-slim-13_x; + nodejs_latest = nodejs-14_x; + nodejs-slim_latest = nodejs-slim-14_x; nodePackages_13_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v13.nix { nodejs = pkgs.nodejs-13_x; @@ -5434,7 +5424,7 @@ in noip = callPackage ../tools/networking/noip { }; - nomad = callPackage ../applications/networking/cluster/nomad { }; + nomad = callPackage ../applications/networking/cluster/nomad { }; notable = callPackage ../applications/misc/notable { }; @@ -5542,6 +5532,8 @@ in nylon = callPackage ../tools/networking/nylon { }; + nym = callPackage ../applications/networking/nym { }; + nzbget = callPackage ../tools/networking/nzbget { }; oathToolkit = callPackage ../tools/security/oath-toolkit { }; @@ -5874,9 +5866,7 @@ in briss = callPackage ../tools/graphics/briss { }; - brickd = callPackage ../servers/brickd { - libusb = libusb1; - }; + brickd = callPackage ../servers/brickd { }; bully = callPackage ../tools/networking/bully { openssl = openssl_1_0_2; @@ -5990,7 +5980,8 @@ in podiff = callPackage ../tools/text/podiff { }; - podman = callPackage ../applications/virtualization/podman { }; + podman = callPackage ../applications/virtualization/podman/wrapper.nix { }; + podman-unwrapped = callPackage ../applications/virtualization/podman { }; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; @@ -6032,8 +6023,6 @@ in prettyping = callPackage ../tools/networking/prettyping { }; - prey-bash-client = callPackage ../tools/security/prey { }; - profile-cleaner = callPackage ../tools/misc/profile-cleaner { }; profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { }; @@ -6887,6 +6876,8 @@ in tarsnapper = callPackage ../tools/backup/tarsnapper { }; + tartube = callPackage ../applications/video/tartube { }; + tayga = callPackage ../tools/networking/tayga { }; tcpcrypt = callPackage ../tools/security/tcpcrypt { }; @@ -7382,6 +7373,10 @@ in wootility = callPackage ../tools/misc/wootility { }; + wormhole = callPackage ../tools/networking/wormhole { + inherit (darwin.apple_sdk.frameworks) Security; + }; + wpscan = callPackage ../tools/security/wpscan { }; wsmancli = callPackage ../tools/system/wsmancli {}; @@ -7436,6 +7431,8 @@ in tweet-hs = haskell.lib.justStaticExecutables haskellPackages.tweet-hs; + tweeny = callPackage ../development/libraries/tweeny { }; + qfsm = callPackage ../applications/science/electronics/qfsm { }; tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix { }; @@ -8576,20 +8573,6 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - go_1_12 = callPackage ../development/compilers/go/1.12.nix ({ - inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs stdenv.isAarch64 { - stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; - }); - - go_1_13 = callPackage ../development/compilers/go/1.13.nix ({ - inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs stdenv.isAarch64 { - stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; - }); - go_1_14 = callPackage ../development/compilers/go/1.14.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs stdenv.isAarch64 { @@ -8994,6 +8977,8 @@ in inherit (ocaml-ng.ocamlPackages_4_05) ocaml; }; + open-watcom-bin = callPackage ../development/compilers/open-watcom-bin { }; + pforth = callPackage ../development/compilers/pforth {}; picat = callPackage ../development/compilers/picat { }; @@ -9069,6 +9054,9 @@ in 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-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { @@ -9492,9 +9480,9 @@ in php73Extensions = recurseIntoAttrs php73.extensions; php74Extensions = recurseIntoAttrs php74.extensions; - inherit (callPackages ../development/interpreters/php { + inherit (callPackage ../development/interpreters/php { stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }) php74 php73 php72 php74base php73base php72base; + }) php74 php73 php72; picoc = callPackage ../development/interpreters/picoc {}; @@ -9707,26 +9695,6 @@ in ### DEVELOPMENT / MISC - amdadlsdk = callPackage ../development/misc/amdadl-sdk { }; - - amdappsdk26 = amdappsdk.override { - version = "2.6"; - }; - - amdappsdk27 = amdappsdk.override { - version = "2.7"; - }; - - amdappsdk28 = amdappsdk.override { - version = "2.8"; - }; - - amdappsdk = callPackage ../development/misc/amdapp-sdk { }; - - amdappsdkFull = amdappsdk.override { - samples = true; - }; - h3 = callPackage ../development/misc/h3 { }; amtk = callPackage ../development/libraries/amtk { }; @@ -9961,9 +9929,7 @@ in bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { }; - bazel-watcher = callPackage ../development/tools/bazel-watcher { - go = go_1_12; - }; + bazel-watcher = callPackage ../development/tools/bazel-watcher { }; bazel-gazelle = callPackage ../development/tools/bazel-gazelle { }; @@ -9993,6 +9959,8 @@ in bison = callPackage ../development/tools/parsing/bison { }; yacc = bison; # TODO: move to aliases.nix + black = with python3Packages; toPythonApplication black; + blackmagic = callPackage ../development/tools/misc/blackmagic { }; bloaty = callPackage ../development/tools/bloaty { }; @@ -12146,9 +12114,7 @@ in heyefi = haskellPackages.heyefi; - hidapi = callPackage ../development/libraries/hidapi { - libusb = libusb1; - }; + hidapi = callPackage ../development/libraries/hidapi { }; highfive = callPackage ../development/libraries/highfive { }; @@ -12237,6 +12203,11 @@ in })); icu66 = callPackage ../development/libraries/icu/66.nix ({ nativeBuildRoot = buildPackages.icu66.override { buildRootOnly = true; }; + } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' + })); + icu67 = callPackage ../development/libraries/icu/67.nix ({ + nativeBuildRoot = buildPackages.icu67.override { buildRootOnly = true; }; } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); @@ -12374,10 +12345,6 @@ in kf5gpgmepp = libsForQt5.callPackage ../development/libraries/kf5gpgmepp { }; - kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { - openssl = openssl_1_0_2; - }; - krb5 = callPackage ../development/libraries/kerberos/krb5.nix { inherit (buildPackages.darwin) bootstrap_cmds; }; @@ -12816,6 +12783,8 @@ in libf2c = callPackage ../development/libraries/libf2c {}; + libfabric = callPackage ../os-specific/linux/libfabric {}; + libfive = callPackage ../development/libraries/libfive { }; libfixposix = callPackage ../development/libraries/libfixposix {}; @@ -13370,7 +13339,7 @@ in liburcu = callPackage ../development/libraries/liburcu { }; - libusb = callPackage ../development/libraries/libusb {}; + libusb-compat-0_1 = callPackage ../development/libraries/libusb-compat/0.1.nix {}; libusb1 = callPackage ../development/libraries/libusb1 { inherit (darwin) libobjc; @@ -14623,10 +14592,7 @@ in stfl = callPackage ../development/libraries/stfl { }; - stlink = callPackage ../development/tools/misc/stlink { - # The Darwin build of stlink explicitly refers to static libusb. - libusb1 = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1; - }; + stlink = callPackage ../development/tools/misc/stlink { }; steghide = callPackage ../tools/security/steghide {}; @@ -14800,9 +14766,7 @@ in ustr = callPackage ../development/libraries/ustr { }; - usbredir = callPackage ../development/libraries/usbredir { - libusb = libusb1; - }; + usbredir = callPackage ../development/libraries/usbredir { }; uthash = callPackage ../development/libraries/uthash { }; @@ -15073,9 +15037,7 @@ in yubikey-neo-manager = callPackage ../tools/misc/yubikey-neo-manager { }; - yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { - libusb = libusb1; - }; + yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { }; yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { }; @@ -15225,24 +15187,12 @@ in ### DEVELOPMENT / GO MODULES - buildGo112Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_12; - }; - buildGo113Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_13; - }; buildGo114Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_14; }; buildGoPackage = buildGo114Package; - buildGo112Module = callPackage ../development/go-modules/generic { - go = buildPackages.go_1_12; - }; - buildGo113Module = callPackage ../development/go-modules/generic { - go = buildPackages.go_1_13; - }; buildGo114Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_14; }; @@ -15561,14 +15511,14 @@ in grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; - gobetween = callPackage ../servers/gobetween { - buildGoModule = buildGo112Module; - }; + gobetween = callPackage ../servers/gobetween { }; h2o = callPackage ../servers/http/h2o { }; haka = callPackage ../tools/security/haka { }; + hashi-ui = callPackage ../servers/hashi-ui {}; + heapster = callPackage ../servers/monitoring/heapster { }; hbase = callPackage ../servers/hbase {}; @@ -15814,6 +15764,8 @@ in tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; + tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { }; + pies = callPackage ../servers/pies { }; rpcbind = callPackage ../servers/rpcbind { }; @@ -16017,11 +15969,7 @@ in prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { }; prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; - prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { - # Version 1.5.1 fails to build with go 1.13 due to test failure - # FAIL github.com/jonnenauha/prometheus_varnish_exporter 0.041s - buildGoModule = buildGo112Module; - }; + prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { inherit (darwin.apple_sdk.frameworks) Security; @@ -16165,7 +16113,7 @@ in spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; - spring-boot = callPackage ../development/tools/spring-boot { }; + spring-boot-cli = callPackage ../development/tools/spring-boot-cli { }; squid = callPackage ../servers/squid { }; @@ -16417,9 +16365,7 @@ in cpustat = callPackage ../os-specific/linux/cpustat { }; - cockroachdb = callPackage ../servers/sql/cockroachdb { - buildGoPackage = buildGo112Package; - }; + cockroachdb = callPackage ../servers/sql/cockroachdb { }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_3_compat; @@ -17273,11 +17219,7 @@ in gotests = callPackage ../development/tools/gotests { }; - gotestsum = callPackage ../development/tools/gotestsum { - # Version 0.3.5 fails to build with go 1.13: - # build ./testjson/internal/badmain: cannot find module for path ./testjson/internal/badmain - buildGoModule = buildGo112Module; - }; + gotestsum = callPackage ../development/tools/gotestsum { }; impl = callPackage ../development/tools/impl { }; @@ -18152,6 +18094,8 @@ in pop-gtk-theme = callPackage ../data/themes/pop-gtk { }; + pop-icon-theme = callPackage ../data/icons/pop-icon-theme { }; + posix_man_pages = callPackage ../data/documentation/man-pages-posix { }; powerline-fonts = callPackage ../data/fonts/powerline-fonts { }; @@ -18762,11 +18706,7 @@ in poppler = poppler_0_61; }; - perkeep = callPackage ../applications/misc/perkeep { - # Revision c9f78d02adf9740f3b8d403a1418554293cc9f41 fails to build with go 1.13 due to a dependency: - # go: bazil.org/fuse@v0.0.0-20160811212531-371fbbdaa898: Get https://proxy.golang.org/bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:36526->[::1]:53: read: connection refused - buildGoPackage = buildGo112Package; - }; + perkeep = callPackage ../applications/misc/perkeep { }; canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; @@ -19435,8 +19375,6 @@ in gopher = callPackage ../applications/networking/gopher/gopher { }; - gopherclient = libsForQt5.callPackage ../applications/networking/gopher/gopherclient { }; - goxel = callPackage ../applications/graphics/goxel { }; gpa = callPackage ../applications/misc/gpa { }; @@ -19634,6 +19572,8 @@ in gcalcli = callPackage ../applications/misc/gcalcli { }; + havoc = callPackage ../applications/misc/havoc { }; + vcal = callPackage ../applications/misc/vcal { }; gcolor2 = callPackage ../applications/graphics/gcolor2 { }; @@ -19846,7 +19786,7 @@ in gvisor-containerd-shim = callPackage ../applications/virtualization/gvisor/containerd-shim.nix { }; - guvcview = callPackage ../os-specific/linux/guvcview { }; + guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { }; gxmessage = callPackage ../applications/misc/gxmessage { }; @@ -19869,7 +19809,9 @@ in heme = callPackage ../applications/editors/heme { }; - herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; + herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { + asciidoc = asciidoc-full; + }; hercules = callPackage ../applications/virtualization/hercules { }; @@ -19897,6 +19839,8 @@ in howl = callPackage ../applications/editors/howl { }; + hpcg = callPackage ../tools/misc/hpcg/default.nix { }; + hpl = callPackage ../tools/misc/hpl { mpi = openmpi; }; hpmyroom = libsForQt5.callPackage ../applications/networking/hpmyroom { }; @@ -20341,12 +20285,12 @@ in kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; - kubernetes = callPackage ../applications/networking/cluster/kubernetes { - go = buildPackages.go_1_13; - }; + kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; + kubernix = callPackage ../applications/networking/cluster/kubernix { }; + kubectl = callPackage ../applications/networking/cluster/kubectl { }; kubeless = callPackage ../applications/networking/cluster/kubeless { }; @@ -20585,10 +20529,7 @@ in marp = callPackage ../applications/office/marp { }; - magnetico = callPackage ../applications/networking/p2p/magnetico { - # Version 2019-08-14 fails to build with go 1.13 due to missing go.sum - buildGoModule = buildGo112Module; - }; + magnetico = callPackage ../applications/networking/p2p/magnetico { }; matchbox = callPackage ../applications/window-managers/matchbox { }; @@ -20711,6 +20652,7 @@ in monotone = callPackage ../applications/version-management/monotone { lua = lua5; + botan = botan.override (x: { openssl = null; }); }; monotoneViz = callPackage ../applications/version-management/monotone-viz { @@ -20769,6 +20711,8 @@ in rofi-emoji = callPackage ../applications/misc/rofi-emoji { }; + rofi-file-browser = callPackage ../applications/misc/rofi-file-browser { }; + ympd = callPackage ../applications/audio/ympd { }; nload = callPackage ../applications/networking/nload { }; @@ -20874,9 +20818,7 @@ in open-policy-agent = callPackage ../development/tools/open-policy-agent { }; - openshift = callPackage ../applications/networking/cluster/openshift { - buildGoPackage = buildGo112Package; - }; + openshift = callPackage ../applications/networking/cluster/openshift { }; oroborus = callPackage ../applications/window-managers/oroborus {}; @@ -21118,7 +21060,7 @@ in octoprint = callPackage ../applications/misc/octoprint { }; - octoprint-plugins = callPackage ../applications/misc/octoprint/plugins.nix { }; + octoprint-plugins = throw ''octoprint-plugins are now part of the octoprint.python.pkgs package set.''; ocrad = callPackage ../applications/graphics/ocrad { }; @@ -21500,7 +21442,12 @@ in qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; - qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { }; + qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { + guvcview = guvcview.override { + useQt = true; + useGtk = false; + }; + }; qsynth = libsForQt5.callPackage ../applications/audio/qsynth { }; @@ -22106,9 +22053,7 @@ in teleprompter = callPackage ../applications/misc/teleprompter {}; - tendermint = callPackage ../tools/networking/tendermint { - buildGoModule = buildGo112Module; - }; + tendermint = callPackage ../tools/networking/tendermint { }; termdown = (newScope pythonPackages) ../applications/misc/termdown { }; @@ -23152,9 +23097,7 @@ in }; litecoind = litecoin.override { withGui = false; }; - lnd = callPackage ../applications/blockchains/lnd.nix { - buildGoModule = buildGo112Module; - }; + lnd = callPackage ../applications/blockchains/lnd.nix { }; monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; @@ -23322,9 +23265,7 @@ in crispyDoom = callPackage ../games/crispy-doom { }; - cri-o = callPackage ../applications/virtualization/cri-o { - buildGoPackage = buildGo112Package; - }; + cri-o = callPackage ../applications/virtualization/cri-o { }; ckan = callPackage ../games/ckan { }; @@ -23821,9 +23762,7 @@ in sauerbraten = callPackage ../games/sauerbraten {}; - scaleway-cli = callPackage ../tools/admin/scaleway-cli { - buildGoPackage = buildGo112Package; - }; + scaleway-cli = callPackage ../tools/admin/scaleway-cli { }; scid = callPackage ../games/scid { tcl = tcl-8_5; @@ -24192,6 +24131,7 @@ in timepp = callPackage ../desktops/gnome-3/extensions/timepp { }; topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { }; + window-is-ready-remover = callPackage ../desktops/gnome-3/extensions/window-is-ready-remover { }; workspace-matrix = callPackage ../desktops/gnome-3/extensions/workspace-matrix { }; nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks."; @@ -24682,7 +24622,9 @@ in dcmtk = callPackage ../applications/science/medicine/dcmtk { }; - ### PHYSICS + ### SCIENCE/PHYSICS + + elmerfem = callPackage ../applications/science/physics/elmerfem {}; sacrifice = callPackage ../applications/science/physics/sacrifice {}; @@ -25210,9 +25152,7 @@ in clinfo = callPackage ../tools/system/clinfo { }; - cups = callPackage ../misc/cups { - libusb = libusb1; - }; + cups = callPackage ../misc/cups { }; cups-filters = callPackage ../misc/cups/filters.nix { }; @@ -25260,13 +25200,9 @@ in # this driver ships with pre-compiled 32-bit binary libraries cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { }; - cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { - libusb = libusb1; - }; + cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { }; - cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { - libusb = libusb1; - }; + cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { }; darcnes = callPackage ../misc/emulators/darcnes { }; @@ -25445,11 +25381,12 @@ in kontemplate = callPackage ../applications/networking/cluster/kontemplate { }; + # In general we only want keep the last three minor versions around that + # correspond to the last three supported kubernetes versions: + # https://kubernetes.io/docs/setup/release/version-skew-policy/#supported-versions + # Exceptions are versions that we need to keep to allow upgrades from older NixOS releases inherit (callPackage ../applications/networking/cluster/kops {}) mkKops - kops_1_12 - kops_1_13 - kops_1_14 kops_1_15 kops_1_16 ; @@ -25787,7 +25724,9 @@ in physlock = callPackage ../misc/screensavers/physlock { }; - pjsip = callPackage ../applications/networking/pjsip { }; + pjsip = callPackage ../applications/networking/pjsip { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; pounce = callPackage ../servers/pounce { }; @@ -25971,10 +25910,7 @@ in termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {}; - inherit (callPackage ../applications/networking/cluster/terraform { - # terraform 0.12 crashes with go1.14 on darwin https://github.com/hashicorp/terraform/issues/24287 - buildGoPackage = if stdenv.isDarwin then buildGo113Package else buildGoPackage; - }) + inherit (callPackage ../applications/networking/cluster/terraform { }) terraform_0_11 terraform_0_11-full terraform_0_12 @@ -26210,6 +26146,11 @@ in xzoom = callPackage ../tools/X11/xzoom {}; + yabai = callPackage ../os-specific/darwin/yabai { + inherit (darwin.apple_sdk.frameworks) + Carbon Cocoa ScriptingBridge; + }; + yabause = libsForQt5.callPackage ../misc/emulators/yabause { freeglut = null; openal = null; @@ -26275,8 +26216,8 @@ in dart = callPackage ../development/interpreters/dart { }; dart_old = dart.override { version = "1.24.3"; }; - dart_stable = dart.override { version = "2.7.1"; }; - dart_dev = dart.override { version = "2.8.0-dev.10.0"; }; + dart_stable = dart.override { version = "2.7.2"; }; + dart_dev = dart.override { version = "2.9.0-4.0.dev"; }; httrack = callPackage ../tools/backup/httrack { }; @@ -26518,4 +26459,7 @@ in jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { }; zenstates = callPackage ../os-specific/linux/zenstates {}; + + vpsfree-client = callPackage ../tools/virtualization/vpsfree-client {}; + } diff --git a/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix b/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix index 1853c7eb8a..d044ed8004 100644 --- a/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix @@ -78,7 +78,7 @@ in lib.makeScope newScope (self: lib.makeOverridable ({ // melpaStablePackages // { inherit melpaStablePackages; } // melpaPackages // { inherit melpaPackages; } // orgPackages // { inherit orgPackages; } - // manualPackages + // manualPackages // { inherit manualPackages; } // { inherit emacs melpaBuild trivialBuild; emacsWithPackages = emacsWithPackages self; diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index 3cbb0a7df3..9517769f7b 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -45,11 +45,6 @@ let async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { }; - async_shell = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async_shell - else callPackage ../development/ocaml-modules/async_shell { }; - async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { }; async_p4 = @@ -75,6 +70,8 @@ let bigstringaf = callPackage ../development/ocaml-modules/bigstringaf { }; + bigstring = callPackage ../development/ocaml-modules/bigstring { }; + biocaml = callPackage ../development/ocaml-modules/biocaml { }; bistro = callPackage ../development/ocaml-modules/bistro { }; @@ -562,6 +559,10 @@ let mirage-stack = callPackage ../development/ocaml-modules/mirage-stack { }; + mirage-time = callPackage ../development/ocaml-modules/mirage-time { }; + + mirage-time-unix = callPackage ../development/ocaml-modules/mirage-time/unix.nix { }; + mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; mlgmpidl = callPackage ../development/ocaml-modules/mlgmpidl { }; @@ -592,8 +593,6 @@ let comparelib = callPackage ../development/ocaml-modules/comparelib { }; - core_extended_p4 = callPackage ../development/ocaml-modules/core_extended { }; - core_kernel_p4 = callPackage ../development/ocaml-modules/core_kernel { }; core_p4 = callPackage ../development/ocaml-modules/core { }; @@ -925,17 +924,10 @@ let uucp = callPackage ../development/ocaml-modules/uucp { }; uunf = callPackage ../development/ocaml-modules/uunf { }; - uri = - if lib.versionAtLeast ocaml.version "4.3" - then callPackage ../development/ocaml-modules/uri { } - else callPackage ../development/ocaml-modules/uri/legacy.nix { }; + uri = callPackage ../development/ocaml-modules/uri { }; uri-sexp = callPackage ../development/ocaml-modules/uri/sexp.nix { }; - uri_p4 = callPackage ../development/ocaml-modules/uri/legacy.nix { - legacyVersion = true; - }; - uuseg = callPackage ../development/ocaml-modules/uuseg { }; uutf = callPackage ../development/ocaml-modules/uutf { }; @@ -1200,13 +1192,6 @@ let then callPackage ../development/ocaml-modules/janestreet/textutils.nix {} else textutils_p4; - core_extended = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.core_extended - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/core-extended.nix {} - else core_extended_p4; - async_kernel = if lib.versionOlder "4.03" ocaml.version then janeStreet.async_kernel diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index b3597404ed..2f933eeff1 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -7878,6 +7878,20 @@ let }; }; + GitAutofixup = buildPerlPackage rec { + pname = "GitAutofixup"; + version = "0.002007"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-${version}.tar.gz"; + sha256 = "1ydy15pibva0qr5vrv5mqyzw3zlc3wbszzv7932vh7m88vv6gfr6"; + }; + meta = { + maintainers = [ maintainers.DamienCassou ]; + description = "Create fixup commits for topic branches"; + license = stdenv.lib.licenses.artistic2; + }; + }; + GitPurePerl = buildPerlPackage { pname = "Git-PurePerl"; version = "0.53"; diff --git a/third_party/nixpkgs/pkgs/top-level/php-packages.nix b/third_party/nixpkgs/pkgs/top-level/php-packages.nix index 0cda058459..9532f113ae 100644 --- a/third_party/nixpkgs/pkgs/top-level/php-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/php-packages.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgs, fetchgit, php, phpWithExtensions, autoconf, pkgconfig, re2c +{ stdenv, lib, pkgs, fetchgit, php, autoconf, pkgconfig, re2c , gettext, bzip2, curl, libxml2, openssl, gmp, icu, oniguruma, libsodium , html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl , uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng @@ -8,7 +8,8 @@ let buildPecl = import ../build-support/build-pecl.nix { - inherit php lib; + php = php.unwrapped; + inherit lib; inherit (pkgs) stdenv autoreconfHook fetchurl re2c; }; @@ -43,7 +44,7 @@ in installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/box/box.phar - makeWrapper ${phpWithExtensions}/bin/php $out/bin/box \ + makeWrapper ${php}/bin/php $out/bin/box \ --add-flags "-d phar.readonly=0 $out/libexec/box/box.phar" ''; @@ -51,17 +52,17 @@ in description = "An application for building and managing Phars"; license = licenses.mit; homepage = "https://box-project.github.io/box2/"; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; }; }; composer = mkDerivation rec { - version = "1.9.3"; + version = "1.10.5"; pname = "composer"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "VRZVwvyB9BBlCPQrvEsk6r00sCKxO8Hn2WQr9IPQp9Q="; + sha256 = "0a9iwhd7ijm8gkp3zadxza0xb6xwa5ps0d16pz4mz2p21gfzvwym"; }; dontUnpack = true; @@ -71,7 +72,7 @@ in installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/composer/composer.phar - makeWrapper ${phpWithExtensions}/bin/php $out/bin/composer \ + makeWrapper ${php}/bin/php $out/bin/composer \ --add-flags "$out/libexec/composer/composer.phar" \ --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]} ''; @@ -80,17 +81,17 @@ in description = "Dependency Manager for PHP"; license = licenses.mit; homepage = "https://getcomposer.org/"; - maintainers = with maintainers; [ globin offline ]; + maintainers = with maintainers; [ offline ] ++ teams.php.members; }; }; php-cs-fixer = mkDerivation rec { - version = "2.16.1"; + version = "2.16.3"; pname = "php-cs-fixer"; src = pkgs.fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "1dq1nhy666zg6d4fkfsjwhj1vwh1ncap2c9ljplxv98a9mm6fk68"; + sha256 = "195j61qbgbdn5xi0l6030mklji8m7fan2kf3446a1m2n4df3f5hb"; }; phases = [ "installPhase" ]; @@ -107,7 +108,7 @@ in description = "A tool to automatically fix PHP coding standards issues"; license = licenses.mit; homepage = "http://cs.sensiolabs.org/"; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; }; }; @@ -144,17 +145,17 @@ in description = "This tool check syntax of PHP files faster than serial check with fancier output"; license = licenses.bsd2; homepage = "https://github.com/JakubOnderka/PHP-Parallel-Lint"; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; }; }; phpcbf = mkDerivation rec { - version = "3.5.4"; + version = "3.5.5"; pname = "phpcbf"; src = pkgs.fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar"; - sha256 = "18x7fk59l821pivw1i2r868y78qgs0qk47b9il1smwi6plwyyflr"; + sha256 = "0hgagn70gl46migm6zpwcr39dxal07f5cdpnasrafgz5vq0gwr3g"; }; phases = [ "installPhase" ]; @@ -163,7 +164,7 @@ in installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/phpcbf/phpcbf.phar - makeWrapper ${phpWithExtensions}/bin/php $out/bin/phpcbf \ + makeWrapper ${php}/bin/php $out/bin/phpcbf \ --add-flags "$out/libexec/phpcbf/phpcbf.phar" ''; @@ -171,17 +172,17 @@ in description = "PHP coding standard beautifier and fixer"; license = licenses.bsd3; homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; - maintainers = with maintainers; [ cmcdragonkai etu ]; + maintainers = with maintainers; [ cmcdragonkai ] ++ teams.php.members; }; }; phpcs = mkDerivation rec { - version = "3.5.4"; + version = "3.5.5"; pname = "phpcs"; src = pkgs.fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar"; - sha256 = "1lrybdxxig3yqd3i3nwji5jjn377p50sbpm4s4852dlsxz9qnlgs"; + sha256 = "0jl038l55cmzn5ml61qkv4z1w4ri0h3v7h00pcb04xhz3gznlbsa"; }; phases = [ "installPhase" ]; @@ -190,7 +191,7 @@ in installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/phpcs/phpcs.phar - makeWrapper ${phpWithExtensions}/bin/php $out/bin/phpcs \ + makeWrapper ${php}/bin/php $out/bin/phpcs \ --add-flags "$out/libexec/phpcs/phpcs.phar" ''; @@ -198,17 +199,17 @@ in description = "PHP coding standard tool"; license = licenses.bsd3; homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; - maintainers = with maintainers; [ javaguirre etu ]; + maintainers = with maintainers; [ javaguirre ] ++ teams.php.members; }; }; phpstan = mkDerivation rec { - version = "0.12.18"; + version = "0.12.19"; pname = "phpstan"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "0xf0q2z6rhpnbys53si05mddfyjn3wx5wc8zx5y6dv5fzw6z7rch"; + sha256 = "15fz7rixi9s46qqxpj26349aky7wxqnzmfsnwlh1f2p4jsfd85ki"; }; phases = [ "installPhase" ]; @@ -217,32 +218,32 @@ in installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/phpstan/phpstan.phar - makeWrapper ${phpWithExtensions}/bin/php $out/bin/phpstan \ + makeWrapper ${php}/bin/php $out/bin/phpstan \ --add-flags "$out/libexec/phpstan/phpstan.phar" ''; meta = with pkgs.lib; { description = "PHP Static Analysis Tool"; longDescription = '' - PHPStan focuses on finding errors in your code without actually running - it. It catches whole classes of bugs even before you write tests for the - code. It moves PHP closer to compiled languages in the sense that the - correctness of each line of the code can be checked before you run the - actual line. - ''; + PHPStan focuses on finding errors in your code without actually + running it. It catches whole classes of bugs even before you write + tests for the code. It moves PHP closer to compiled languages in the + sense that the correctness of each line of the code can be checked + before you run the actual line. + ''; license = licenses.mit; homepage = "https://github.com/phpstan/phpstan"; - maintainers = with maintainers; [ etu ]; + maintainers = teams.php.members; }; }; psalm = mkDerivation rec { - version = "3.9.3"; + version = "3.11.2"; pname = "psalm"; src = pkgs.fetchurl { url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar"; - sha256 = "KHm2n06y/yxN5B2rCVxT5ja7HxkyxAMsjZ5HLb3xr4M="; + sha256 = "1ani0907whqy2ycr01sjlvrmwps4dg5igim8z1qyv8grhwvw6gb0"; }; phases = [ "installPhase" ]; @@ -259,16 +260,17 @@ in description = "A static analysis tool for finding errors in PHP applications"; license = licenses.mit; homepage = "https://github.com/vimeo/psalm"; + maintainers = teams.php.members; }; }; psysh = mkDerivation rec { - version = "0.9.12"; + version = "0.10.3"; pname = "psysh"; src = pkgs.fetchurl { url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; - sha256 = "0bzmc94li481xk81gv460ipq9zl03skbnq8m3rnw34i2c04hxczc"; + sha256 = "0glply451fy0g7zbasyp350qvmk2aglrlcrcdd7w0igylgwfkg71"; }; phases = [ "installPhase" ]; @@ -285,7 +287,7 @@ in description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP."; license = licenses.mit; homepage = "https://psysh.org/"; - maintainers = with maintainers; [ caugner ]; + maintainers = with maintainers; [ caugner ] ++ teams.php.members; }; }; }; @@ -308,6 +310,8 @@ in checkFlagsArray = ["REPORT_EXIT_STATUS=1" "NO_INTERACTION=1"]; makeFlags = [ "phpincludedir=$(dev)/include" ]; outputs = [ "out" "dev" ]; + + meta.maintainers = lib.teams.php.members; }; apcu_bc = buildPecl { @@ -320,6 +324,8 @@ in php.extensions.apcu pcre' ]; + + meta.maintainers = lib.teams.php.members; }; ast = buildPecl { @@ -327,6 +333,8 @@ in pname = "ast"; sha256 = "16c5isldm4csjbcvz1qk2mmrhgvh24sxsp6w6f5a37xpa3vciawp"; + + meta.maintainers = lib.teams.php.members; }; couchbase = buildPecl rec { @@ -374,6 +382,7 @@ in '') ]; + meta.maintainers = lib.teams.php.members; meta.broken = isPhp74; # Build error }; @@ -406,6 +415,7 @@ in ''; license = licenses.php301; homepage = "https://bitbucket.org/osmanov/pecl-event/"; + maintainers = teams.php.members; }; }; @@ -418,6 +428,8 @@ in configureFlags = [ "--enable-igbinary" ]; makeFlags = [ "phpincludedir=$(dev)/include" ]; outputs = [ "out" "dev" ]; + + meta.maintainers = lib.teams.php.members; }; imagick = buildPecl { @@ -429,6 +441,8 @@ in configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ]; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pcre' ]; + + meta.maintainers = lib.teams.php.members; }; mailparse = buildPecl { @@ -440,6 +454,8 @@ in postConfigure = '' echo "#define HAVE_MBSTRING 1" >> config.h ''; + + meta.maintainers = lib.teams.php.members; }; maxminddb = buildPecl rec { @@ -459,7 +475,7 @@ in meta = with pkgs.lib; { description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ ajs124 das_j ]; + maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members; }; }; @@ -486,6 +502,8 @@ in nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; [ cyrus_sasl zlib ]; + + meta.maintainers = lib.teams.php.members; }; mongodb = buildPecl { @@ -503,6 +521,8 @@ in zlib pcre' ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security; + + meta.maintainers = lib.teams.php.members; }; oci8 = buildPecl { @@ -516,6 +536,8 @@ in postPatch = '' sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 ''; + + meta.maintainers = lib.teams.php.members; }; pcov = buildPecl { @@ -525,6 +547,8 @@ in sha256 = "1psfwscrc025z8mziq69pcx60k4fbkqa5g2ia8lplb94mmarj0v1"; buildInputs = [ pcre' ]; + + meta.maintainers = lib.teams.php.members; }; pcs = buildPecl { @@ -533,11 +557,12 @@ in sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p"; + meta.maintainers = lib.teams.php.members; meta.broken = isPhp74; # Build error }; pdo_oci = buildPecl rec { - inherit (php) src version; + inherit (php.unwrapped) src version; pname = "pdo_oci"; sourceRoot = "php-${version}/ext/pdo_oci"; @@ -548,19 +573,23 @@ in internalDeps = [ php.extensions.pdo ]; postPatch = '' - sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 - ''; + sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 + ''; + + meta.maintainers = lib.teams.php.members; }; pdo_sqlsrv = buildPecl { - version = "5.8.0"; + version = "5.8.1"; pname = "pdo_sqlsrv"; - sha256 = "0z4vbyd851b4jr6p69l2ylk91iihndsm2qjb429pxcv8g6dqzqll"; + sha256 = "06ba4x34fgs092qq9w62y2afsm1nyasqiprirk4951ax9v5vcir0"; internalDeps = [ php.extensions.pdo ]; buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; + + meta.maintainers = lib.teams.php.members; }; php_excel = buildPecl rec { @@ -576,6 +605,8 @@ in }; configureFlags = [ "--with-excel" "--with-libxl-incdir=${pkgs.libxl}/include_c" "--with-libxl-libdir=${pkgs.libxl}/lib" ]; + + meta.maintainers = lib.teams.php.members; }; pinba = let @@ -601,6 +632,7 @@ in statistics server for PHP using MySQL as a read-only interface. ''; homepage = "http://pinba.org/"; + maintainers = teams.php.members; }; }; @@ -618,6 +650,7 @@ in ''; license = licenses.bsd3; homepage = "https://developers.google.com/protocol-buffers/"; + maintainers = teams.php.members; }; }; @@ -653,15 +686,19 @@ in session ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ hash ]; + + meta.maintainers = lib.teams.php.members; }; sqlsrv = buildPecl { - version = "5.8.0"; + version = "5.8.1"; pname = "sqlsrv"; - sha256 = "1kv4krk1w4hri99b0sdgwgy9c4y0yh217wx2y3irhkfi46kdrjnw"; + sha256 = "0c9a6ghch2537vi0274vx0mn6nb1xg2qv7nprnf3xdfqi5ww1i9r"; buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; + + meta.maintainers = lib.teams.php.members; }; v8 = buildPecl { @@ -672,6 +709,8 @@ in buildInputs = [ pkgs.v8_6_x ]; configureFlags = [ "--with-v8=${pkgs.v8_6_x}" ]; + + meta.maintainers = lib.teams.php.members; meta.broken = true; }; @@ -683,6 +722,8 @@ in buildInputs = [ pkgs.v8_6_x ]; configureFlags = [ "--with-v8js=${pkgs.v8_6_x}" ]; + + meta.maintainers = lib.teams.php.members; meta.broken = true; }; @@ -696,6 +737,8 @@ in checkTarget = "test"; zendExtension = true; + + meta.maintainers = lib.teams.php.members; }; yaml = buildPecl { @@ -709,6 +752,8 @@ in ]; nativeBuildInputs = [ pkgs.pkgconfig ]; + + meta.maintainers = lib.teams.php.members; }; zmq = buildPecl { @@ -723,6 +768,7 @@ in nativeBuildInputs = [ pkgs.pkgconfig ]; + meta.maintainers = lib.teams.php.members; meta.broken = isPhp73; }; } // (let @@ -746,11 +792,11 @@ in pname = "php-${name}"; extensionName = name; - inherit (php) version src; + inherit (php.unwrapped) version src; sourceRoot = "php-${php.version}/ext/${name}"; enableParallelBuilding = true; - nativeBuildInputs = [ php autoconf pkgconfig re2c ]; + nativeBuildInputs = [ php.unwrapped autoconf pkgconfig re2c ]; inherit configureFlags internalDeps buildInputs zendExtension doCheck; @@ -782,6 +828,11 @@ in --prune-empty-dirs \ . $dev/include/ ''; + + meta = { + description = "PHP upstream extension: ${name}"; + inherit (php.meta) maintainers homepage license; + }; }); # This list contains build instructions for different modules that one may diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index ddb4136f36..5548f8c75a 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -248,6 +248,8 @@ in { authres = callPackage ../development/python-modules/authres { }; + auth0-python = callPackage ../development/python-modules/auth0-python { }; + autograd = callPackage ../development/python-modules/autograd { }; autologging = callPackage ../development/python-modules/autologging { }; @@ -278,8 +280,6 @@ in { withPython = true; }); - azure = callPackage ../development/python-modules/azure { }; - azure-nspkg = callPackage ../development/python-modules/azure-nspkg { }; azure-common = callPackage ../development/python-modules/azure-common { }; @@ -308,6 +308,8 @@ in { azure-keyvault = callPackage ../development/python-modules/azure-keyvault { }; + azure-keyvault-certificates = callPackage ../development/python-modules/azure-keyvault-certificates { }; + azure-keyvault-keys = callPackage ../development/python-modules/azure-keyvault-keys { }; azure-keyvault-nspkg = callPackage ../development/python-modules/azure-keyvault-nspkg { }; @@ -374,6 +376,8 @@ in { azure-mgmt-containerservice = callPackage ../development/python-modules/azure-mgmt-containerservice { }; + azure-mgmt-core = callPackage ../development/python-modules/azure-mgmt-core { }; + azure-mgmt-cosmosdb = callPackage ../development/python-modules/azure-mgmt-cosmosdb { }; azure-mgmt-datafactory = callPackage ../development/python-modules/azure-mgmt-datafactory { }; @@ -454,6 +458,8 @@ in { azure-mgmt-recoveryservicesbackup = callPackage ../development/python-modules/azure-mgmt-recoveryservicesbackup { }; + azure-mgmt-redhatopenshift = callPackage ../development/python-modules/azure-mgmt-redhatopenshift { }; + azure-mgmt-redis = callPackage ../development/python-modules/azure-mgmt-redis { }; azure-mgmt-relay = callPackage ../development/python-modules/azure-mgmt-relay { }; @@ -518,6 +524,8 @@ in { 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 { }; @@ -1218,6 +1226,10 @@ in { 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 { }; @@ -1459,6 +1471,8 @@ in { transformers = callPackage ../development/python-modules/transformers { }; + transforms3d = callPackage ../development/python-modules/transforms3d { }; + sentinel = callPackage ../development/python-modules/sentinel { }; sentry-sdk = callPackage ../development/python-modules/sentry-sdk {}; @@ -2216,6 +2230,8 @@ in { 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 { };