From 1693fb228524f55eea600bb111e158a77f83a50a Mon Sep 17 00:00:00 2001 From: Default email Date: Wed, 7 Oct 2020 11:15:18 +0200 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: 420f89ceb267b461eed5d025b6c3c0e57703cc5c --- third_party/nixpkgs/default.nix | 2 +- third_party/nixpkgs/doc/stdenv/stdenv.xml | 13 +- third_party/nixpkgs/lib/types.nix | 1 + .../nixpkgs/maintainers/maintainer-list.nix | 68 + .../nixpkgs/maintainers/scripts/update.nix | 125 +- .../nixpkgs/maintainers/scripts/update.py | 213 +- .../scripts/update_redirected_urls.sh | 11 + .../doc/manual/development/building-nixos.xml | 6 + .../installing-from-other-distro.xml | 2 +- .../nixos/doc/manual/man-nixos-rebuild.xml | 41 +- .../doc/manual/release-notes/rl-1903.xml | 2 +- .../doc/manual/release-notes/rl-2009.xml | 34 +- .../doc/manual/release-notes/rl-2103.xml | 23 +- .../nixos/modules/config/fonts/fontdir.nix | 47 +- .../nixos/modules/config/fonts/fonts.nix | 12 +- .../modules/config/update-users-groups.pl | 6 + .../nixos/modules/config/users-groups.nix | 1 + .../modules/i18n/input-method/default.nix | 3 +- .../modules/i18n/input-method/default.xml | 25 + .../nixos/modules/i18n/input-method/hime.nix | 28 + .../installer/tools/nixos-generate-config.pl | 2 +- .../modules/installer/tools/nixos-install.sh | 2 +- .../modules/installer/tools/nixos-rebuild.sh | 26 +- .../nixos/modules/installer/tools/tools.nix | 1 - .../nixpkgs/nixos/modules/misc/ids.nix | 2 + .../nixpkgs/nixos/modules/module-list.nix | 2 + .../nixos/modules/profiles/hardened.nix | 2 + .../nixpkgs/nixos/modules/programs/neovim.nix | 165 + .../nixpkgs/nixos/modules/programs/sway.nix | 5 +- .../nixos/modules/programs/xwayland.nix | 45 + .../nixpkgs/nixos/modules/security/acme.nix | 2 +- .../nixos/modules/security/apparmor.nix | 6 - .../nixpkgs/nixos/modules/security/pam.nix | 2 - .../nixpkgs/nixos/modules/security/sudo.nix | 13 +- .../modules/security/wrappers/default.nix | 7 +- .../modules/services/databases/cassandra.nix | 15 +- .../nixos/modules/services/mail/dovecot.nix | 8 +- .../nixos/modules/services/mail/sympa.nix | 4 - .../modules/services/misc/matrix-synapse.nix | 7 +- .../services/monitoring/datadog-agent.nix | 26 +- .../monitoring/prometheus/default.nix | 13 +- .../monitoring/prometheus/exporters.nix | 8 +- .../prometheus/exporters/openvpn.nix | 39 + .../prometheus/exporters/postfix.nix | 25 +- .../services/network-filesystems/rsyncd.nix | 134 +- .../services/network-filesystems/samba.nix | 14 +- .../services/networking/dnscrypt-proxy2.nix | 44 +- .../modules/services/networking/nftables.nix | 2 +- .../modules/services/web-apps/moodle.nix | 2 +- .../modules/services/web-apps/nextcloud.nix | 68 +- .../web-servers/apache-httpd/default.nix | 3 - .../modules/services/web-servers/caddy.nix | 23 +- .../services/web-servers/molly-brown.nix | 21 +- .../services/web-servers/phpfpm/default.nix | 7 +- .../services/x11/desktop-managers/gnome3.nix | 94 +- .../services/x11/desktop-managers/plasma5.nix | 3 + .../nixos/modules/services/x11/picom.nix | 13 +- .../nixos/modules/services/x11/xserver.nix | 8 + .../modules/tasks/network-interfaces.nix | 9 +- .../nixpkgs/nixos/tests/common/ec2.nix | 4 +- third_party/nixpkgs/nixos/tests/hardened.nix | 5 +- third_party/nixpkgs/nixos/tests/ncdns.nix | 53 +- .../nixos/tests/prometheus-exporters.nix | 27 + third_party/nixpkgs/nixos/tests/rsyncd.nix | 25 + .../applications/audio/bsequencer/default.nix | 4 +- .../applications/audio/cantata/default.nix | 4 +- ...1-Drop-baked-in-build-date-for-r13y.patch} | 13 + ...end-libSDL.dylib-to-macOS-SDL-loader.patch | 25 + .../audio/cheesecutter/default.nix | 45 +- .../applications/audio/geonkick/default.nix | 4 +- .../pkgs/applications/audio/giada/default.nix | 4 +- .../audio/lsp-plugins/default.nix | 31 +- .../pkgs/applications/audio/lv2bm/default.nix | 12 +- .../applications/audio/lyrebird/default.nix | 63 + .../applications/audio/opus-tools/default.nix | 2 +- .../applications/audio/opusfile/default.nix | 2 +- .../pkgs/applications/audio/pmidi/default.nix | 2 +- .../pkgs/applications/audio/praat/default.nix | 2 +- .../applications/audio/projectm/default.nix | 6 +- .../applications/audio/pt2-clone/default.nix | 4 +- .../applications/audio/r128gain/default.nix | 13 +- .../audio/r128gain/ffmpeg-location.patch | 4 +- .../audio/spotify-tui/default.nix | 6 +- .../applications/audio/strawberry/default.nix | 4 +- .../applications/blockchains/ergo/default.nix | 4 +- .../applications/blockchains/go-ethereum.nix | 6 +- .../editors/android-studio/default.nix | 6 +- .../applications/editors/emacs/generic.nix | 6 +- .../applications/editors/glow/default.nix | 10 +- .../editors/jetbrains/default.nix | 4 +- .../pkgs/applications/editors/neovim/qt.nix | 5 +- .../pkgs/applications/editors/qxw/default.nix | 31 + .../editors/vim/macvim-configurable.nix | 67 + .../pkgs/applications/editors/vim/macvim.nix | 13 +- .../applications/editors/vim/macvim.patch | 43 +- .../applications/editors/vscode/vscode.nix | 6 +- .../applications/editors/vscode/vscodium.nix | 6 +- .../applications/graphics/ImageMagick/7.0.nix | 1 + .../graphics/ImageMagick/default.nix | 5 +- .../applications/graphics/digikam/default.nix | 16 +- .../applications/graphics/drawio/default.nix | 4 +- .../applications/graphics/freecad/default.nix | 21 +- .../applications/graphics/freecad/stable.nix | 85 + .../graphics/gscan2pdf/default.nix | 5 +- .../applications/graphics/meshlab/default.nix | 2 +- .../applications/graphics/pdfcpu/default.nix | 6 +- .../applications/graphics/pinta/default.nix | 2 +- .../graphics/renderdoc/default.nix | 4 +- .../graphics/unigine-valley/default.nix | 2 +- .../graphics/yacreader/default.nix | 4 +- .../nixpkgs/pkgs/applications/kde/elisa.nix | 4 +- .../applications/logging/humioctl/default.nix | 6 +- .../pkgs/applications/misc/ape/apeclex.nix | 2 +- .../pkgs/applications/misc/ape/default.nix | 6 +- .../applications/misc/archiver/default.nix | 8 +- .../applications/misc/audio/sox/default.nix | 2 + .../applications/misc/blender/default.nix | 4 +- .../pkgs/applications/misc/blogc/default.nix | 33 + .../applications/misc/calcurse/default.nix | 2 +- .../pkgs/applications/misc/charm/default.nix | 26 + .../applications/misc/coolreader/default.nix | 4 +- .../applications/misc/dbeaver/default.nix | 4 +- .../misc/dbvisualizer/default.nix | 25 - .../pkgs/applications/misc/dstask/default.nix | 4 +- .../applications/misc/effitask/default.nix | 3 +- .../pkgs/applications/misc/fff/default.nix | 4 +- .../pkgs/applications/misc/gpxsee/default.nix | 18 +- .../pkgs/applications/misc/hugo/default.nix | 6 +- .../misc/joplin-desktop/default.nix | 79 +- .../pkgs/applications/misc/kapow/default.nix | 25 + .../pkgs/applications/misc/kitty/default.nix | 14 +- .../pkgs/applications/misc/kitty/no-lto.patch | 13 - .../misc/netsurf/buildsystem/default.nix | 24 - .../misc/netsurf/libhubbub/default.nix | 35 - .../misc/netsurf/libnsfb/default.nix | 32 - .../misc/netsurf/nsgenbind/default.nix | 30 - .../applications/misc/obsidian/default.nix | 4 +- .../pkgs/applications/misc/pipr/default.nix | 6 +- .../pkgs/applications/misc/pwsafe/default.nix | 6 +- .../applications/misc/rofimoji/default.nix | 45 + .../applications/misc/rsibreak/default.nix | 4 +- .../pkgs/applications/misc/sakura/default.nix | 2 +- .../pkgs/applications/misc/sigal/default.nix | 8 +- .../pkgs/applications/misc/swappy/default.nix | 45 + .../misc/taskjuggler/3.x/default.nix | 2 +- .../applications/misc/taskjuggler/default.nix | 2 +- .../pkgs/applications/misc/vifm/default.nix | 11 +- .../pkgs/applications/misc/vp/default.nix | 2 +- .../pkgs/applications/misc/waybar/default.nix | 6 +- .../pkgs/applications/misc/xiphos/default.nix | 2 +- .../pkgs/applications/misc/zola/default.nix | 6 +- .../applications/networking/Sylk/default.nix | 6 +- .../apache-directory-studio/default.nix | 24 +- .../networking/browsers/elinks/default.nix | 10 +- .../browsers/netsurf/browser.nix} | 45 +- .../browsers/netsurf/buildsystem.nix | 24 + .../networking/browsers/netsurf/default.nix | 36 + .../browsers/netsurf/libcss.nix} | 29 +- .../browsers/netsurf/libdom.nix} | 26 +- .../networking/browsers/netsurf/libhubbub.nix | 44 + .../browsers/netsurf/libnsbmp.nix} | 15 +- .../networking/browsers/netsurf/libnsfb.nix | 32 + .../browsers/netsurf/libnsgif.nix} | 13 +- .../browsers/netsurf/libnslog.nix} | 17 +- .../browsers/netsurf/libnspsl.nix} | 15 +- .../browsers/netsurf/libnsutils.nix} | 15 +- .../browsers/netsurf/libparserutils.nix} | 13 +- .../browsers/netsurf/libsvgtiny.nix} | 12 +- .../browsers/netsurf/libutf8proc.nix} | 13 +- .../browsers/netsurf/libwapcaplet.nix} | 13 +- .../networking/browsers/netsurf/nsgenbind.nix | 30 + .../networking/cluster/helm/default.nix | 4 +- .../networking/cluster/helmfile/default.nix | 6 +- .../networking/cluster/k9s/default.nix | 6 +- .../networking/cluster/kpt/default.nix | 8 +- .../networking/cluster/kube3d/default.nix | 4 +- .../networking/cluster/kubelogin/default.nix | 28 + .../networking/cluster/luigi/default.nix | 4 +- .../cluster/terraform-providers/data.nix | 6 +- .../cluster/terraform-providers/default.nix | 4 +- .../networking/cluster/terraform/default.nix | 4 +- .../networking/cluster/terranix/default.nix | 29 + .../feedreaders/newsboat/default.nix | 30 +- .../instant-messengers/discord/default.nix | 4 +- .../element/element-desktop-package.json | 6 +- .../element/element-desktop.nix | 4 +- .../element/element-web.nix | 4 +- .../pidgin-skypeweb/default.nix | 4 +- .../pidgin-plugins/purple-slack/default.nix | 6 +- .../instant-messengers/signal-cli/default.nix | 4 +- .../signal-desktop/default.nix | 4 +- .../skypeforlinux/default.nix | 4 +- .../instant-messengers/zoom-us/default.nix | 8 +- .../instant-messengers/zulip/default.nix | 4 +- .../networking/iptraf/default.nix | 1 + .../networking/irc/convos/default.nix | 4 +- .../networking/libcoap/default.nix | 4 +- .../mailreaders/claws-mail/default.nix | 21 +- .../networking/mailreaders/mblaze/default.nix | 22 +- .../networking/mailreaders/meli/default.nix | 11 +- .../mailreaders/neomutt/default.nix | 21 +- .../thunderbird-bin/release_sources.nix | 530 +-- .../mailreaders/thunderbird/default.nix | 11 +- .../networking/mumble/overlay.nix | 6 +- .../networking/nextcloud-client/default.nix | 8 +- .../networking/openbazaar/client.nix | 4 +- .../networking/p2p/gnunet/git.nix | 92 - .../networking/p2p/tribler/default.nix | 8 +- .../networking/pyload/default.nix | 4 +- .../networking/remote/wayvnc/default.nix | 8 +- .../networking/sniffers/wireshark/default.nix | 4 +- .../networking/sync/rsync/default.nix | 7 +- .../networking/termius/default.nix | 4 +- .../applications/networking/znc/default.nix | 4 +- .../applications/networking/znc/modules.nix | 12 +- .../applications/office/espanso/default.nix | 6 +- .../applications/office/wpsoffice/default.nix | 4 +- .../qubes/qubes-core-vchan-xen/default.nix | 14 +- .../applications/radio/hackrf/default.nix | 2 +- .../science/astronomy/stellarium/default.nix | 19 +- .../science/biology/EZminc/default.nix | 4 +- .../science/biology/N3/default.nix | 10 +- .../science/biology/aragorn/default.nix | 2 +- .../science/biology/bcftools/default.nix | 4 +- .../science/biology/conglomerate/default.nix | 7 +- .../science/biology/inormalize/default.nix | 2 +- .../science/biology/kent/default.nix | 75 + .../science/biology/minc-tools/default.nix | 16 +- .../minc-tools/fix-netcdf-header.patch | 12 - .../science/biology/mni_autoreg/default.nix | 4 +- .../science/biology/mrtrix/default.nix | 4 +- .../science/electronics/fritzing/default.nix | 2 +- .../science/electronics/openems/default.nix | 76 + .../science/electronics/verilog/default.nix | 40 +- .../applications/science/logic/z3/default.nix | 18 +- .../science/math/qalculate-gtk/default.nix | 16 +- .../science/misc/cytoscape/default.nix | 4 +- .../science/misc/foldingathome/client.nix | 4 +- .../git-and-tools/default.nix | 2 + .../git-and-tools/gh/default.nix | 6 +- .../git-and-tools/git-absorb/default.nix | 6 +- .../git-interactive-rebase-tool/default.nix | 2 +- .../git-remote-codecommit/default.nix | 31 + .../git-and-tools/gitstatus/default.nix | 3 + .../version-management/gitea/default.nix | 4 +- .../applications/video/dvdbackup/default.nix | 9 +- .../applications/video/handbrake/default.nix | 35 +- .../video/hdhomerun-config-gui/default.nix | 2 +- .../pkgs/applications/video/jftui/default.nix | 4 +- .../applications/video/obs-studio/default.nix | 10 +- .../applications/video/shotcut/default.nix | 17 +- .../pkgs/applications/video/vlc/default.nix | 6 +- .../virtualization/charliecloud/default.nix | 4 +- .../virtualization/containerd/default.nix | 4 +- .../virtualization/docker-compose/default.nix | 4 +- .../virtualization/podman/default.nix | 4 +- .../virtualization/virtualbox/default.nix | 7 +- .../virtualization/virtualbox/extpack.nix | 2 +- .../virtualbox/extra_symbols.patch | 22 +- .../virtualbox/guest-additions/default.nix | 2 +- .../window-managers/fbpanel/default.nix | 9 +- .../window-managers/icewm/default.nix | 4 +- .../jwm/0001-Fix-Gettext-Requirement.patch | 14 + .../window-managers/jwm/default.nix | 34 +- .../window-managers/picom/default.nix | 4 +- .../window-managers/sawfish/default.nix | 4 +- .../pkgs/build-support/docker/default.nix | 8 +- .../rust/build-rust-crate/default.nix | 12 +- .../rust/default-crate-overrides.nix | 30 +- .../scripts/update-source-version | 12 +- .../data/documentation/man-pages/default.nix | 4 + .../nixpkgs/pkgs/data/fonts/lato/default.nix | 4 +- .../pkgs/data/fonts/monoid/default.nix | 18 +- .../pkgs/data/fonts/noto-fonts/default.nix | 4 + .../nixpkgs/pkgs/data/fonts/sudo/default.nix | 7 +- .../icons/hicolor-icon-theme/setup-hook.sh | 6 +- .../pkgs/data/icons/iconpack-jade/default.nix | 4 +- .../pkgs/data/misc/hackage/default.nix | 4 +- .../pkgs/data/themes/jade1/default.nix | 18 +- .../data/themes/marwaita-manjaro/default.nix | 4 +- .../themes/marwaita-peppermint/default.nix | 4 +- .../pkgs/data/themes/marwaita/default.nix | 4 +- .../pkgs/data/themes/matcha/default.nix | 4 +- .../data/themes/materia-theme/default.nix | 44 +- .../pkgs/data/themes/obsidian2/default.nix | 4 +- .../cinnamon/cinnamon-common/default.nix | 4 + .../pkgs/desktops/cinnamon/cjs/default.nix | 83 +- .../desktops/cinnamon/cjs/fix-werror.patch | 39 - .../desktops/cinnamon/cjs/spidermonkey_52.nix | 95 - .../desktops/enlightenment/efl/default.nix | 12 +- .../extensions/material-shell/default.nix | 44 + .../desktops/gnustep/libobjc2/default.nix | 1 - .../desktops/mate/caja-extensions/default.nix | 4 +- .../pkgs/desktops/mate/engrampa/default.nix | 12 +- .../pkgs/desktops/mate/eom/default.nix | 4 +- .../pkgs/desktops/mate/libmatekbd/default.nix | 4 +- .../desktops/mate/libmatemixer/default.nix | 4 +- .../desktops/mate/libmateweather/default.nix | 4 +- .../desktops/mate/mate-applets/default.nix | 4 +- .../mate/mate-backgrounds/default.nix | 4 +- .../pkgs/desktops/mate/mate-calc/default.nix | 4 +- .../desktops/mate/mate-common/default.nix | 4 +- .../mate/mate-control-center/default.nix | 4 +- .../desktops/mate/mate-desktop/default.nix | 4 +- .../pkgs/desktops/mate/mate-media/default.nix | 4 +- .../pkgs/desktops/mate/mate-menus/default.nix | 4 +- .../mate/mate-notification-daemon/default.nix | 4 +- .../pkgs/desktops/mate/mate-panel/default.nix | 4 +- .../mate/mate-power-manager/default.nix | 4 +- .../mate/mate-screensaver/default.nix | 4 +- .../mate/mate-sensors-applet/default.nix | 4 +- .../mate/mate-session-manager/default.nix | 4 +- .../mate/mate-settings-daemon/default.nix | 4 +- .../mate/mate-system-monitor/default.nix | 4 +- .../desktops/mate/mate-terminal/default.nix | 7 +- .../pkgs/desktops/mate/pluma/default.nix | 4 +- .../compilers/compcert/default.nix | 22 +- .../development/compilers/dasm/default.nix | 4 +- .../compilers/elm/packages/node-packages.nix | 1556 ++++---- .../development/compilers/fpc/lazarus.nix | 94 +- .../development/compilers/fpc/libqt5pas.nix | 12 +- .../compilers/ghc/8.10.2-binary.nix | 174 + .../pkgs/development/compilers/ghc/9.0.1.nix | 247 ++ .../pkgs/development/compilers/go/1.14.nix | 11 +- .../pkgs/development/compilers/go/1.15.nix | 11 +- .../compilers/llvm/11/clang/default.nix | 3 +- .../compilers/llvm/11/compiler-rt.nix | 2 +- .../development/compilers/llvm/11/default.nix | 4 +- .../compilers/llvm/11/libc++/default.nix | 2 +- .../compilers/llvm/11/libc++abi.nix | 2 +- .../compilers/llvm/11/libunwind.nix | 2 +- .../development/compilers/llvm/11/lld.nix | 2 +- .../development/compilers/llvm/11/lldb.nix | 2 +- .../development/compilers/llvm/11/llvm.nix | 4 +- .../development/compilers/llvm/11/openmp.nix | 2 +- .../pkgs/development/compilers/openjdk/11.nix | 1 + .../development/compilers/openjdk/default.nix | 1 + .../development/compilers/paco/default.nix | 23 + .../pkgs/development/compilers/paco/deps.nix | 93 + .../development/compilers/picat/default.nix | 7 +- .../development/compilers/ponyc/default.nix | 102 +- .../ponyc/make-safe-for-sandbox.patch | 93 + .../compilers/ponyc/pony-corral.nix | 25 + .../pkgs/development/compilers/scala/2.12.nix | 4 +- .../development/coq-modules/VST/default.nix | 43 + .../haskell-modules/configuration-common.nix | 10 +- .../configuration-ghc-9.0.x.nix | 46 + .../configuration-hackage2nix.yaml | 334 +- .../haskell-modules/configuration-nix.nix | 10 + .../haskell-modules/hackage-packages.nix | 3006 +++++++++++++--- .../development/interpreters/acl2/default.nix | 4 +- .../development/interpreters/erlang/R23.nix | 4 +- .../interpreters/jruby/default.nix | 4 + .../development/interpreters/luajit/2.0.nix | 6 +- .../development/interpreters/luajit/2.1.nix | 6 +- .../interpreters/luajit/default.nix | 2 +- .../interpreters/micropython/default.nix | 4 +- .../interpreters/octave/default.nix | 5 +- .../development/interpreters/perl/default.nix | 8 +- .../development/interpreters/php/default.nix | 8 +- .../interpreters/python/default.nix | 4 +- .../update-python-libraries.py | 70 +- .../interpreters/rakudo/default.nix | 7 +- .../interpreters/rakudo/moarvm.nix | 4 +- .../development/interpreters/rakudo/nqp.nix | 4 +- .../development/interpreters/ruby/default.nix | 8 +- .../interpreters/ruby/patchsets.nix | 2 +- .../interpreters/ruby/rvm-patchsets.nix | 4 +- .../development/interpreters/self/default.nix | 6 +- .../interpreters/spidermonkey/38.nix | 1 + .../interpreters/spidermonkey/78.nix | 118 + .../development/libraries/adslib/default.nix | 25 + .../development/libraries/amdvlk/default.nix | 9 +- .../libraries/appstream-glib/default.nix | 4 +- .../libraries/aqbanking/default.nix | 2 +- .../development/libraries/aribb25/default.nix | 57 + .../development/libraries/cddlib/default.nix | 4 +- .../development/libraries/coin3d/default.nix | 24 +- .../libraries/editline/default.nix | 2 +- .../development/libraries/embree/default.nix | 14 +- .../development/libraries/ethash/default.nix | 13 +- .../development/libraries/faudio/default.nix | 4 +- .../development/libraries/fmt/default.nix | 4 +- .../libraries/gbenchmark/default.nix | 4 +- .../pkgs/development/libraries/gegl/4.0.nix | 9 + .../development/libraries/hivex/default.nix | 2 +- .../development/libraries/jbigkit/default.nix | 16 +- .../libraries/libevent/default.nix | 2 +- .../libraries/libguestfs/default.nix | 4 +- .../development/libraries/libical/default.nix | 32 +- .../libraries/libinsane/default.nix | 4 +- .../development/libraries/libisds/default.nix | 4 +- .../development/libraries/libkml/default.nix | 3 + .../libraries/libmicrodns/default.nix | 4 +- .../development/libraries/libminc/default.nix | 20 +- .../development/libraries/libopus/default.nix | 2 +- .../libraries/libopusenc/default.nix | 2 +- .../libraries/libqalculate/default.nix | 4 +- .../development/libraries/libqtav/default.nix | 11 +- .../libraries/libstrophe/default.nix | 8 +- .../libraries/liburing/default.nix | 40 +- .../development/libraries/libwps/default.nix | 4 +- .../development/libraries/libxls/default.nix | 4 +- .../development/libraries/mlt/default.nix | 20 +- .../pkgs/development/libraries/mlt/qt-5.nix | 12 +- .../development/libraries/nco/default.nix | 6 +- .../development/libraries/neatvnc/default.nix | 9 +- .../development/libraries/ois/default.nix | 37 +- .../development/libraries/oneDNN/default.nix | 4 +- .../libraries/opencascade-occt/7.3.nix | 29 + .../libraries/opencascade-occt/default.nix | 11 +- .../development/libraries/pcl/default.nix | 2 +- .../libraries/phonon/backends/vlc.nix | 4 +- .../development/libraries/pkger/default.nix | 4 +- .../development/libraries/precice/default.nix | 13 +- .../development/libraries/pupnp/default.nix | 4 +- .../science/biology/EBTKS/default.nix | 2 +- .../science/biology/bicgl/default.nix | 9 +- .../science/biology/bicpl/default.nix | 4 +- .../science/biology/oobicpl/default.nix | 4 +- .../libraries/science/math/arpack/default.nix | 21 +- .../science/math/cliquer/default.nix | 4 +- .../science/math/libbraiding/default.nix | 4 +- .../science/math/openblas/default.nix | 7 + .../development/libraries/soqt/default.nix | 25 +- .../development/libraries/tecla/default.nix | 4 +- .../development/libraries/twolame/default.nix | 2 +- .../development/libraries/x265/default.nix | 2 + .../libraries/xdg-desktop-portal/default.nix | 4 +- .../development/libraries/xmlsec/default.nix | 5 +- .../development/libraries/xylib/default.nix | 4 +- .../libraries/zeroc-ice/default.nix | 9 +- .../lua-modules/generated-packages.nix | 22 +- .../development/node-packages/default.nix | 14 + .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 3146 +++++++++-------- .../ocaml-modules/angstrom/default.nix | 8 +- .../asn1-combinators/default.nix | 4 +- .../ocaml-modules/containers/data.nix | 4 +- .../ocaml-modules/csexp/default.nix | 8 +- .../dune-configurator/default.nix | 2 + .../ocaml-modules/earley/default.nix | 25 +- .../ocaml-modules/fpath/default.nix | 10 +- .../ocaml-modules/iter/default.nix | 2 +- .../ocaml-modules/janestreet/default.nix | 2 +- .../ocaml-modules/macaddr/default.nix | 4 +- .../ocaml-modules/mirage-stack/default.nix | 4 +- .../ocaml-modules/mirage/runtime.nix | 4 +- .../ocaml-modules/ocaml-result/default.nix | 24 +- .../ocaml-modules/ocaml-version/default.nix | 10 +- .../development/ocaml-modules/tls/default.nix | 4 +- .../ocaml-modules/topkg/default.nix | 20 +- .../development/ocaml-modules/z3/default.nix | 29 + .../WWW-YoutubeViewer/default.nix | 4 +- .../python-modules/Wand/default.nix | 4 +- .../python-modules/abodepy/default.nix | 26 + .../python-modules/accupy/default.nix | 16 +- .../python-modules/adb-shell/default.nix | 32 + .../python-modules/adguardhome/default.nix | 26 + .../python-modules/aioftp/default.nix | 4 +- .../python-modules/aionotify/default.nix | 32 + .../python-modules/alerta-server/default.nix | 22 +- .../python-modules/alerta/default.nix | 4 +- .../python-modules/androidtv/default.nix | 31 + .../python-modules/argcomplete/default.nix | 4 +- .../python-modules/asyncssh/default.nix | 4 +- .../atlassian-python-api/default.nix | 4 +- .../python-modules/avro-python3/default.nix | 3 +- .../azure-appconfiguration/default.nix | 29 + .../python-modules/azure-core/default.nix | 4 +- .../azure-datalake-store/default.nix | 4 +- .../azure-keyvault-administration/default.nix | 37 + .../azure-keyvault-certificates/default.nix | 4 +- .../azure-mgmt-appconfiguration/default.nix | 14 +- .../azure-mgmt-commerce/default.nix | 29 +- .../azure-mgmt-compute/default.nix | 6 +- .../azure-mgmt-containerservice/default.nix | 4 +- .../azure-mgmt-datafactory/default.nix | 4 +- .../azure-mgmt-eventhub/default.nix | 6 +- .../azure-mgmt-keyvault/default.nix | 4 +- .../azure-mgmt-loganalytics/default.nix | 4 +- .../azure-mgmt-monitor/default.nix | 6 +- .../azure-mgmt-netapp/default.nix | 4 +- .../azure-mgmt-network/default.nix | 26 +- .../azure-mgmt-resource/default.nix | 23 +- .../python-modules/azure-mgmt-sql/default.nix | 4 +- .../azure-mgmt-storage/default.nix | 13 +- .../azure-mgmt-synapse/default.nix | 4 +- .../default.nix | 19 +- .../azure-storage-blob/default.nix | 4 +- .../azure-synapse-accesscontrol/default.nix | 4 +- .../azure-synapse-spark/default.nix | 4 +- .../bayesian-optimization/default.nix | 3 +- .../python-modules/bidict/default.nix | 4 +- .../python-modules/biopython/default.nix | 4 +- .../python-modules/bip_utils/default.nix | 15 +- .../python-modules/blessed/default.nix | 24 +- .../python-modules/braintree/default.nix | 4 +- .../python-modules/breathe/default.nix | 4 +- .../python-modules/bumps/default.nix | 2 +- .../python-modules/canonicaljson/default.nix | 4 +- .../python-modules/chameleon/default.nix | 13 +- .../python-modules/class-registry/default.nix | 30 + .../python-modules/clifford/default.nix | 35 +- .../python-modules/cmd2/default.nix | 4 +- .../python-modules/colorful/default.nix | 2 +- .../cppheaderparser/default.nix | 26 + .../python-modules/curio/default.nix | 18 +- .../dash-core-components/default.nix | 4 +- .../dash-html-components/default.nix | 4 +- .../python-modules/dash-renderer/default.nix | 4 +- .../python-modules/dash-table/default.nix | 4 +- .../python-modules/dash/default.nix | 4 +- .../python-modules/dask/default.nix | 9 +- .../databricks-connect/default.nix | 4 +- .../python-modules/datadog/default.nix | 4 +- .../python-modules/datashader/default.nix | 3 +- .../python-modules/datatable/default.nix | 58 +- .../datatable/hardcode-library-paths.patch | 43 - .../python-modules/debugpy/default.nix | 50 +- .../python-modules/dnspython/1.nix | 2 +- .../python-modules/dnspython/default.nix | 2 +- .../python-modules/dpkt/default.nix | 4 +- .../python-modules/elementpath/default.nix | 12 +- .../python-modules/entrypoint2/default.nix | 36 + .../python-modules/eventlet/default.nix | 4 +- .../python-modules/fastparquet/default.nix | 3 + .../python-modules/fsspec/default.nix | 13 +- .../python-modules/funcy/default.nix | 4 +- .../python-modules/geoip2/default.nix | 4 +- .../git-annex-adapter/default.nix | 9 +- .../google-api-python-client/default.nix | 4 +- .../google-i18n-address/default.nix | 4 +- .../python-modules/guestfs/default.nix | 2 +- .../python-modules/gym/default.nix | 6 +- .../python-modules/h5py/default.nix | 15 +- .../python-modules/hg-evolve/default.nix | 4 +- .../python-modules/hidapi/default.nix | 4 + .../python-modules/icalendar/default.nix | 4 +- .../python-modules/identify/default.nix | 4 +- .../python-modules/inquirer/default.nix | 19 +- .../python-modules/intake/default.nix | 23 +- .../python-modules/ipympl/default.nix | 4 +- .../python-modules/irc/default.nix | 4 +- .../python-modules/islpy/default.nix | 19 +- .../python-modules/iterm2/default.nix | 2 +- .../python-modules/jug/default.nix | 4 +- .../jupyter_console/default.nix | 4 +- .../python-modules/jupyterlab/default.nix | 4 +- .../python-modules/ldap3/default.nix | 4 +- .../python-modules/libcloud/default.nix | 4 +- .../python-modules/limnoria/default.nix | 4 +- .../python-modules/lmtpd/default.nix | 4 +- .../python-modules/localzone/default.nix | 4 +- .../python-modules/loguru/default.nix | 4 +- .../python-modules/lomond/default.nix | 27 + .../python-modules/mask-rcnn/default.nix | 4 +- .../python-modules/mockito/default.nix | 4 +- .../python-modules/mss/default.nix | 29 + .../python-modules/namedlist/default.nix | 6 +- .../python-modules/nbclient/default.nix | 4 +- .../python-modules/nbval/default.nix | 6 +- .../python-modules/nodeenv/default.nix | 4 +- .../python-modules/notify-py/default.nix | 35 + .../python-modules/nvchecker/default.nix | 17 +- .../python-modules/pastel/default.nix | 4 +- .../python-modules/pdf2image/default.nix | 4 +- .../python-modules/periodictable/default.nix | 2 +- .../python-modules/phonenumbers/default.nix | 4 +- .../python-modules/pillowfight/default.nix | 2 +- .../python-modules/pivy/default.nix | 6 +- .../python-modules/plexapi/default.nix | 10 +- .../python-modules/poetry-core/default.nix | 12 +- .../python-modules/poetry/default.nix | 30 +- .../python-modules/progressbar2/default.nix | 4 +- .../python-modules/psautohint/default.nix | 4 +- .../python-modules/ptpython/default.nix | 4 +- .../python-modules/pure-eval/default.nix | 4 +- .../pure-python-adb/default.nix | 26 + .../python-modules/py-sonic/default.nix | 23 + .../python-modules/py_scrypt/default.nix | 4 +- .../python-modules/pyads/default.nix | 30 + .../python-modules/pybase64/default.nix | 4 +- .../python-modules/pybids/default.nix | 6 +- .../python-modules/pychromecast/default.nix | 4 +- .../python-modules/pyelftools/default.nix | 21 +- .../python-modules/pygit2/default.nix | 4 +- .../python-modules/pygls/default.nix | 25 +- .../python-modules/pygraphviz/default.nix | 4 +- .../python-modules/pylint/default.nix | 14 +- .../python-modules/pymysql/default.nix | 4 +- .../python-modules/pynvim/default.nix | 4 +- .../python-modules/pyroute2/default.nix | 4 +- .../python-modules/pyscreenshot/default.nix | 12 + .../python-modules/pysmb/default.nix | 4 +- .../python-modules/pyspice/default.nix | 2 + .../python-modules/pytesseract/default.nix | 4 +- .../python-modules/pytest-black/default.nix | 4 +- .../pytest-rerunfailures/default.nix | 4 +- .../python-modules/pytest-twisted/default.nix | 4 +- .../python-modules/pytest-xdist/2.nix | 4 +- .../pytest-xprocess/default.nix | 4 +- .../python-modules/python-csxcad/default.nix | 44 + .../python-modules/python-ctags3/default.nix | 4 +- .../python-modules/python-efl/default.nix | 4 +- .../python-modules/python-gitlab/default.nix | 4 +- .../python-modules/python-nest/default.nix | 25 + .../python-modules/python-vlc/default.nix | 4 +- .../python-modules/pyvips/default.nix | 31 + .../python-modules/qtawesome/default.nix | 4 +- .../python-modules/rarfile/default.nix | 18 +- .../python-modules/requests-hawk/default.nix | 20 + .../python-modules/ruffus/default.nix | 29 +- .../scrapy-fake-useragent/default.nix | 15 +- .../python-modules/seaborn/0.9.1.nix | 2 +- .../python-modules/seaborn/default.nix | 6 +- .../development/python-modules/sh/default.nix | 4 +- .../python-modules/shodan/default.nix | 4 +- .../python-modules/skein/default.nix | 1 + .../python-modules/skidl/default.nix | 46 + .../snowflake-connector-python/default.nix | 9 +- .../snowflake-sqlalchemy/default.nix | 2 + .../python-modules/sparse/default.nix | 4 +- .../python-modules/spotipy/default.nix | 4 +- .../python-modules/sqlmap/default.nix | 4 +- .../python-modules/srsly/default.nix | 4 +- .../python-modules/sseclient-py/default.nix | 25 + .../python-modules/starfish/default.nix | 90 - .../python-modules/statsmodels/default.nix | 4 +- .../python-modules/stevedore/default.nix | 4 +- .../python-modules/stripe/default.nix | 4 +- .../tensorflow-estimator/2/default.nix | 4 +- .../python-modules/tensorflow/1/default.nix | 11 +- .../python-modules/tensorflow/2/default.nix | 91 +- .../tensorflow/2/lift-gast-restriction.patch | 14 +- .../python-modules/tensorly/default.nix | 8 +- .../python-modules/texttable/default.nix | 4 +- .../python-modules/tinydb/default.nix | 23 +- .../python-modules/toggl-cli/default.nix | 22 +- .../python-modules/transformers/default.nix | 13 +- .../python-modules/trimesh/default.nix | 4 +- .../python-modules/tvnamer/default.nix | 4 +- .../python-modules/typer/default.nix | 49 + .../python-modules/unicodedata2/default.nix | 2 +- .../python-modules/unicorn/default.nix | 2 +- .../python-modules/vulture/default.nix | 4 +- .../python-modules/xmlschema/default.nix | 6 +- .../development/python-modules/yq/default.nix | 4 +- .../python-modules/zeroconf/default.nix | 4 +- .../tools/analysis/autoflake/default.nix | 4 +- .../tools/analysis/ikos/default.nix | 8 +- .../tools/analysis/nix-linter/default.nix | 14 +- .../tools/analysis/radare2/cutter.nix | 4 +- .../tools/analysis/rr/unstable.nix | 23 + .../tools/backblaze-b2/default.nix | 39 +- .../build-managers/sbt-extras/default.nix | 6 +- .../tools/build-managers/sbt/default.nix | 18 +- .../development/tools/buildah/default.nix | 4 +- .../development/tools/conftest/default.nix | 6 +- .../gitlab-runner/default.nix | 8 +- .../development/tools/coursier/default.nix | 4 +- .../tools/database/liquibase/default.nix | 2 +- .../development/tools/go-toml/default.nix | 4 +- .../development/tools/goconst/default.nix | 7 +- .../pkgs/development/tools/godot/default.nix | 4 +- .../development/tools/gomplate/default.nix | 35 + .../pkgs/development/tools/jpexs/default.nix | 57 + .../pkgs/development/tools/k6/default.nix | 4 +- .../tools/knightos/patchrom/default.nix | 28 + .../literate-programming/eweb/default.nix | 13 +- .../development/tools/minizinc/default.nix | 12 +- .../development/tools/misc/act/default.nix | 4 +- .../tools/misc/chruby-fish/default.nix | 28 + .../development/tools/misc/kdbg/default.nix | 2 +- .../development/tools/misc/strace/default.nix | 8 +- .../tools/ocaml/merlin/default.nix | 21 +- .../tools/ocaml/merlin/dot-merlin-reader.nix | 24 + .../tools/ocaml/merlin/fix-paths.patch | 15 + .../tools/operator-sdk/default.nix | 6 +- .../pkgs/development/tools/packer/default.nix | 4 +- .../tools/parsing/tree-sitter/default.nix | 6 +- .../parsing/tree-sitter/grammars/default.nix | 1 + .../grammars/tree-sitter-bash.json | 11 +- .../tree-sitter/grammars/tree-sitter-c.json | 11 +- .../tree-sitter/grammars/tree-sitter-cpp.json | 11 +- .../tree-sitter-embedded-template.json | 11 +- .../tree-sitter/grammars/tree-sitter-go.json | 11 +- .../grammars/tree-sitter-html.json | 11 +- .../grammars/tree-sitter-javascript.json | 11 +- .../grammars/tree-sitter-jsdoc.json | 11 +- .../grammars/tree-sitter-json.json | 11 +- .../tree-sitter/grammars/tree-sitter-php.json | 10 + .../grammars/tree-sitter-python.json | 11 +- .../grammars/tree-sitter-ruby.json | 11 +- .../grammars/tree-sitter-rust.json | 11 +- .../grammars/tree-sitter-typescript.json | 11 +- .../tools/parsing/tree-sitter/library.nix | 6 +- .../tools/poetry2nix/poetry2nix/default.nix | 108 +- .../tools/poetry2nix/poetry2nix/editable.nix | 35 +- .../poetry2nix/poetry2nix/hooks/default.nix | 12 +- .../tools/poetry2nix/poetry2nix/lib.nix | 8 +- .../poetry2nix/poetry2nix/mk-poetry-dep.nix | 32 +- .../tools/poetry2nix/poetry2nix/overrides.nix | 348 +- .../tools/poetry2nix/poetry2nix/pep425.nix | 13 +- .../tools/poetry2nix/poetry2nix/pep508.nix | 170 +- .../poetry2nix/pkgs/poetry/default.nix | 6 + .../poetry2nix/pkgs/poetry/poetry.lock | 2019 +++-------- .../poetry2nix/pkgs/poetry/pyproject.toml | 84 +- .../poetry2nix/pkgs/poetry/src.json | 7 +- .../tools/rust/cargo-generate/default.nix | 6 +- .../tools/rust/rust-analyzer/default.nix | 6 +- .../rust-analyzer/downgrade-smol_str.patch | 82 + .../tools/rust/rust-analyzer/generic.nix | 5 + .../rust/rust-analyzer/no-option-zip.patch | 36 +- .../development/tools/sd-local/default.nix | 24 + .../development/tools/skaffold/default.nix | 4 +- .../pkgs/development/tools/skopeo/default.nix | 18 +- .../development/tools/tabnine/default.nix | 36 + .../development/tools/wally-cli/default.nix | 25 +- .../pkgs/development/tools/wally-cli/deps.nix | 66 - .../pkgs/development/tools/yq-go/default.nix | 6 +- .../pkgs/development/web/cypress/default.nix | 4 +- .../pkgs/games/crispy-doom/default.nix | 21 +- .../nixpkgs/pkgs/games/ezquake/default.nix | 4 +- .../nixpkgs/pkgs/games/gemrb/default.nix | 2 +- .../nixpkgs/pkgs/games/instead/default.nix | 6 +- .../nixpkgs/pkgs/games/megaglest/default.nix | 4 +- .../nixpkgs/pkgs/games/osu-lazer/default.nix | 4 +- .../nixpkgs/pkgs/games/osu-lazer/deps.nix | 24 +- .../nixpkgs/pkgs/games/tuxpaint/default.nix | 6 + .../nixpkgs/pkgs/games/wesnoth/default.nix | 4 +- .../pkgs/misc/emulators/stella/default.nix | 6 +- .../pkgs/misc/emulators/wine/sources.nix | 10 +- .../pkgs/misc/emulators/wine/vkd3d.nix | 4 +- .../nixpkgs/pkgs/misc/lilypond/default.nix | 9 +- .../screensavers/electricsheep/default.nix | 8 +- .../nixpkgs/pkgs/misc/solfege/default.nix | 2 +- .../pkgs/misc/sound-of-sorting/default.nix | 4 +- .../nixpkgs/pkgs/misc/uboot/nanonote.nix | 59 - .../pkgs/misc/vim-plugins/generated.nix | 312 +- .../pkgs/misc/vim-plugins/overrides.nix | 20 +- .../pkgs/misc/vim-plugins/vim-plugin-names | 2 + .../vscode-extensions/cpptools/default.nix | 4 +- .../pkgs/misc/vscode-extensions/default.nix | 4 +- .../misc/vscode-extensions/python/default.nix | 4 +- .../vscode-extensions/wakatime/default.nix | 4 +- .../os-specific/linux/alsa-utils/default.nix | 4 +- .../pkgs/os-specific/linux/bcc/default.nix | 2 + .../pkgs/os-specific/linux/ena/default.nix | 4 +- .../firmware-linux-nonfree/default.nix | 6 +- .../firmware/system76-firmware/default.nix | 6 +- .../pkgs/os-specific/linux/iw/default.nix | 8 +- .../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.8.nix | 4 +- .../os-specific/linux/kernel/linux-libre.nix | 4 +- .../os-specific/linux/kernel/linux-rt-5.4.nix | 6 +- .../linux/kernel/linux-testing.nix | 4 +- .../os-specific/linux/kernel/linux-zen.nix | 4 +- .../pkgs/os-specific/linux/libbpf/default.nix | 4 +- .../os-specific/linux/rtl8812au/default.nix | 8 +- .../os-specific/linux/rtl8821cu/default.nix | 6 +- .../os-specific/linux/schedtool/default.nix | 2 +- .../pkgs/os-specific/linux/zfs/default.nix | 4 +- .../pkgs/servers/atlassian/confluence.nix | 4 +- .../nixpkgs/pkgs/servers/caddy/default.nix | 10 +- third_party/nixpkgs/pkgs/servers/caddy/v1.nix | 38 - .../pkgs/servers/dns/coredns/default.nix | 6 +- .../servers/gemini/molly-brown/default.nix | 6 +- .../nixpkgs/pkgs/servers/gerbera/default.nix | 78 + .../home-assistant/component-packages.nix | 78 +- .../pkgs/servers/home-assistant/default.nix | 12 +- .../home-assistant/fix-media-path-test.patch | 24 + .../pkgs/servers/home-assistant/frontend.nix | 4 +- .../servers/home-assistant/test-timeout.patch | 13 - .../pkgs/servers/http/jboss/default.nix | 6 +- .../pkgs/servers/http/nginx/mainline.nix | 4 +- .../servers/{kapow => kapowbang}/default.nix | 4 +- .../pkgs/servers/matrix-synapse/default.nix | 4 +- .../servers/monitoring/grafana/default.nix | 6 + .../monitoring/prometheus/mail-exporter.nix | 14 +- .../prometheus/mail-exporter_deps.nix | 92 - .../default.nix => prometheus/promscale.nix} | 8 +- .../servers/monitoring/riemann/default.nix | 4 +- .../servers/monitoring/thanos/default.nix | 6 +- .../nixpkgs/pkgs/servers/mpd/default.nix | 30 +- .../pkgs/servers/nextcloud/default.nix | 29 +- .../servers/nosql/victoriametrics/default.nix | 8 +- .../pkgs/servers/roundcube/default.nix | 4 +- .../nixpkgs/pkgs/servers/samba/4.x.nix | 4 +- .../pkgs/servers/sql/postgresql/default.nix | 12 +- .../servers/sql/postgresql/ext/pg_repack.nix | 4 +- .../servers/sql/postgresql/ext/tds_fdw.nix | 4 +- .../patches/socketdir-in-run-13.patch | 13 + .../nixpkgs/pkgs/servers/tegola/default.nix | 6 +- .../nixpkgs/pkgs/servers/traefik/default.nix | 19 +- .../pkgs/servers/web-apps/moodle/default.nix | 6 +- .../servers/web-apps/wordpress/default.nix | 4 +- .../x11/xorg/generate-expr-from-tarballs.pl | 8 +- .../pkgs/servers/x11/xorg/overrides.nix | 65 +- .../pkgs/servers/x11/xorg/xwayland.nix | 6 +- .../pkgs/servers/xmpp/prosody/default.nix | 8 +- .../nixpkgs/pkgs/shells/nushell/default.nix | 18 +- .../nixpkgs/pkgs/shells/oil/default.nix | 4 +- .../nixpkgs/pkgs/shells/zsh/default.nix | 2 +- .../shells/zsh/grml-zsh-config/default.nix | 2 +- .../zsh/lambda-mod-zsh-theme/default.nix | 14 +- .../pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +- third_party/nixpkgs/pkgs/stdenv/adapters.nix | 4 +- .../nixpkgs/pkgs/stdenv/cross/default.nix | 2 + .../pkgs/test/haskell-shellFor/default.nix | 23 +- .../pkgs/tools/admin/aws-vault/default.nix | 6 +- .../pkgs/tools/admin/awscli2/default.nix | 10 +- .../pkgs/tools/admin/azure-cli/default.nix | 6 +- .../tools/admin/azure-cli/python-packages.nix | 63 +- .../tools/admin/google-cloud-sdk/default.nix | 6 +- .../pkgs/tools/admin/lexicon/default.nix | 76 +- .../tools/archivers/fsarchiver/default.nix | 2 +- .../pkgs/tools/audio/ezstream/default.nix | 2 +- .../pkgs/tools/backup/kopia/default.nix | 6 +- .../pkgs/tools/backup/pyznap/default.nix | 6 +- .../pkgs/tools/compression/brotli/default.nix | 3 +- .../tools/compression/lzbench/default.nix | 4 +- .../filesystems/sandboxfs/Cargo.lock.patch | 640 ++++ .../tools/filesystems/sandboxfs/default.nix | 37 + .../tools/filesystems/xfsprogs/default.nix | 2 +- .../pkgs/tools/graphics/amber/default.nix | 95 + .../pkgs/tools/graphics/netpbm/default.nix | 28 +- .../pkgs/tools/graphics/vips/default.nix | 4 +- .../pkgs/tools/inputmethods/hime/default.nix | 40 + .../nixpkgs/pkgs/tools/misc/bat/default.nix | 38 +- .../pkgs/tools/misc/crudini/default.nix | 19 +- .../pkgs/tools/misc/diskonaut/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/duf/default.nix | 6 +- .../pkgs/tools/misc/esphome/default.nix | 10 +- .../pkgs/tools/misc/fluent-bit/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/gammy/default.nix | 13 +- .../pkgs/tools/misc/gh-ost/default.nix | 40 +- .../pkgs/tools/misc/git-town/default.nix | 2 +- .../pkgs/tools/misc/gotify-cli/default.nix | 6 +- .../pkgs/tools/misc/graylog/default.nix | 4 +- .../pkgs/tools/misc/graylog/plugins.nix | 10 +- .../nixpkgs/pkgs/tools/misc/hdf5/1_8.nix | 75 - .../pkgs/tools/misc/intermodal/default.nix | 6 +- .../pkgs/tools/misc/kepubify/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/lbdb/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/lnav/default.nix | 8 +- .../pkgs/tools/misc/logtop/default.nix | 34 + .../nixpkgs/pkgs/tools/misc/lsd/default.nix | 2 +- .../pkgs/tools/misc/miniserve/default.nix | 12 +- .../pkgs/tools/misc/mysql2pgsql/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/nncp/default.nix | 61 + .../pkgs/tools/misc/onefetch/default.nix | 14 +- .../pkgs/tools/misc/plowshare/default.nix | 4 +- .../pkgs/tools/misc/rpm-ostree/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/smenu/default.nix | 4 +- .../pkgs/tools/misc/starship/default.nix | 39 +- .../pkgs/tools/misc/svtplay-dl/default.nix | 7 +- .../pkgs/tools/misc/systrayhelper/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/vivid/default.nix | 16 +- .../pkgs/tools/misc/watchexec/default.nix | 6 +- .../pkgs/tools/misc/xdummy/default.nix | 9 +- .../tools/networking/bandwhich/default.nix | 18 +- .../tools/networking/dropbear/default.nix | 2 +- .../pkgs/tools/networking/frp/default.nix | 6 +- .../networking/gmrender-resurrect/default.nix | 10 +- .../tools/networking/linkchecker/default.nix | 4 +- .../pkgs/tools/networking/mozwire/default.nix | 8 +- .../pkgs/tools/networking/mtr/default.nix | 22 +- .../pkgs/tools/networking/nebula/default.nix | 6 +- .../network-manager/dmenu/default.nix | 4 +- .../pkgs/tools/networking/olsrd/default.nix | 21 +- .../tools/networking/openfortivpn/default.nix | 44 +- .../tools/networking/p2p/amule/default.nix | 19 +- .../tools/networking/smartdns/default.nix | 7 +- .../ssh-askpass-fullscreen/default.nix | 31 + .../pkgs/tools/networking/sshping/default.nix | 2 +- .../tools/networking/yggdrasil/default.nix | 6 +- .../package-management/cargo-edit/default.nix | 6 +- .../package-management/emplace/default.nix | 6 +- .../tools/package-management/nfpm/default.nix | 6 +- .../nixpkgs-review/default.nix | 4 +- .../tools/security/1password-gui/default.nix | 4 +- .../pkgs/tools/security/chipsec/default.nix | 2 + .../pkgs/tools/security/eid-mw/default.nix | 8 +- .../tools/security/hcxdumptool/default.nix | 4 +- .../pkgs/tools/security/kbs2/default.nix | 6 +- .../pkgs/tools/security/nmap/default.nix | 4 +- .../security/pcsc-scm-scl011/default.nix | 2 +- .../security/phrasendrescher/default.nix | 2 +- .../pkgs/tools/security/pinentry/default.nix | 2 +- .../pkgs/tools/security/rbw/default.nix | 7 +- .../pkgs/tools/security/tor/default.nix | 4 +- .../pkgs/tools/security/vault/default.nix | 4 +- .../pkgs/tools/security/vault/vault-bin.nix | 12 +- .../pkgs/tools/system/bottom/default.nix | 28 + .../pkgs/tools/system/htop/default.nix | 12 +- .../pkgs/tools/system/inxi/default.nix | 4 +- .../pkgs/tools/system/minijail/default.nix | 4 +- .../pkgs/tools/system/opencl-info/default.nix | 8 + .../opencl-info/opencl-info-clhpp2.diff | 22 + .../pkgs/tools/system/pciutils/default.nix | 8 +- .../system/systemd-journal2gelf/default.nix | 6 +- .../pkgs/tools/text/chroma/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/jsawk/default.nix | 4 +- .../pkgs/tools/text/mdbook/default.nix | 6 +- .../pkgs/tools/text/xml/basex/default.nix | 2 +- .../pkgs/tools/typesetting/sile/default.nix | 4 +- .../tools/typesetting/tectonic/default.nix | 9 +- .../tools/typesetting/tex/texlive/bin.nix | 19 + .../pkgs/tools/wayland/wtype/default.nix | 34 + .../nixpkgs/pkgs/top-level/aliases.nix | 5 + .../nixpkgs/pkgs/top-level/all-packages.nix | 245 +- .../nixpkgs/pkgs/top-level/coq-packages.nix | 1 + .../nixpkgs/pkgs/top-level/default.nix | 3 + .../pkgs/top-level/haskell-packages.nix | 22 + third_party/nixpkgs/pkgs/top-level/impure.nix | 2 +- .../nixpkgs/pkgs/top-level/ocaml-packages.nix | 4 + .../nixpkgs/pkgs/top-level/perl-packages.nix | 360 +- .../nixpkgs/pkgs/top-level/php-packages.nix | 45 +- .../pkgs/top-level/python-packages.nix | 62 +- third_party/nixpkgs/pkgs/top-level/static.nix | 9 +- 926 files changed, 16310 insertions(+), 9374 deletions(-) create mode 100755 third_party/nixpkgs/maintainers/scripts/update_redirected_urls.sh create mode 100644 third_party/nixpkgs/nixos/modules/i18n/input-method/hime.nix create mode 100644 third_party/nixpkgs/nixos/modules/programs/neovim.nix create mode 100644 third_party/nixpkgs/nixos/modules/programs/xwayland.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/openvpn.nix create mode 100644 third_party/nixpkgs/nixos/tests/rsyncd.nix rename third_party/nixpkgs/pkgs/applications/audio/cheesecutter/{0001-fix-impure-build-date-display.patch => 0001-Drop-baked-in-build-date-for-r13y.patch} (74%) create mode 100644 third_party/nixpkgs/pkgs/applications/audio/cheesecutter/0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch create mode 100644 third_party/nixpkgs/pkgs/applications/audio/lyrebird/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/qxw/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/vim/macvim-configurable.nix create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/freecad/stable.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/blogc/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/charm/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/dbvisualizer/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/kapow/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/kitty/no-lto.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/netsurf/buildsystem/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/netsurf/libhubbub/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/netsurf/libnsfb/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/netsurf/nsgenbind/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/rofimoji/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/swappy/default.nix rename third_party/nixpkgs/pkgs/applications/{misc/netsurf/browser/default.nix => networking/browsers/netsurf/browser.nix} (63%) create mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/buildsystem.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/default.nix rename third_party/nixpkgs/pkgs/applications/{misc/netsurf/libcss/default.nix => networking/browsers/netsurf/libcss.nix} (50%) rename third_party/nixpkgs/pkgs/applications/{misc/netsurf/libdom/default.nix => networking/browsers/netsurf/libdom.nix} (50%) create mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libhubbub.nix rename third_party/nixpkgs/pkgs/applications/{misc/netsurf/libnsbmp/default.nix => networking/browsers/netsurf/libnsbmp.nix} (63%) create mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsfb.nix rename third_party/nixpkgs/pkgs/applications/{misc/netsurf/libnsgif/default.nix => networking/browsers/netsurf/libnsgif.nix} (62%) rename third_party/nixpkgs/pkgs/applications/{misc/netsurf/libnslog/default.nix => networking/browsers/netsurf/libnslog.nix} (62%) rename third_party/nixpkgs/pkgs/applications/{misc/netsurf/libnspsl/default.nix => networking/browsers/netsurf/libnspsl.nix} (65%) rename third_party/nixpkgs/pkgs/applications/{misc/netsurf/libnsutils/default.nix => networking/browsers/netsurf/libnsutils.nix} (60%) rename third_party/nixpkgs/pkgs/applications/{misc/netsurf/libparserutils/default.nix => networking/browsers/netsurf/libparserutils.nix} (60%) rename third_party/nixpkgs/pkgs/applications/{misc/netsurf/libsvgtiny/default.nix => networking/browsers/netsurf/libsvgtiny.nix} (71%) rename third_party/nixpkgs/pkgs/applications/{misc/netsurf/libutf8proc/default.nix => networking/browsers/netsurf/libutf8proc.nix} (63%) rename third_party/nixpkgs/pkgs/applications/{misc/netsurf/libwapcaplet/default.nix => networking/browsers/netsurf/libwapcaplet.nix} (65%) create mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/nsgenbind.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/git.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/biology/kent/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch create mode 100644 third_party/nixpkgs/pkgs/applications/science/electronics/openems/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/jwm/0001-Fix-Gettext-Requirement.patch delete mode 100644 third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/fix-werror.patch delete mode 100644 third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/spidermonkey_52.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/material-shell/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/paco/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/paco/deps.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix create mode 100644 third_party/nixpkgs/pkgs/development/coq-modules/VST/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/adslib/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/aribb25/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/7.3.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/z3/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/abodepy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aionotify/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-administration/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/class-registry/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cppheaderparser/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/datatable/hardcode-library-paths.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/entrypoint2/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/lomond/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mss/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/notify-py/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pure-python-adb/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/py-sonic/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyads/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/python-csxcad/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/python-nest/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/requests-hawk/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/skidl/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/sseclient-py/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/starfish/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/analysis/rr/unstable.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/gomplate/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/jpexs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/chruby-fish/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/fix-paths.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/downgrade-smol_str.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/wally-cli/deps.nix delete mode 100644 third_party/nixpkgs/pkgs/misc/uboot/nanonote.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/caddy/v1.nix create mode 100644 third_party/nixpkgs/pkgs/servers/gerbera/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/home-assistant/fix-media-path-test.patch delete mode 100644 third_party/nixpkgs/pkgs/servers/home-assistant/test-timeout.patch rename third_party/nixpkgs/pkgs/servers/{kapow => kapowbang}/default.nix (93%) delete mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter_deps.nix rename third_party/nixpkgs/pkgs/servers/monitoring/{timescale-prometheus/default.nix => prometheus/promscale.nix} (63%) create mode 100644 third_party/nixpkgs/pkgs/servers/sql/postgresql/patches/socketdir-in-run-13.patch create mode 100644 third_party/nixpkgs/pkgs/tools/filesystems/sandboxfs/Cargo.lock.patch create mode 100644 third_party/nixpkgs/pkgs/tools/filesystems/sandboxfs/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/graphics/amber/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/inputmethods/hime/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/hdf5/1_8.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/logtop/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/system/bottom/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/system/opencl-info/opencl-info-clhpp2.diff create mode 100644 third_party/nixpkgs/pkgs/tools/wayland/wtype/default.nix diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix index a74a01719c..faed7e2635 100644 --- a/third_party/nixpkgs/default.nix +++ b/third_party/nixpkgs/default.nix @@ -14,7 +14,7 @@ if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins. - If you installed Nix using the install script (https://nixos.org/nix/install), it is safe to upgrade by running it again: - curl https://nixos.org/nix/install | sh + curl -L https://nixos.org/nix/install | sh For more information, please see the NixOS release notes at https://nixos.org/nixos/manual or locally at diff --git a/third_party/nixpkgs/doc/stdenv/stdenv.xml b/third_party/nixpkgs/doc/stdenv/stdenv.xml index f97c2a145a..fc586b06fd 100644 --- a/third_party/nixpkgs/doc/stdenv/stdenv.xml +++ b/third_party/nixpkgs/doc/stdenv/stdenv.xml @@ -475,9 +475,12 @@ passthru.updateScript = writeScript "update-zoom-us" '' passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]; - - - The script will be usually run from the root of the Nixpkgs repository but you should not rely on that. Also note that the update scripts will be run in parallel by default; you should avoid running git commit or any other commands that cannot handle that. + The script will be run with UPDATE_NIX_ATTR_PATH environment variable set to the attribute path it is supposed to update. + + + The script will be usually run from the root of the Nixpkgs repository but you should not rely on that. Also note that the update scripts will be run in parallel by default; you should avoid running git commit or any other commands that cannot handle that. + + For information about how to run the updates, execute nix-shell maintainers/scripts/update.nix. @@ -1636,10 +1639,6 @@ substitute ./foo.in ./foo.out \ --subst-var someVar - - substitute is implemented using the replace command. Unlike with the sed command, you don’t have to worry about escaping special characters. It supports performing substitutions on binary files (such as executables), though there you’ll probably want to make sure that the replacement string is as long as the replaced string. - diff --git a/third_party/nixpkgs/lib/types.nix b/third_party/nixpkgs/lib/types.nix index 77105740bc..e9e45dc25c 100644 --- a/third_party/nixpkgs/lib/types.nix +++ b/third_party/nixpkgs/lib/types.nix @@ -499,6 +499,7 @@ rec { show = v: if builtins.isString v then ''"${v}"'' else if builtins.isInt v then builtins.toString v + else if builtins.isBool v then if v then "true" else "false" else ''<${builtins.typeOf v}>''; in mkOptionType rec { diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 7928b6d2ab..8dd51baed5 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -806,6 +806,12 @@ githubId = 574938; name = "Jonathan Glines"; }; + austinbutler = { + email = "austinabutler@gmail.com"; + github = "austinbutler"; + githubId = 354741; + name = "Austin Butler"; + }; avaq = { email = "nixpkgs@account.avaq.it"; github = "avaq"; @@ -3467,6 +3473,12 @@ githubId = 896431; name = "Chris Hodapp"; }; + hongchangwu = { + email = "wuhc85@gmail.com"; + github = "hongchangwu"; + githubId = 362833; + name = "Hongchang Wu"; + }; hrdinka = { email = "c.nix@hrdinka.at"; github = "hrdinka"; @@ -3485,6 +3497,12 @@ githubId = 39689; name = "Hugo Tavares Reis"; }; + hugolgst = { + email = "hugo.lageneste@pm.me"; + github = "hugolgst"; + githubId = 15371828; + name = "Hugo Lageneste"; + }; hyphon81 = { email = "zero812n@gmail.com"; github = "hyphon81"; @@ -4244,6 +4262,12 @@ githubId = 39434424; name = "Felix Springer"; }; + justinlovinger = { + email = "git@justinlovinger.com"; + github = "JustinLovinger"; + githubId = 7183441; + name = "Justin Lovinger"; + }; justinwoo = { email = "moomoowoo@gmail.com"; github = "justinwoo"; @@ -6543,6 +6567,12 @@ githubId = 8641; name = "Pierre Carrier"; }; + penguwin = { + email = "penguwin@penguwin.eu"; + github = "penguwin"; + githubId = 13225611; + name = "Nicolas Martin"; + }; periklis = { email = "theopompos@gmail.com"; github = "periklis"; @@ -8233,6 +8263,12 @@ githubId = 203195; name = "Szczyp"; }; + szlend = { + email = "pub+nix@zlender.si"; + github = "szlend"; + githubId = 7301807; + name = "Simon Žlender"; + }; sztupi = { email = "attila.sztupak@gmail.com"; github = "sztupi"; @@ -9682,4 +9718,36 @@ fingerprint = "F1C5 760E 45B9 9A44 72E9 6BFB D65C 9AFB 4C22 4DA3"; }]; }; + berbiche = { + name = "Nicolas Berbiche"; + email = "nicolas@normie.dev"; + github = "berbiche"; + githubId = 20448408; + keys = [{ + longkeyid = "rsa4096/0xB461292445C6E696"; + fingerprint = "D446 E58D 87A0 31C7 EC15 88D7 B461 2924 45C6 E696"; + }]; + }; + wenngle = { + name = "Zeke Stephens"; + email = "zekestephens@gmail.com"; + github = "wenngle"; + githubId = 63376671; + }; + yanganto = { + name = "Antonio Yang"; + email = "yanganto@gmail.com"; + github = "yanganto"; + githubId = 10803111; + }; + starcraft66 = { + name = "Tristan Gosselin-Hane"; + email = "starcraft66@gmail.com"; + github = "starcraft66"; + githubId = 1858154; + keys = [{ + longkeyid = "rsa4096/0x9D98CDACFF04FD78"; + fingerprint = "8597 4506 EC69 5392 0443 0805 9D98 CDAC FF04 FD78"; + }]; + }; } diff --git a/third_party/nixpkgs/maintainers/scripts/update.nix b/third_party/nixpkgs/maintainers/scripts/update.nix index 9568c6cbbc..5bacf9dda6 100755 --- a/third_party/nixpkgs/maintainers/scripts/update.nix +++ b/third_party/nixpkgs/maintainers/scripts/update.nix @@ -4,6 +4,7 @@ , max-workers ? null , include-overlays ? false , keep-going ? null +, commit ? null }: # TODO: add assert statements @@ -31,30 +32,47 @@ let in [x] ++ nubOn f xs; - packagesWithPath = relativePath: cond: return: pathContent: + /* Recursively find all packages (derivations) in `pkgs` matching `cond` predicate. + + Type: packagesWithPath :: AttrPath → (AttrPath → derivation → bool) → (AttrSet | List) → List + AttrPath :: [str] + + The packages will be returned as a list of named pairs comprising of: + - attrPath: stringified attribute path (based on `rootPath`) + - package: corresponding derivation + */ + packagesWithPath = rootPath: cond: pkgs: let - result = builtins.tryEval pathContent; - - dedupResults = lst: nubOn (pkg: pkg.updateScript) (lib.concatLists lst); - in - if result.success then + packagesWithPathInner = path: pathContent: let - pathContent = result.value; - in - if lib.isDerivation pathContent then - lib.optional (cond relativePath pathContent) (return relativePath pathContent) - else if lib.isAttrs pathContent then - # If user explicitly points to an attrSet or it is marked for recursion, we recur. - if relativePath == [] || pathContent.recurseForDerivations or false || pathContent.recurseForRelease or false then - dedupResults (lib.mapAttrsToList (name: elem: packagesWithPath (relativePath ++ [name]) cond return elem) pathContent) - else [] - else if lib.isList pathContent then - dedupResults (lib.imap0 (i: elem: packagesWithPath (relativePath ++ [i]) cond return elem) pathContent) - else [] - else []; + result = builtins.tryEval pathContent; + dedupResults = lst: nubOn ({ package, attrPath }: package.updateScript) (lib.concatLists lst); + in + if result.success then + let + evaluatedPathContent = result.value; + in + if lib.isDerivation evaluatedPathContent then + lib.optional (cond path evaluatedPathContent) { attrPath = lib.concatStringsSep "." path; package = evaluatedPathContent; } + else if lib.isAttrs evaluatedPathContent then + # If user explicitly points to an attrSet or it is marked for recursion, we recur. + if path == rootPath || evaluatedPathContent.recurseForDerivations or false || evaluatedPathContent.recurseForRelease or false then + dedupResults (lib.mapAttrsToList (name: elem: packagesWithPathInner (path ++ [name]) elem) evaluatedPathContent) + else [] + else if lib.isList evaluatedPathContent then + dedupResults (lib.imap0 (i: elem: packagesWithPathInner (path ++ [i]) elem) evaluatedPathContent) + else [] + else []; + in + packagesWithPathInner rootPath pkgs; + + /* Recursively find all packages (derivations) in `pkgs` matching `cond` predicate. + */ packagesWith = packagesWithPath []; + /* Recursively find all packages in `pkgs` with updateScript by given maintainer. + */ packagesWithUpdateScriptAndMaintainer = maintainer': let maintainer = @@ -63,47 +81,51 @@ let else builtins.getAttr maintainer' lib.maintainers; in - packagesWith (relativePath: pkg: builtins.hasAttr "updateScript" pkg && - (if builtins.hasAttr "maintainers" pkg.meta - then (if builtins.isList pkg.meta.maintainers - then builtins.elem maintainer pkg.meta.maintainers - else maintainer == pkg.meta.maintainers - ) - else false - ) - ) - (relativePath: pkg: pkg) - pkgs; + packagesWith (path: pkg: builtins.hasAttr "updateScript" pkg && + (if builtins.hasAttr "maintainers" pkg.meta + then (if builtins.isList pkg.meta.maintainers + then builtins.elem maintainer pkg.meta.maintainers + else maintainer == pkg.meta.maintainers + ) + else false + ) + ); - packagesWithUpdateScript = path: + /* Recursively find all packages under `path` in `pkgs` with updateScript. + */ + packagesWithUpdateScript = path: pkgs: let - pathContent = lib.attrByPath (lib.splitString "." path) null pkgs; + prefix = lib.splitString "." path; + pathContent = lib.attrByPath prefix null pkgs; in if pathContent == null then builtins.throw "Attribute path `${path}` does not exists." else - packagesWith (relativePath: pkg: builtins.hasAttr "updateScript" pkg) - (relativePath: pkg: pkg) + packagesWithPath prefix (path: pkg: builtins.hasAttr "updateScript" pkg) pathContent; - packageByName = name: + /* Find a package under `path` in `pkgs` and require that it has an updateScript. + */ + packageByName = path: pkgs: let - package = lib.attrByPath (lib.splitString "." name) null pkgs; + package = lib.attrByPath (lib.splitString "." path) null pkgs; in if package == null then - builtins.throw "Package with an attribute name `${name}` does not exists." + builtins.throw "Package with an attribute name `${path}` does not exists." else if ! builtins.hasAttr "updateScript" package then - builtins.throw "Package with an attribute name `${name}` does not have a `passthru.updateScript` attribute defined." + builtins.throw "Package with an attribute name `${path}` does not have a `passthru.updateScript` attribute defined." else - package; + { attrPath = path; inherit package; }; + /* List of packages matched based on the CLI arguments. + */ packages = if package != null then - [ (packageByName package) ] + [ (packageByName package pkgs) ] else if maintainer != null then - packagesWithUpdateScriptAndMaintainer maintainer + packagesWithUpdateScriptAndMaintainer maintainer pkgs else if path != null then - packagesWithUpdateScript path + packagesWithUpdateScript path pkgs else builtins.throw "No arguments provided.\n\n${helpText}"; @@ -132,19 +154,32 @@ let --argstr keep-going true to continue running when a single update fails. + + You can also make the updater automatically commit on your behalf from updateScripts + that support it by adding + + --argstr commit true ''; - packageData = package: { + /* Transform a matched package into an object for update.py. + */ + packageData = { package, attrPath }: { name = package.name; pname = lib.getName package; - updateScript = map builtins.toString (lib.toList package.updateScript); + oldVersion = lib.getVersion package; + updateScript = map builtins.toString (lib.toList (package.updateScript.command or package.updateScript)); + supportedFeatures = package.updateScript.supportedFeatures or []; + attrPath = package.updateScript.attrPath or attrPath; }; + /* JSON file with data for update.py. + */ packagesJson = pkgs.writeText "packages.json" (builtins.toJSON (map packageData packages)); optionalArgs = lib.optional (max-workers != null) "--max-workers=${max-workers}" - ++ lib.optional (keep-going == "true") "--keep-going"; + ++ lib.optional (keep-going == "true") "--keep-going" + ++ lib.optional (commit == "true") "--commit"; args = [ packagesJson ] ++ optionalArgs; diff --git a/third_party/nixpkgs/maintainers/scripts/update.py b/third_party/nixpkgs/maintainers/scripts/update.py index eb7d0ef264..8cc2bcbd67 100644 --- a/third_party/nixpkgs/maintainers/scripts/update.py +++ b/third_party/nixpkgs/maintainers/scripts/update.py @@ -1,23 +1,189 @@ +from __future__ import annotations +from typing import Dict, Generator, List, Optional, Tuple import argparse -import concurrent.futures +import asyncio +import contextlib import json import os +import re import subprocess import sys +import tempfile -updates = {} +class CalledProcessError(Exception): + process: asyncio.subprocess.Process def eprint(*args, **kwargs): print(*args, file=sys.stderr, **kwargs) -def run_update_script(package): +async def check_subprocess(*args, **kwargs): + """ + Emulate check argument of subprocess.run function. + """ + process = await asyncio.create_subprocess_exec(*args, **kwargs) + returncode = await process.wait() + + if returncode != 0: + error = CalledProcessError() + error.process = process + + raise error + + return process + +async def run_update_script(nixpkgs_root: str, merge_lock: asyncio.Lock, temp_dir: Optional[Tuple[str, str]], package: Dict, keep_going: bool): + worktree: Optional[str] = None + + update_script_command = package['updateScript'] + + if temp_dir is not None: + worktree, _branch = temp_dir + + # Update scripts can use $(dirname $0) to get their location but we want to run + # their clones in the git worktree, not in the main nixpkgs repo. + update_script_command = map(lambda arg: re.sub(r'^{0}'.format(re.escape(nixpkgs_root)), worktree, arg), update_script_command) + eprint(f" - {package['name']}: UPDATING ...") - subprocess.run(package['updateScript'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=True) + try: + update_process = await check_subprocess('env', f"UPDATE_NIX_ATTR_PATH={package['attrPath']}", *update_script_command, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE, cwd=worktree) + update_info = await update_process.stdout.read() + await merge_changes(merge_lock, package, update_info, temp_dir) + except KeyboardInterrupt as e: + eprint('Cancelling…') + raise asyncio.exceptions.CancelledError() + except CalledProcessError as e: + eprint(f" - {package['name']}: ERROR") + eprint() + eprint(f"--- SHOWING ERROR LOG FOR {package['name']} ----------------------") + eprint() + stderr = await e.process.stderr.read() + eprint(stderr.decode('utf-8')) + with open(f"{package['pname']}.log", 'wb') as logfile: + logfile.write(stderr) + eprint() + eprint(f"--- SHOWING ERROR LOG FOR {package['name']} ----------------------") -def main(max_workers, keep_going, packages): - with open(sys.argv[1]) as f: + if not keep_going: + raise asyncio.exceptions.CancelledError() + +@contextlib.contextmanager +def make_worktree() -> Generator[Tuple[str, str], None, None]: + with tempfile.TemporaryDirectory() as wt: + branch_name = f'update-{os.path.basename(wt)}' + target_directory = f'{wt}/nixpkgs' + + subprocess.run(['git', 'worktree', 'add', '-b', branch_name, target_directory]) + yield (target_directory, branch_name) + subprocess.run(['git', 'worktree', 'remove', '--force', target_directory]) + subprocess.run(['git', 'branch', '-D', branch_name]) + +async def commit_changes(name: str, merge_lock: asyncio.Lock, worktree: str, branch: str, changes: List[Dict]) -> None: + for change in changes: + # Git can only handle a single index operation at a time + async with merge_lock: + await check_subprocess('git', 'add', *change['files'], cwd=worktree) + commit_message = '{attrPath}: {oldVersion} → {newVersion}'.format(**change) + await check_subprocess('git', 'commit', '--quiet', '-m', commit_message, cwd=worktree) + await check_subprocess('git', 'cherry-pick', branch) + +async def check_changes(package: Dict, worktree: str, update_info: str): + if 'commit' in package['supportedFeatures']: + changes = json.loads(update_info) + else: + changes = [{}] + + # Try to fill in missing attributes when there is just a single change. + if len(changes) == 1: + # Dynamic data from updater take precedence over static data from passthru.updateScript. + if 'attrPath' not in changes[0]: + # update.nix is always passing attrPath + changes[0]['attrPath'] = package['attrPath'] + + if 'oldVersion' not in changes[0]: + # update.nix is always passing oldVersion + changes[0]['oldVersion'] = package['oldVersion'] + + if 'newVersion' not in changes[0]: + attr_path = changes[0]['attrPath'] + obtain_new_version_process = await check_subprocess('nix-instantiate', '--expr', f'with import ./. {{}}; lib.getVersion {attr_path}', '--eval', '--strict', '--json', stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE, cwd=worktree) + changes[0]['newVersion'] = json.loads((await obtain_new_version_process.stdout.read()).decode('utf-8')) + + if 'files' not in changes[0]: + changed_files_process = await check_subprocess('git', 'diff', '--name-only', stdout=asyncio.subprocess.PIPE, cwd=worktree) + changed_files = (await changed_files_process.stdout.read()).splitlines() + changes[0]['files'] = changed_files + + if len(changed_files) == 0: + return [] + + return changes + +async def merge_changes(merge_lock: asyncio.Lock, package: Dict, update_info: str, temp_dir: Optional[Tuple[str, str]]) -> None: + if temp_dir is not None: + worktree, branch = temp_dir + changes = await check_changes(package, worktree, update_info) + + if len(changes) > 0: + await commit_changes(package['name'], merge_lock, worktree, branch, changes) + else: + eprint(f" - {package['name']}: DONE, no changes.") + else: + eprint(f" - {package['name']}: DONE.") + +async def updater(nixpkgs_root: str, temp_dir: Optional[Tuple[str, str]], merge_lock: asyncio.Lock, packages_to_update: asyncio.Queue[Optional[Dict]], keep_going: bool, commit: bool): + while True: + package = await packages_to_update.get() + if package is None: + # A sentinel received, we are done. + return + + if not ('commit' in package['supportedFeatures'] or 'attrPath' in package): + temp_dir = None + + await run_update_script(nixpkgs_root, merge_lock, temp_dir, package, keep_going) + +async def start_updates(max_workers: int, keep_going: bool, commit: bool, packages: List[Dict]): + merge_lock = asyncio.Lock() + packages_to_update: asyncio.Queue[Optional[Dict]] = asyncio.Queue() + + with contextlib.ExitStack() as stack: + temp_dirs: List[Optional[Tuple[str, str]]] = [] + + # Do not create more workers than there are packages. + num_workers = min(max_workers, len(packages)) + + nixpkgs_root_process = await check_subprocess('git', 'rev-parse', '--show-toplevel', stdout=asyncio.subprocess.PIPE) + nixpkgs_root = (await nixpkgs_root_process.stdout.read()).decode('utf-8').strip() + + # Set up temporary directories when using auto-commit. + for i in range(num_workers): + temp_dir = stack.enter_context(make_worktree()) if commit else None + temp_dirs.append(temp_dir) + + # Fill up an update queue, + for package in packages: + await packages_to_update.put(package) + + # Add sentinels, one for each worker. + # A workers will terminate when it gets sentinel from the queue. + for i in range(num_workers): + await packages_to_update.put(None) + + # Prepare updater workers for each temp_dir directory. + # At most `num_workers` instances of `run_update_script` will be running at one time. + updaters = asyncio.gather(*[updater(nixpkgs_root, temp_dir, merge_lock, packages_to_update, keep_going, commit) for temp_dir in temp_dirs]) + + try: + # Start updater workers. + await updaters + except asyncio.exceptions.CancelledError as e: + # When one worker is cancelled, cancel the others too. + updaters.cancel() + +def main(max_workers: int, keep_going: bool, commit: bool, packages_path: str) -> None: + with open(packages_path) as f: packages = json.load(f) eprint() @@ -31,29 +197,7 @@ def main(max_workers, keep_going, packages): eprint() eprint('Running update for:') - with concurrent.futures.ProcessPoolExecutor(max_workers=max_workers) as executor: - for package in packages: - updates[executor.submit(run_update_script, package)] = package - - for future in concurrent.futures.as_completed(updates): - package = updates[future] - - try: - future.result() - eprint(f" - {package['name']}: DONE.") - except subprocess.CalledProcessError as e: - eprint(f" - {package['name']}: ERROR") - eprint() - eprint(f"--- SHOWING ERROR LOG FOR {package['name']} ----------------------") - eprint() - eprint(e.stdout.decode('utf-8')) - with open(f"{package['pname']}.log", 'wb') as f: - f.write(e.stdout) - eprint() - eprint(f"--- SHOWING ERROR LOG FOR {package['name']} ----------------------") - - if not keep_going: - sys.exit(1) + asyncio.run(start_updates(max_workers, keep_going, commit, packages)) eprint() eprint('Packages updated!') @@ -65,15 +209,14 @@ def main(max_workers, keep_going, packages): parser = argparse.ArgumentParser(description='Update packages') parser.add_argument('--max-workers', '-j', dest='max_workers', type=int, help='Number of updates to run concurrently', nargs='?', default=4) parser.add_argument('--keep-going', '-k', dest='keep_going', action='store_true', help='Do not stop after first failure') +parser.add_argument('--commit', '-c', dest='commit', action='store_true', help='Commit the changes') parser.add_argument('packages', help='JSON file containing the list of package names and their update scripts') if __name__ == '__main__': args = parser.parse_args() try: - main(args.max_workers, args.keep_going, args.packages) - except (KeyboardInterrupt, SystemExit) as e: - for update in updates: - update.cancel() - - sys.exit(e.code if isinstance(e, SystemExit) else 130) + main(args.max_workers, args.keep_going, args.commit, args.packages) + except KeyboardInterrupt as e: + # Let’s cancel outside of the main loop too. + sys.exit(130) diff --git a/third_party/nixpkgs/maintainers/scripts/update_redirected_urls.sh b/third_party/nixpkgs/maintainers/scripts/update_redirected_urls.sh new file mode 100755 index 0000000000..b802756559 --- /dev/null +++ b/third_party/nixpkgs/maintainers/scripts/update_redirected_urls.sh @@ -0,0 +1,11 @@ +#! /usr/bin/env nix-shell +#! nix-shell -p bash curl ripgrep jq -i bash + +set -euxo pipefail + +# Possibly also add non-https redirect, but there were non of those when I first +# made this script to test that. Feel free to add it when it is relevant. +curl https://repology.org/api/v1/repository/nix_unstable/problems \ + | jq -r '.[] | select(.type == "homepage_permanent_https_redirect") | .data | "s@\(.url)@\(.target)@"' \ + | sort | uniq | tee script.sed +find -name '*.nix' | xargs -P4 -- sed -f script.sed -i diff --git a/third_party/nixpkgs/nixos/doc/manual/development/building-nixos.xml b/third_party/nixpkgs/nixos/doc/manual/development/building-nixos.xml index 56a596baed..d58b6354d1 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/building-nixos.xml +++ b/third_party/nixpkgs/nixos/doc/manual/development/building-nixos.xml @@ -24,4 +24,10 @@ # mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso + + If you want to customize your NixOS CD in more detail, or generate other kinds + of images, you might want to check out nixos-generators. This can also be a good starting point when you want to use Nix to build a + 'minimal' image that doesn't include a NixOS installation. + diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/installing-from-other-distro.xml b/third_party/nixpkgs/nixos/doc/manual/installation/installing-from-other-distro.xml index 8aac322647..f10a7d6588 100644 --- a/third_party/nixpkgs/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/third_party/nixpkgs/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -47,7 +47,7 @@ Short version: -$ curl https://nixos.org/nix/install | sh +$ curl -L https://nixos.org/nix/install | sh $ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell More details in the diff --git a/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml b/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml index 7dab5c69df..d0ff81c1db 100644 --- a/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml +++ b/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml @@ -52,10 +52,18 @@ - - - - + + + + + + + + + + + + @@ -110,6 +118,11 @@ + + + + + @@ -334,9 +347,23 @@ + + + - - Fetch the latest version of NixOS from the NixOS channel. + + Update the root user's channel named nixos + before rebuilding the system. + + + In addition to the nixos channel, the root + user's channels which have a file named + .update-on-nixos-rebuild in their base + directory will also be updated. + + + Passing updates all of the root + user's channels. @@ -542,7 +569,7 @@ In addition, nixos-rebuild accepts various Nix-related flags, including / , , , - and / + , , and / . See the Nix manual for details. diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1903.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1903.xml index 8ff1681d3b..5593cb3e5d 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1903.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1903.xml @@ -173,7 +173,7 @@ For users of a daemon-less Nix installation on Linux or macOS, you can - upgrade Nix by running curl https://nixos.org/nix/install | + upgrade Nix by running curl -L https://nixos.org/nix/install | sh, or prior to doing a channel update, running nix-env -iA nix. 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 511276bcaa..c50bc58ca4 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 @@ -268,6 +268,11 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; + + + The matrix-synapse module no longer includes optional dependencies by default, they have to be added through the plugins option. + + buildGoModule now internally creates a vendor directory @@ -594,8 +599,8 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; The hostname (networking.hostName) must now be a valid - DNS label (see RFC 1035) and as such must not contain the domain part. - This means that the hostname must start with a letter, end with a letter + DNS label (see RFC 1035, RFC 1123) and as such must not contain the domain part. + This means that the hostname must start with a letter or digit, end with a letter or digit, and have as interior characters only letters, digits, and hyphen. The maximum length is 63 characters. Additionally it is recommended to only use lower-case characters. @@ -834,6 +839,31 @@ CREATE ROLE postgres LOGIN SUPERUSER; functionally redundent. + + + The package nextcloud17 has been removed and nextcloud18 was marked as insecure + since both of them will + will be EOL (end of life) within the lifetime of 20.09. + + + It's necessary to upgrade to nextcloud19: + + + + From nextcloud17, you have to upgrade to nextcloud18 first as + Nextcloud doesn't allow going multiple major revisions forward in a single upgrade. This is possible + by setting to nextcloud18. + + + + + From nextcloud18, it's possible to directly upgrade to nextcloud19 + by setting to nextcloud19. + + + + + diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml index eccf2b69da..26da246076 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml @@ -58,8 +58,18 @@ + + + systemd-journal2gelf no longer parses json and expects the receiving system to handle it. How to achieve this with Graylog is described in this GitHub issue. + + - + + The option has been renamed to + . The path of font directory + has also been changed to /run/current-system/sw/share/X11/fonts, + for consistency with other X11 resources. + @@ -73,7 +83,16 @@ - + + The default-version of nextcloud is nextcloud20. + Please note that it's not possible to upgrade nextcloud + across multiple major versions! This means that it's e.g. not possible to upgrade + from nextcloud18 to nextcloud20 in a single deploy. + + + The package can be manually upgraded by setting + to nextcloud20. + diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix b/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix index a6aa84ae82..264d73ebaf 100644 --- a/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix +++ b/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix @@ -4,15 +4,19 @@ with lib; let + cfg = config.fonts.fontDir; + x11Fonts = pkgs.runCommand "X11-fonts" { preferLocalBuild = true; } '' - mkdir -p "$out/share/X11-fonts" - find ${toString config.fonts.fonts} \ - \( -name fonts.dir -o -name '*.ttf' -o -name '*.otf' \) \ - -exec ln -sf -t "$out/share/X11-fonts" '{}' \; - cd "$out/share/X11-fonts" - rm -f fonts.dir fonts.scale fonts.alias - ${pkgs.xorg.mkfontdir}/bin/mkfontdir + mkdir -p "$out/share/X11/fonts" + font_regexp='.*\.\(ttf\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?' + find ${toString config.fonts.fonts} -regex "$font_regexp" \ + -exec ln -sf -t "$out/share/X11/fonts" '{}' \; + cd "$out/share/X11/fonts" + ${optionalString cfg.decompressFonts '' + ${pkgs.gzip}/bin/gunzip -f *.gz + ''} ${pkgs.xorg.mkfontscale}/bin/mkfontscale + ${pkgs.xorg.mkfontdir}/bin/mkfontdir cat $(find ${pkgs.xorg.fontalias}/ -name fonts.alias) >fonts.alias ''; @@ -21,28 +25,43 @@ in { options = { + fonts.fontDir = { - fonts = { - - enableFontDir = mkOption { + enable = mkOption { type = types.bool; default = false; description = '' Whether to create a directory with links to all fonts in - /run/current-system/sw/share/X11-fonts. + /run/current-system/sw/share/X11/fonts. + ''; + }; + + decompressFonts = mkOption { + type = types.bool; + default = config.programs.xwayland.enable; + description = '' + Whether to decompress fonts in + /run/current-system/sw/share/X11/fonts. ''; }; }; - }; - config = mkIf config.fonts.enableFontDir { + config = mkIf cfg.enable { + # This is enough to make a symlink because the xserver + # module already links all /share/X11 paths. environment.systemPackages = [ x11Fonts ]; - environment.pathsToLink = [ "/share/X11-fonts" ]; + services.xserver.filesSection = '' + FontPath "${x11Fonts}/share/X11/fonts" + ''; }; + imports = [ + (mkRenamedOptionModule [ "fonts" "enableFontDir" ] [ "fonts" "fontDir" "enable" ]) + ]; + } diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix b/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix index b9bae44b2f..3911196c10 100644 --- a/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix +++ b/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix @@ -35,19 +35,21 @@ with lib; config = { fonts.fonts = mkIf config.fonts.enableDefaultFonts - [ - pkgs.xorg.fontbhlucidatypewriter100dpi - pkgs.xorg.fontbhlucidatypewriter75dpi + ([ pkgs.dejavu_fonts pkgs.freefont_ttf pkgs.gyre-fonts # TrueType substitutes for standard PostScript fonts pkgs.liberation_ttf - pkgs.xorg.fontbh100dpi pkgs.xorg.fontmiscmisc pkgs.xorg.fontcursormisc pkgs.unifont pkgs.noto-fonts-emoji - ]; + ] ++ lib.optionals (config.nixpkgs.config.allowUnfree or false) [ + # these are unfree, and will make usage with xserver fail + pkgs.xorg.fontbhlucidatypewriter100dpi + pkgs.xorg.fontbhlucidatypewriter75dpi + pkgs.xorg.fontbh100dpi + ]); }; diff --git a/third_party/nixpkgs/nixos/modules/config/update-users-groups.pl b/third_party/nixpkgs/nixos/modules/config/update-users-groups.pl index e1c7a46e43..e220aa6109 100644 --- a/third_party/nixpkgs/nixos/modules/config/update-users-groups.pl +++ b/third_party/nixpkgs/nixos/modules/config/update-users-groups.pl @@ -281,6 +281,12 @@ foreach my $u (values %usersOut) { } updateFile("/etc/shadow", \@shadowNew, 0600); +{ + my $uid = getpwnam "root"; + my $gid = getgrnam "shadow"; + my $path = "/etc/shadow"; + chown($uid, $gid, $path) || die "Failed to change ownership of $path: $!"; +} # Rewrite /etc/subuid & /etc/subgid to include default container mappings diff --git a/third_party/nixpkgs/nixos/modules/config/users-groups.nix b/third_party/nixpkgs/nixos/modules/config/users-groups.nix index 0ab303d0ae..1bb1317a8e 100644 --- a/third_party/nixpkgs/nixos/modules/config/users-groups.nix +++ b/third_party/nixpkgs/nixos/modules/config/users-groups.nix @@ -537,6 +537,7 @@ in { input.gid = ids.gids.input; kvm.gid = ids.gids.kvm; render.gid = ids.gids.render; + shadow.gid = ids.gids.shadow; }; system.activationScripts.users = stringAfter [ "stdio" ] diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/default.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/default.nix index 9548a249ef..0d6dd3399b 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/default.nix +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/default.nix @@ -29,7 +29,7 @@ in options.i18n = { inputMethod = { enabled = mkOption { - type = types.nullOr (types.enum [ "ibus" "fcitx" "nabi" "uim" ]); + type = types.nullOr (types.enum [ "ibus" "fcitx" "nabi" "uim" "hime" ]); default = null; example = "fcitx"; description = '' @@ -44,6 +44,7 @@ in fcitx: A customizable lightweight input method, extra input engines can be added using i18n.inputMethod.fcitx.engines. nabi: A Korean input method based on XIM. Nabi doesn't support Qt 5. uim: The universal input method, is a library with a XIM bridge. uim mainly support Chinese, Japanese and Korean. + hime: An extremely easy-to-use input method framework. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/default.xml b/third_party/nixpkgs/nixos/modules/i18n/input-method/default.xml index 117482fb0d..e15f666908 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/default.xml +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/default.xml @@ -35,6 +35,11 @@ Uim: The universal input method, is a library with a XIM bridge. + + + Hime: An extremely easy-to-use input method framework. + +
IBus @@ -241,4 +246,24 @@ i18n.inputMethod = { used to choose uim toolbar.
+
+ Hime + + + Hime is an extremely easy-to-use input method framework. It is lightweight, + stable, powerful and supports many commonly used input methods, including + Cangjie, Zhuyin, Dayi, Rank, Shrimp, Greek, Japanese Anthy, Korean Pinyin, + Latin Alphabet, Rancang hunting birds, cool music, etc... + + + + The following snippet can be used to configure Hime: + + + +i18n.inputMethod = { + enabled = "hime"; +}; + +
diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/hime.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/hime.nix new file mode 100644 index 0000000000..a1b346a0f8 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/hime.nix @@ -0,0 +1,28 @@ +{ config, pkgs, ... }: + +with lib; +{ + options = { + i18n.inputMethod.hime = { + enableChewing = mkOption { + type = with types; nullOr bool; + default = null; + description = "enable chewing input method"; + }; + enableAnthy = mkOption { + type = with types; nullOr bool; + default = null; + description = "enable anthy input method"; + }; + }; + }; + + config = mkIf (config.i18n.inputMethod.enabled == "hime") { + environment.variables = { + GTK_IM_MODULE = "hime"; + QT_IM_MODULE = "hime"; + XMODIFIERS = "@im=hime"; + }; + services.xserver.displayManager.sessionCommands = "${pkgs.hime}/bin/hime &"; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl index c8303a6eb6..54b84521bd 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl @@ -628,7 +628,7 @@ EOF write_file($fn, <vi to nvim binary. + ''; + }; + + vimAlias = mkOption { + type = types.bool; + default = false; + description = '' + Symlink vim to nvim binary. + ''; + }; + + withRuby = mkOption { + type = types.bool; + default = true; + description = "Enable ruby provider."; + }; + + configure = mkOption { + type = types.attrs; + default = {}; + example = literalExample '' + configure = { + customRC = $'''' + " here your custom configuration goes! + $''''; + packages.myVimPackage = with pkgs.vimPlugins; { + # loaded on launch + start = [ fugitive ]; + # manually loadable by calling `:packadd $plugin-name` + opt = [ ]; + }; + }; + ''; + description = '' + Generate your init file from your list of plugins and custom commands. + Neovim will then be wrapped to load nvim -u /nix/store/hash-vimrc + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.neovim-unwrapped; + defaultText = literalExample "pkgs.neovim-unwrapped"; + description = "The package to use for the neovim binary."; + }; + + finalPackage = mkOption { + type = types.package; + visible = false; + readOnly = true; + description = "Resulting customized neovim package."; + }; + + runtime = mkOption { + default = {}; + example = literalExample '' + runtime."ftplugin/c.vim".text = "setlocal omnifunc=v:lua.vim.lsp.omnifunc"; + ''; + description = '' + Set of files that have to be linked in runtime. + ''; + + type = with types; attrsOf (submodule ( + { name, config, ... }: + { options = { + + enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether this /etc file should be generated. This + option allows specific /etc files to be disabled. + ''; + }; + + target = mkOption { + type = types.str; + description = '' + Name of symlink. Defaults to the attribute + name. + ''; + }; + + text = mkOption { + default = null; + type = types.nullOr types.lines; + description = "Text of the file."; + }; + + source = mkOption { + type = types.path; + description = "Path of the source file."; + }; + + }; + + config = { + target = mkDefault name; + source = mkIf (config.text != null) ( + let name' = "neovim-runtime" + baseNameOf name; + in mkDefault (pkgs.writeText name' config.text)); + }; + + })); + + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ + cfg.finalPackage + ]; + environment.variables = { EDITOR = mkOverride 900 "nvim"; }; + + programs.neovim.finalPackage = pkgs.wrapNeovim cfg.package { + inherit (cfg) viAlias vimAlias; + configure = cfg.configure // { + + customRC = (cfg.configure.customRC or "") + '' + set runtimepath^=${runtime}/etc + ''; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/programs/sway.nix b/third_party/nixpkgs/nixos/modules/programs/sway.nix index 364debddb0..038d76c6c9 100644 --- a/third_party/nixpkgs/nixos/modules/programs/sway.nix +++ b/third_party/nixpkgs/nixos/modules/programs/sway.nix @@ -86,8 +86,7 @@ in { extraPackages = mkOption { type = with types; listOf package; default = with pkgs; [ - swaylock swayidle - xwayland alacritty dmenu + swaylock swayidle alacritty dmenu rxvt-unicode # For backward compatibility (old default terminal) ]; defaultText = literalExample '' @@ -104,6 +103,7 @@ in { Extra packages to be installed system wide. ''; }; + }; config = mkIf cfg.enable { @@ -130,6 +130,7 @@ in { programs.dconf.enable = mkDefault true; # To make a Sway session available if a display manager like SDDM is enabled: services.xserver.displayManager.sessionPackages = [ swayPackage ]; + programs.xwayland.enable = mkDefault true; }; meta.maintainers = with lib.maintainers; [ gnidorah primeos colemickens ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/xwayland.nix b/third_party/nixpkgs/nixos/modules/programs/xwayland.nix new file mode 100644 index 0000000000..7e9a424a71 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/xwayland.nix @@ -0,0 +1,45 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.xwayland; + +in + +{ + options.programs.xwayland = { + + enable = mkEnableOption '' + Xwayland X server allows running X programs on a Wayland compositor. + ''; + + defaultFontPath = mkOption { + type = types.str; + default = optionalString config.fonts.fontDir.enable + "/run/current-system/sw/share/X11/fonts"; + description = '' + Default font path. Setting this option causes Xwayland to be rebuilt. + ''; + }; + + package = mkOption { + type = types.path; + description = "The Xwayland package"; + }; + + }; + + config = mkIf cfg.enable { + + # Needed by some applications for fonts and default settings + environment.pathsToLink = [ "/share/X11" ]; + + environment.systemPackages = [ cfg.package ]; + + programs.xwayland.package = pkgs.xwayland.override (oldArgs: { + inherit (cfg) defaultFontPath; + }); + + }; +} diff --git a/third_party/nixpkgs/nixos/modules/security/acme.nix b/third_party/nixpkgs/nixos/modules/security/acme.nix index 8e67d4ff87..2d33ca7e79 100644 --- a/third_party/nixpkgs/nixos/modules/security/acme.nix +++ b/third_party/nixpkgs/nixos/modules/security/acme.nix @@ -207,7 +207,7 @@ let renewService = { description = "Renew ACME certificate for ${cert}"; - after = [ "network.target" "network-online.target" "acme-fixperms.service" ] ++ selfsignedDeps; + after = [ "network.target" "network-online.target" "acme-fixperms.service" "nss-lookup.target" ] ++ selfsignedDeps; wants = [ "network-online.target" "acme-fixperms.service" ] ++ selfsignedDeps; # https://github.com/NixOS/nixpkgs/pull/81371#issuecomment-605526099 diff --git a/third_party/nixpkgs/nixos/modules/security/apparmor.nix b/third_party/nixpkgs/nixos/modules/security/apparmor.nix index 2ee10454fd..cfc65b347b 100644 --- a/third_party/nixpkgs/nixos/modules/security/apparmor.nix +++ b/third_party/nixpkgs/nixos/modules/security/apparmor.nix @@ -23,17 +23,11 @@ in default = []; description = "List of packages to be added to apparmor's include path"; }; - parserConfig = mkOption { - type = types.str; - default = ""; - description = "AppArmor parser configuration file content"; - }; }; }; config = mkIf cfg.enable { environment.systemPackages = [ pkgs.apparmor-utils ]; - environment.etc."apparmor/parser.conf".text = cfg.parserConfig; boot.kernelParams = [ "apparmor=1" "security=apparmor" ]; diff --git a/third_party/nixpkgs/nixos/modules/security/pam.nix b/third_party/nixpkgs/nixos/modules/security/pam.nix index 4141a17c50..7ae2680431 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam.nix @@ -429,8 +429,6 @@ let "password sufficient ${pkgs.sssd}/lib/security/pam_sss.so use_authtok"} ${optionalString config.krb5.enable "password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass"} - ${optionalString config.services.samba.syncPasswordsByPam - "password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"} ${optionalString cfg.enableGnomeKeyring "password optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so use_authtok"} diff --git a/third_party/nixpkgs/nixos/modules/security/sudo.nix b/third_party/nixpkgs/nixos/modules/security/sudo.nix index 1ed5269c5a..cc3ff3d11b 100644 --- a/third_party/nixpkgs/nixos/modules/security/sudo.nix +++ b/third_party/nixpkgs/nixos/modules/security/sudo.nix @@ -42,6 +42,15 @@ in ''; }; + security.sudo.package = mkOption { + type = types.package; + default = pkgs.sudo; + defaultText = "pkgs.sudo"; + description = '' + Which package to use for `sudo`. + ''; + }; + security.sudo.wheelNeedsPassword = mkOption { type = types.bool; default = true; @@ -208,8 +217,8 @@ in ''; security.wrappers = { - sudo.source = "${pkgs.sudo.out}/bin/sudo"; - sudoedit.source = "${pkgs.sudo.out}/bin/sudoedit"; + sudo.source = "${cfg.package.out}/bin/sudo"; + sudoedit.source = "${cfg.package.out}/bin/sudoedit"; }; environment.systemPackages = [ sudo ]; diff --git a/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix b/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix index 2def74f853..52de21bca9 100644 --- a/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix +++ b/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix @@ -169,7 +169,7 @@ in boot.specialFileSystems.${parentWrapperDir} = { fsType = "tmpfs"; - options = [ "nodev" ]; + options = [ "nodev" "mode=755" ]; }; # Make sure our wrapperDir exports to the PATH env variable when @@ -187,6 +187,8 @@ in # programs to be wrapped. WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin + chmod 755 "${parentWrapperDir}" + # We want to place the tmpdirs for the wrappers to the parent dir. wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX) chmod a+rx $wrapperDir @@ -197,6 +199,9 @@ in # Atomically replace the symlink # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/ old=$(readlink -f ${wrapperDir}) + if [ -e ${wrapperDir}-tmp ]; then + rm --force --recursive ${wrapperDir}-tmp + fi ln --symbolic --force --no-dereference $wrapperDir ${wrapperDir}-tmp mv --no-target-directory ${wrapperDir}-tmp ${wrapperDir} rm --force --recursive $old diff --git a/third_party/nixpkgs/nixos/modules/services/databases/cassandra.nix b/third_party/nixpkgs/nixos/modules/services/databases/cassandra.nix index 90c094f68b..d55a7db391 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/cassandra.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/cassandra.nix @@ -38,13 +38,18 @@ let cassandraYaml = builtins.toJSON cassandraConfigWithAddresses; cassandraEnvPkg = "${cfg.package}/conf/cassandra-env.sh"; cassandraLogbackConfig = pkgs.writeText "logback.xml" cfg.logbackConfig; + passAsFile = [ "extraEnvSh" ]; + inherit (cfg) extraEnvSh; buildCommand = '' mkdir -p "$out" echo "$cassandraYaml" > "$out/cassandra.yaml" ln -s "$cassandraLogbackConfig" "$out/logback.xml" - cp "$cassandraEnvPkg" "$out/cassandra-env.sh" + ( cat "$cassandraEnvPkg" + echo "# lines from services.cassandra.extraEnvSh: " + cat "$extraEnvShPath" + ) > "$out/cassandra-env.sh" # Delete default JMX Port, otherwise we can't set it using env variable sed -i '/JMX_PORT="7199"/d' "$out/cassandra-env.sh" @@ -224,6 +229,14 @@ in { Extra options to be merged into cassandra.yaml as nix attribute set. ''; }; + extraEnvSh = mkOption { + type = types.lines; + default = ""; + example = "CLASSPATH=$CLASSPATH:\${extraJar}"; + description = '' + Extra shell lines to be appended onto cassandra-env.sh. + ''; + }; fullRepairInterval = mkOption { type = types.nullOr types.str; default = "3w"; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix b/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix index c166ef68f2..f5c5f795dc 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix @@ -84,11 +84,9 @@ let ( optionalString (cfg.mailboxes != {}) '' - protocol imap { - namespace inbox { - inbox=yes - ${concatStringsSep "\n" (map mailboxConfig (attrValues cfg.mailboxes))} - } + namespace inbox { + inbox=yes + ${concatStringsSep "\n" (map mailboxConfig (attrValues cfg.mailboxes))} } '' ) diff --git a/third_party/nixpkgs/nixos/modules/services/mail/sympa.nix b/third_party/nixpkgs/nixos/modules/services/mail/sympa.nix index 0cad09927b..491b6dba9a 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/sympa.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/sympa.nix @@ -513,10 +513,6 @@ in include ${config.services.nginx.package}/conf/fastcgi_params; fastcgi_pass unix:/run/sympa/wwsympa.socket; - fastcgi_split_path_info ^(${loc})(.*)$; - - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME ${pkg}/lib/sympa/cgi/wwsympa.fcgi; ''; }) // { "/static-sympa/".alias = "${dataDir}/static_content/"; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix b/third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix index 3eb1073387..7f42184735 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix @@ -131,7 +131,12 @@ in { plugins = mkOption { type = types.listOf types.package; default = [ ]; - defaultText = "with config.services.matrix-synapse.package.plugins [ matrix-synapse-ldap3 matrix-synapse-pam ]"; + example = literalExample '' + with config.services.matrix-synapse.package.plugins; [ + matrix-synapse-ldap3 + matrix-synapse-pam + ]; + ''; description = '' List of additional Matrix plugins to make available. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix index 673bc7b02b..d97565f15d 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix @@ -6,7 +6,6 @@ let cfg = config.services.datadog-agent; ddConf = { - dd_url = cfg.ddUrl; skip_ssl_validation = false; confd_path = "/etc/datadog-agent/conf.d"; additional_checksd = "/etc/datadog-agent/checks.d"; @@ -14,6 +13,8 @@ let } // optionalAttrs (cfg.logLevel != null) { log_level = cfg.logLevel; } // optionalAttrs (cfg.hostname != null) { inherit (cfg) hostname; } + // optionalAttrs (cfg.ddUrl != null) { dd_url = cfg.ddUrl; } + // optionalAttrs (cfg.site != null) { site = cfg.site; } // optionalAttrs (cfg.tags != null ) { tags = concatStringsSep ", " cfg.tags; } // optionalAttrs (cfg.enableLiveProcessCollection) { process_config = { enabled = "true"; }; } // optionalAttrs (cfg.enableTraceAgent) { apm_config = { enabled = true; }; } @@ -79,14 +80,23 @@ in { ddUrl = mkOption { description = '' - Custom dd_url to configure the agent with. - Useful when you want to point datadog to another endpoint, either - because you need a proxy to send out data, or because you use their EU - endpoint. + Custom dd_url to configure the agent with. Useful if traffic to datadog + needs to go through a proxy. + Don't use this to point to another datadog site (EU) - use site instead. ''; - default = "https://app.datadoghq.com"; - example = "https://app.datadoghq.eu"; - type = types.str; + default = null; + example = "http://haproxy.example.com:3834"; + type = types.nullOr types.str; + }; + + site = mkOption { + description = '' + The datadog site to point the agent towards. + Set to datadoghq.eu to point it to their EU site. + ''; + default = null; + example = "datadoghq.eu"; + type = types.nullOr types.str; }; tags = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix index bfd4951ef4..98aaa9c0f0 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix @@ -49,8 +49,8 @@ let "--web.listen-address=${cfg.listenAddress}:${builtins.toString cfg.port}" "--alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}" "--alertmanager.timeout=${toString cfg.alertmanagerTimeout}s" - ] ++ - optional (cfg.webExternalUrl != null) "--web.external-url=${cfg.webExternalUrl}"; + ] ++ optional (cfg.webExternalUrl != null) "--web.external-url=${cfg.webExternalUrl}" + ++ optional (cfg.retentionTime != null) "--storage.tsdb.retention.time=${cfg.retentionTime}"; filterValidPrometheus = filterAttrsListRecursive (n: v: !(n == "_module" || v == null)); filterAttrsListRecursive = pred: x: @@ -624,6 +624,15 @@ in { errors, despite a correct configuration. ''; }; + + retentionTime = mkOption { + type = types.nullOr types.str; + default = null; + example = "15d"; + description = '' + How long to retain samples in storage. + ''; + }; }; config = mkIf cfg.enable { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix index cc71451bf2..1233e5cdd1 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -38,6 +38,7 @@ let "nextcloud" "nginx" "node" + "openvpn" "postfix" "postgres" "redis" @@ -101,7 +102,6 @@ let default = "${name}-exporter"; description = '' User name under which the ${name} exporter shall be run. - Has no effect when is true. ''; }; group = mkOption { @@ -109,7 +109,6 @@ let default = "${name}-exporter"; description = '' Group under which the ${name} exporter shall be run. - Has no effect when is true. ''; }; }); @@ -161,10 +160,9 @@ let serviceConfig.PrivateTmp = mkDefault true; serviceConfig.WorkingDirectory = mkDefault /tmp; serviceConfig.DynamicUser = mkDefault enableDynamicUser; - } serviceOpts ] ++ optional (!enableDynamicUser) { serviceConfig.User = conf.user; serviceConfig.Group = conf.group; - }); + } serviceOpts ]); }; in { @@ -229,6 +227,8 @@ in })] ++ [(mkIf config.services.nginx.enable { systemd.services.prometheus-nginx-exporter.after = [ "nginx.service" ]; systemd.services.prometheus-nginx-exporter.requires = [ "nginx.service" ]; + })] ++ [(mkIf config.services.postfix.enable { + services.prometheus.exporters.postfix.group = mkDefault config.services.postfix.setgidGroup; })] ++ (mapAttrsToList (name: conf: mkExporterConf { inherit name; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/openvpn.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/openvpn.nix new file mode 100644 index 0000000000..a97a753ebc --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/openvpn.nix @@ -0,0 +1,39 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.exporters.openvpn; +in { + port = 9176; + extraOpts = { + statusPaths = mkOption { + type = types.listOf types.str; + description = '' + Paths to OpenVPN status files. Please configure the OpenVPN option + status accordingly. + ''; + }; + telemetryPath = mkOption { + type = types.str; + default = "/metrics"; + description = '' + Path under which to expose metrics. + ''; + }; + }; + + serviceOpts = { + serviceConfig = { + PrivateDevices = true; + ProtectKernelModules = true; + NoNewPrivileges = true; + ExecStart = '' + ${pkgs.prometheus-openvpn-exporter}/bin/openvpn_exporter \ + -openvpn.status_paths "${concatStringsSep "," cfg.statusPaths}" \ + -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + -web.telemetry-path ${cfg.telemetryPath} + ''; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix index 3b6ef1631f..f57589a59c 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix @@ -8,6 +8,15 @@ in { port = 9154; extraOpts = { + group = mkOption { + type = types.str; + description = '' + Group under which the postfix exporter shall be run. + It should match the group that is allowed to access the + showq socket in the queue/public/ directory. + Defaults to services.postfix.setgidGroup when postfix is enabled. + ''; + }; telemetryPath = mkOption { type = types.str; default = "/metrics"; @@ -26,16 +35,20 @@ in }; showqPath = mkOption { type = types.path; - default = "/var/spool/postfix/public/showq"; - example = "/var/lib/postfix/queue/public/showq"; + default = "/var/lib/postfix/queue/public/showq"; + example = "/var/spool/postfix/public/showq"; description = '' - Path where Postfix places it's showq socket. + Path where Postfix places its showq socket. ''; }; systemd = { - enable = mkEnableOption '' - reading metrics from the systemd-journal instead of from a logfile - ''; + enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable reading metrics from the systemd journal instead of from a logfile + ''; + }; unit = mkOption { type = types.str; default = "postfix.service"; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/rsyncd.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/rsyncd.nix index fa29e18a93..9f1263ddff 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/rsyncd.nix @@ -3,120 +3,76 @@ with lib; let - cfg = config.services.rsyncd; - - motdFile = builtins.toFile "rsyncd-motd" cfg.motd; - - foreach = attrs: f: - concatStringsSep "\n" (mapAttrsToList f attrs); - - cfgFile = '' - ${optionalString (cfg.motd != "") "motd file = ${motdFile}"} - ${optionalString (cfg.address != "") "address = ${cfg.address}"} - ${optionalString (cfg.port != 873) "port = ${toString cfg.port}"} - ${cfg.extraConfig} - ${foreach cfg.modules (name: module: '' - [${name}] - ${foreach module (k: v: - "${k} = ${v}" - )} - '')} - ''; -in - -{ + settingsFormat = pkgs.formats.ini { }; + configFile = settingsFormat.generate "rsyncd.conf" cfg.settings; +in { options = { services.rsyncd = { enable = mkEnableOption "the rsync daemon"; - motd = mkOption { - type = types.str; - default = ""; - description = '' - Message of the day to display to clients on each connect. - This usually contains site information and any legal notices. - ''; - }; - port = mkOption { default = 873; - type = types.int; + type = types.port; description = "TCP port the daemon will listen on."; }; - address = mkOption { - default = ""; - example = "192.168.1.2"; + settings = mkOption { + inherit (settingsFormat) type; + default = { }; + example = { + global = { + uid = "nobody"; + gid = "nobody"; + "use chroot" = true; + "max connections" = 4; + }; + ftp = { + path = "/var/ftp/./pub"; + comment = "whole ftp area"; + }; + cvs = { + path = "/data/cvs"; + comment = "CVS repository (requires authentication)"; + "auth users" = [ "tridge" "susan" ]; + "secrets file" = "/etc/rsyncd.secrets"; + }; + }; description = '' - IP address the daemon will listen on; rsyncd will listen on - all addresses if this is not specified. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Lines of configuration to add to rsyncd globally. - See man rsyncd.conf for options. - ''; - }; - - modules = mkOption { - default = {}; - description = '' - A set describing exported directories. - See man rsyncd.conf for options. - ''; - type = types.attrsOf (types.attrsOf types.str); - example = literalExample '' - { srv = - { path = "/srv"; - "read only" = "yes"; - comment = "Public rsync share."; - }; - } - ''; - }; - - user = mkOption { - type = types.str; - default = "root"; - description = '' - The user to run the daemon as. - By default the daemon runs as root. - ''; - }; - - group = mkOption { - type = types.str; - default = "root"; - description = '' - The group to run the daemon as. - By default the daemon runs as root. + Configuration for rsyncd. See + rsyncd.conf + 5. ''; }; }; }; - ###### implementation + imports = (map (option: + mkRemovedOptionModule [ "services" "rsyncd" option ] + "This option was removed in favor of `services.rsyncd.settings`.") [ + "address" + "extraConfig" + "motd" + "user" + "group" + ]); config = mkIf cfg.enable { - environment.etc."rsyncd.conf".text = cfgFile; + services.rsyncd.settings.global.port = toString cfg.port; systemd.services.rsyncd = { description = "Rsync daemon"; wantedBy = [ "multi-user.target" ]; - restartTriggers = [ config.environment.etc."rsyncd.conf".source ]; - serviceConfig = { - ExecStart = "${pkgs.rsync}/bin/rsync --daemon --no-detach"; - User = cfg.user; - Group = cfg.group; - }; + serviceConfig.ExecStart = + "${pkgs.rsync}/bin/rsync --daemon --no-detach --config=${configFile}"; }; }; + + meta.maintainers = with lib.maintainers; [ ehmry ]; + + # TODO: socket activated rsyncd + } diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba.nix index 7d3c601d6c..d6e2904b3c 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba.nix @@ -26,7 +26,6 @@ let [global] security = ${cfg.securityType} passwd program = /run/wrappers/bin/passwd %u - pam password change = ${smbToString cfg.syncPasswordsByPam} invalid users = ${smbToString cfg.invalidUsers} ${cfg.extraConfig} @@ -67,6 +66,7 @@ in { imports = [ (mkRemovedOptionModule [ "services" "samba" "defaultShare" ] "") + (mkRemovedOptionModule [ "services" "samba" "syncPasswordsByPam" ] "This option has been removed by upstream, see https://bugzilla.samba.org/show_bug.cgi?id=10669#c10") ]; ###### interface @@ -124,18 +124,6 @@ in ''; }; - syncPasswordsByPam = mkOption { - type = types.bool; - default = false; - description = '' - Enabling this will add a line directly after pam_unix.so. - Whenever a password is changed the samba password will be updated as well. - However, you still have to add the samba password once, using smbpasswd -a user. - If you don't want to maintain an extra password database, you still can send plain text - passwords which is not secure. - ''; - }; - invalidUsers = mkOption { type = types.listOf types.str; default = [ "root" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix index 28691e8382..dda6121221 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix @@ -11,7 +11,7 @@ in settings = mkOption { description = '' Attrset that is converted and passed as TOML config file. - For available params, see: + For available params, see: ''; example = literalExample '' { @@ -49,13 +49,51 @@ in networking.nameservers = lib.mkDefault [ "127.0.0.1" ]; systemd.services.dnscrypt-proxy2 = { - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; + description = "DNSCrypt-proxy client"; + wants = [ + "network-online.target" + "nss-lookup.target" + ]; + before = [ + "nss-lookup.target" + ]; + wantedBy = [ + "multi-user.target" + ]; serviceConfig = { AmbientCapabilities = "CAP_NET_BIND_SERVICE"; + CacheDirectory = "dnscrypt-proxy"; DynamicUser = true; ExecStart = "${pkgs.dnscrypt-proxy2}/bin/dnscrypt-proxy -config ${cfg.configFile}"; + LockPersonality = true; + LogsDirectory = "dnscrypt-proxy"; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + NonBlocking = true; + PrivateDevices = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; Restart = "always"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RuntimeDirectory = "dnscrypt-proxy"; + StateDirectory = "dnscrypt-proxy"; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "@chown" + "~@resources" + "@privileged" + ]; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix b/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix index ec9d9753cf..cb75142965 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix @@ -99,7 +99,7 @@ in config = mkIf cfg.enable { assertions = [{ assertion = config.networking.firewall.enable == false; - message = "You can not use nftables with services.networking.firewall."; + message = "You can not use nftables and iptables at the same time. networking.firewall.enable must be set to false."; }]; boot.blacklistedKernelModules = [ "ip_tables" ]; environment.systemPackages = [ pkgs.nftables ]; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/moodle.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/moodle.nix index f45eaa24d5..8887136ea5 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/moodle.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/moodle.nix @@ -57,7 +57,7 @@ let pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql"; phpExt = pkgs.php.withExtensions - ({ enabled, all }: with all; [ iconv mbstring curl openssl tokenizer xmlrpc soap ctype zip gd simplexml dom intl json sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo ]); + ({ enabled, all }: with all; [ iconv mbstring curl openssl tokenizer xmlrpc soap ctype zip gd simplexml dom intl json sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo filter ]); in { # interface 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 7da119758f..bf65189f6a 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix @@ -85,7 +85,7 @@ in { package = mkOption { type = types.package; description = "Which package to use for the Nextcloud instance."; - relatedPackages = [ "nextcloud17" "nextcloud18" "nextcloud19" ]; + relatedPackages = [ "nextcloud18" "nextcloud19" "nextcloud20" ]; }; maxUploadSize = mkOption { @@ -330,37 +330,28 @@ in { } ]; - warnings = [] - ++ (optional (cfg.poolConfig != null) '' + warnings = let + latest = 20; + upgradeWarning = major: nixos: + '' + A legacy Nextcloud install (from before NixOS ${nixos}) may be installed. + + After nextcloud${toString major} is installed successfully, you can safely upgrade + to ${toString (major + 1)}. The latest version available is nextcloud${toString latest}. + + Please note that Nextcloud doesn't support upgrades across multiple major versions + (i.e. an upgrade from 16 is possible to 17, but not 16 to 18). + + The package can be upgraded by explicitly declaring the service-option + `services.nextcloud.package`. + ''; + in (optional (cfg.poolConfig != null) '' Using config.services.nextcloud.poolConfig is deprecated and will become unsupported in a future release. Please migrate your configuration to config.services.nextcloud.poolSettings. '') - ++ (optional (versionOlder cfg.package.version "18") '' - A legacy Nextcloud install (from before NixOS 20.03) may be installed. - - You're currently deploying an older version of Nextcloud. This may be needed - since Nextcloud doesn't allow major version upgrades that skip multiple - versions (i.e. an upgrade from 16 is possible to 17, but not 16 to 18). - - It is assumed that Nextcloud will be upgraded from version 16 to 17. - - * If this is a fresh install, there will be no upgrade to do now. - - * If this server already had Nextcloud installed, first deploy this to your - server, and wait until the upgrade to 17 is finished. - - Then, set `services.nextcloud.package` to `pkgs.nextcloud18` to upgrade to - Nextcloud version 18. Please note that Nextcloud 19 is already out and it's - recommended to upgrade to nextcloud19 after that. - '') - ++ (optional (versionOlder cfg.package.version "19") '' - A legacy Nextcloud install (from before NixOS 20.09/unstable) may be installed. - - If/After nextcloud18 is installed successfully, you can safely upgrade to - nextcloud19. If not, please upgrade to nextcloud18 first since Nextcloud doesn't - support upgrades that skip multiple versions (i.e. an upgrade from 17 to 19 isn't - possible, but an upgrade from 18 to 19). - ''); + ++ (optional (versionOlder cfg.package.version "18") (upgradeWarning 17 "20.03")) + ++ (optional (versionOlder cfg.package.version "19") (upgradeWarning 18 "20.09")) + ++ (optional (versionOlder cfg.package.version "20") (upgradeWarning 19 "21.03")); services.nextcloud.package = with pkgs; mkDefault ( @@ -372,7 +363,8 @@ in { '' else if versionOlder stateVersion "20.03" then nextcloud17 else if versionOlder stateVersion "20.09" then nextcloud18 - else nextcloud19 + else if versionOlder stateVersion "21.03" then nextcloud19 + else nextcloud20 ); } @@ -435,7 +427,7 @@ in { then ''"$(<"${toString c.dbpassFile}")"'' else if c.dbpass != null then ''"${toString c.dbpass}"'' - else null; + else ''""''; adminpass = if c.adminpassFile != null then ''"$(<"${toString c.adminpassFile}")"'' else ''"${toString c.adminpass}"''; @@ -449,8 +441,7 @@ in { ${if c.dbhost != null then "--database-host" else null} = ''"${c.dbhost}"''; ${if c.dbport != null then "--database-port" else null} = ''"${toString c.dbport}"''; ${if c.dbuser != null then "--database-user" else null} = ''"${c.dbuser}"''; - ${if (any (x: x != null) [c.dbpass c.dbpassFile]) - then "--database-pass" else null} = dbpass; + "--database-pass" = dbpass; ${if c.dbtableprefix != null then "--database-table-prefix" else null} = ''"${toString c.dbtableprefix}"''; "--admin-user" = ''"${c.adminuser}"''; @@ -542,7 +533,10 @@ in { environment.systemPackages = [ occ ]; services.nginx.enable = mkDefault true; - services.nginx.virtualHosts.${cfg.hostName} = { + + services.nginx.virtualHosts.${cfg.hostName} = let + major = toInt (versions.major cfg.package.version); + in { root = cfg.package; locations = { "= /robots.txt" = { @@ -555,7 +549,9 @@ in { }; "/" = { priority = 900; - extraConfig = "try_files $uri $uri/ /index.php$request_uri;"; + extraConfig = if major < 20 + then "rewrite ^ /index.php;" + else "try_files $uri $uri/ /index.php$request_uri;"; }; "~ ^/store-apps" = { priority = 201; @@ -579,7 +575,7 @@ in { "~ ^/(?:\\.|autotest|occ|issue|indie|db_|console)".extraConfig = '' return 404; ''; - "~ \\.php(?:$|/)" = { + ${if major < 20 then "~ ^\\/(?:index|remote|public|cron|core\\/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|oc[ms]-provider\\/.+|.+\\/richdocumentscode\\/proxy)\\.php(?:$|\\/)" else "~ \\.php(?:$|/)"} = { priority = 500; extraConfig = '' include ${config.services.nginx.package}/conf/fastcgi.conf; 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 6dd1c85132..6ffda3d636 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 @@ -693,9 +693,6 @@ in services.httpd.phpOptions = '' - ; Needed for PHP's mail() function. - sendmail_path = ${pkgs.system-sendmail}/bin/sendmail -t -i - ; Don't advertise PHP expose_php = off '' + optionalString (config.time.timeZone != null) '' diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/caddy.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy.nix index dda26fe491..72bf9a9a1f 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/caddy.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy.nix @@ -6,8 +6,6 @@ let cfg = config.services.caddy; configFile = pkgs.writeText "Caddyfile" cfg.config; - # v2-specific options - isCaddy2 = versionAtLeast cfg.package.version "2.0"; tlsConfig = { apps.tls.automation.policies = [{ issuer = { @@ -50,7 +48,7 @@ in { example = "nginx"; type = types.str; description = '' - Name of the config adapter to use. Not applicable to Caddy v1. + Name of the config adapter to use. See https://caddyserver.com/docs/config-adapters for the full list. ''; }; @@ -90,11 +88,10 @@ in { package = mkOption { default = pkgs.caddy; defaultText = "pkgs.caddy"; - example = "pkgs.caddy1"; + example = "pkgs.caddy"; type = types.package; description = '' Caddy package to use. - To use Caddy v1 (obsolete), set this to pkgs.caddy1. ''; }; }; @@ -106,21 +103,9 @@ in { after = [ "network-online.target" ]; wants = [ "network-online.target" ]; # systemd-networkd-wait-online.service wantedBy = [ "multi-user.target" ]; - environment = mkIf (versionAtLeast config.system.stateVersion "17.09" && !isCaddy2) - { CADDYPATH = cfg.dataDir; }; serviceConfig = { - ExecStart = if isCaddy2 then '' - ${cfg.package}/bin/caddy run --config ${configJSON} - '' else '' - ${cfg.package}/bin/caddy -log stdout -log-timestamps=false \ - -root=/var/tmp -conf=${configFile} \ - -ca=${cfg.ca} -email=${cfg.email} ${optionalString cfg.agree "-agree"} - ''; - ExecReload = - if isCaddy2 then - "${cfg.package}/bin/caddy reload --config ${configJSON}" - else - "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; + ExecStart = "${cfg.package}/bin/caddy run --config ${configJSON}"; + ExecReload = "${cfg.package}/bin/caddy reload --config ${configJSON}"; Type = "simple"; User = "caddy"; Group = "caddy"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/molly-brown.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/molly-brown.nix index e9052a184b..e0587f3b47 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/molly-brown.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/molly-brown.nix @@ -4,23 +4,8 @@ with lib; let cfg = config.services.molly-brown; - - settingsType = with types; - attrsOf (oneOf [ - int - str - (listOf str) - (attrsOf (oneOf [ int str (listOf str) (attrsOf str) ])) - ]) // { - description = "primitive expression convertable to TOML"; - }; - - configFile = pkgs.runCommand "molly-brown.toml" { - buildInputs = [ pkgs.remarshal ]; - preferLocalBuild = true; - passAsFile = [ "settings" ]; - settings = builtins.toJSON cfg.settings; - } "remarshal -if json -of toml < $settingsPath > $out"; + settingsFormat = pkgs.formats.toml { }; + configFile = settingsFormat.generate "molly-brown.toml" cfg.settings; in { options.services.molly-brown = { @@ -76,7 +61,7 @@ in { }; settings = mkOption { - type = settingsType; + inherit (settingsFormat) type; default = { }; description = '' molly-brown configuration. Refer to diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/phpfpm/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/phpfpm/default.nix index 759eebf768..4d302299f5 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/phpfpm/default.nix @@ -26,12 +26,9 @@ let phpIni = poolOpts: pkgs.runCommand "php.ini" { inherit (poolOpts) phpPackage phpOptions; preferLocalBuild = true; - nixDefaults = '' - sendmail_path = "/run/wrappers/bin/sendmail -t -i" - ''; - passAsFile = [ "nixDefaults" "phpOptions" ]; + passAsFile = [ "phpOptions" ]; } '' - cat ${poolOpts.phpPackage}/etc/php.ini $nixDefaultsPath $phpOptionsPath > $out + cat ${poolOpts.phpPackage}/etc/php.ini $phpOptionsPath > $out ''; poolOpts = { name, ... }: diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix index 69cf983217..a4edcca72c 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -53,6 +53,8 @@ let flashbackEnabled = cfg.flashback.enableMetacity || length cfg.flashback.customSessions > 0; + notExcluded = pkg: mkDefault (!(lib.elem pkg config.environment.gnome3.excludePackages)); + in { @@ -68,6 +70,38 @@ in core-shell.enable = mkEnableOption "GNOME Shell services"; core-utilities.enable = mkEnableOption "GNOME core utilities"; games.enable = mkEnableOption "GNOME games"; + + experimental-features = { + realtime-scheduling = mkOption { + type = types.bool; + default = false; + description = '' + Makes mutter (which propagates to gnome-shell) request a low priority real-time + scheduling which is only available on the wayland session. + To enable this experimental feature it requires a restart of the compositor. + Note that enabling this option only enables the capability + for realtime-scheduling to be used. It doesn't automatically set the gsetting + so that mutter actually uses realtime-scheduling. This would require adding + rt-scheduler to /org/gnome/mutter/experimental-features + with dconf-editor. You cannot use extraGSettingsOverrides because that will only + change the default value of the setting. + + Please be aware of these known issues with the feature in nixos: + + + + NixOS/nixpkgs#90201 + + + + + NixOS/nixpkgs#86730 + + + + ''; + }; + }; }; services.xserver.desktopManager.gnome3 = { @@ -289,26 +323,6 @@ in source-sans-pro ]; - ## Enable soft realtime scheduling, only supported on wayland ## - - security.wrappers.".gnome-shell-wrapped" = { - source = "${pkgs.gnome3.gnome-shell}/bin/.gnome-shell-wrapped"; - capabilities = "cap_sys_nice=ep"; - }; - - systemd.user.services.gnome-shell-wayland = let - gnomeShellRT = with pkgs.gnome3; pkgs.runCommand "gnome-shell-rt" {} '' - mkdir -p $out/bin/ - cp ${gnome-shell}/bin/gnome-shell $out/bin - sed -i "s@${gnome-shell}/bin/@${config.security.wrapperDir}/@" $out/bin/gnome-shell - ''; - in { - # Note we need to clear ExecStart before overriding it - serviceConfig.ExecStart = ["" "${gnomeShellRT}/bin/gnome-shell"]; - # Do not use the default environment, it provides a broken PATH - environment = mkForce {}; - }; - # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-36/elements/core/meta-gnome-core-shell.bst environment.systemPackages = with pkgs.gnome3; [ adwaita-icon-theme @@ -333,6 +347,27 @@ in ]; }) + # Enable soft realtime scheduling, only supported on wayland + (mkIf serviceCfg.experimental-features.realtime-scheduling { + security.wrappers.".gnome-shell-wrapped" = { + source = "${pkgs.gnome3.gnome-shell}/bin/.gnome-shell-wrapped"; + capabilities = "cap_sys_nice=ep"; + }; + + systemd.user.services.gnome-shell-wayland = let + gnomeShellRT = with pkgs.gnome3; pkgs.runCommand "gnome-shell-rt" {} '' + mkdir -p $out/bin/ + cp ${gnome-shell}/bin/gnome-shell $out/bin + sed -i "s@${gnome-shell}/bin/@${config.security.wrapperDir}/@" $out/bin/gnome-shell + ''; + in { + # Note we need to clear ExecStart before overriding it + serviceConfig.ExecStart = ["" "${gnomeShellRT}/bin/gnome-shell"]; + # Do not use the default environment, it provides a broken PATH + environment = mkForce {}; + }; + }) + # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-36/elements/core/meta-gnome-core-utilities.bst (mkIf serviceCfg.core-utilities.enable { environment.systemPackages = (with pkgs.gnome3; removePackagesByName [ @@ -363,14 +398,17 @@ in /* gnome-boxes */ ] config.environment.gnome3.excludePackages); - # Enable default programs - programs.evince.enable = mkDefault true; - programs.file-roller.enable = mkDefault true; - programs.geary.enable = mkDefault true; - programs.gnome-disks.enable = mkDefault true; - programs.gnome-terminal.enable = mkDefault true; - programs.seahorse.enable = mkDefault true; - services.gnome3.sushi.enable = mkDefault true; + # Enable default program modules + # Since some of these have a corresponding package, we only + # enable that program module if the package hasn't been excluded + # through `environment.gnome3.excludePackages` + programs.evince.enable = notExcluded pkgs.gnome3.evince; + programs.file-roller.enable = notExcluded pkgs.gnome3.file-roller; + programs.geary.enable = notExcluded pkgs.gnome3.geary; + programs.gnome-disks.enable = notExcluded pkgs.gnome3.gnome-disk-utility; + programs.gnome-terminal.enable = notExcluded pkgs.gnome3.gnome-terminal; + programs.seahorse.enable = notExcluded pkgs.gnome3.seahorse; + services.gnome3.sushi.enable = notExcluded pkgs.gnome3.sushi; # Let nautilus find extensions # TODO: Create nautilus-with-extensions package diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix index 149f6cbb76..e48b5f23b5 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -274,6 +274,7 @@ in plasma-browser-integration plasma-integration polkit-kde-agent + spectacle systemsettings plasma-desktop @@ -362,6 +363,8 @@ in # Update the start menu for each user that is currently logged in system.userActivationScripts.plasmaSetup = activationScript; + + nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true; }) ]; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/picom.nix b/third_party/nixpkgs/nixos/modules/services/x11/picom.nix index 1289edd290..977d0fea21 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/picom.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/picom.nix @@ -57,7 +57,15 @@ in { type = types.bool; default = false; description = '' - Whether of not to enable Picom as the X.org composite manager. + Whether or not to enable Picom as the X.org composite manager. + ''; + }; + + experimentalBackends = mkOption { + type = types.bool; + default = false; + description = '' + Whether to use the unstable new reimplementation of the backends. ''; }; @@ -302,7 +310,8 @@ in { }; serviceConfig = { - ExecStart = "${pkgs.picom}/bin/picom --config ${configFile}"; + ExecStart = "${pkgs.picom}/bin/picom --config ${configFile}" + + (optionalString cfg.experimentalBackends " --experimental-backends"); RestartSec = 3; Restart = "always"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix index 0552095ba9..8223c1f1e6 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix @@ -136,6 +136,7 @@ let fi done + echo '${cfg.filesSection}' >> $out echo 'EndSection' >> $out echo "$config" >> $out @@ -366,6 +367,13 @@ in ''; }; + filesSection = mkOption { + type = types.lines; + default = ""; + example = ''FontPath "/path/to/my/fonts"''; + description = "Contents of the first Files section of the X server configuration file."; + }; + deviceSection = mkOption { type = types.lines; default = ""; diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix index c0e4d3979f..d369aab545 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix @@ -381,13 +381,14 @@ in # syntax). Note: We also allow underscores for compatibility/legacy # reasons (as undocumented feature): type = types.strMatching - "^$|^[[:alpha:]]([[:alnum:]_-]{0,61}[[:alnum:]])?$"; + "^$|^[[:alnum:]]([[:alnum:]_-]{0,61}[[:alnum:]])?$"; description = '' The name of the machine. Leave it empty if you want to obtain it from a DHCP server (if using DHCP). The hostname must be a valid DNS label (see - RFC 1035 section 2.3.1: "Preferred name syntax") and as such must not - contain the domain part. This means that the hostname must start with a - letter, end with a letter or digit, and have as interior characters only + RFC 1035 section 2.3.1: "Preferred name syntax", RFC 1123 section 2.1: + "Host Names and Numbers") and as such must not contain the domain part. + This means that the hostname must start with a letter or digit, + end with a letter or digit, and have as interior characters only letters, digits, and hyphen. The maximum length is 63 characters. Additionally it is recommended to only use lower-case characters. ''; diff --git a/third_party/nixpkgs/nixos/tests/common/ec2.nix b/third_party/nixpkgs/nixos/tests/common/ec2.nix index 502fe96231..52d0310ac7 100644 --- a/third_party/nixpkgs/nixos/tests/common/ec2.nix +++ b/third_party/nixpkgs/nixos/tests/common/ec2.nix @@ -3,7 +3,7 @@ with pkgs.lib; { - makeEc2Test = { name, image, userData, script, hostname ? "ec2-instance", sshPublicKey ? null }: + makeEc2Test = { name, image, userData, script, hostname ? "ec2-instance", sshPublicKey ? null, meta ? {} }: let metaData = pkgs.stdenv.mkDerivation { name = "metadata"; @@ -59,5 +59,7 @@ with pkgs.lib; machine = create_machine({"startCommand": start_command}) '' + script; + + inherit meta; }; } diff --git a/third_party/nixpkgs/nixos/tests/hardened.nix b/third_party/nixpkgs/nixos/tests/hardened.nix index 8d845de70e..ab5fa609e0 100644 --- a/third_party/nixpkgs/nixos/tests/hardened.nix +++ b/third_party/nixpkgs/nixos/tests/hardened.nix @@ -67,7 +67,10 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : { # Test hidepid with subtest("hidepid=2 option is applied and works"): - machine.succeed("grep -Fq hidepid=2 /proc/mounts") + # Linux >= 5.8 shows "invisible" + machine.succeed( + "grep -Fq hidepid=2 /proc/mounts || grep -Fq hidepid=invisible /proc/mounts" + ) # cannot use pgrep -u here, it segfaults when access to process info is denied machine.succeed("[ `su - sybil -c 'ps --no-headers --user root | wc -l'` = 0 ]") machine.succeed("[ `su - alice -c 'ps --no-headers --user root | wc -l'` != 0 ]") diff --git a/third_party/nixpkgs/nixos/tests/ncdns.nix b/third_party/nixpkgs/nixos/tests/ncdns.nix index 507e20fe7c..9960ac63e2 100644 --- a/third_party/nixpkgs/nixos/tests/ncdns.nix +++ b/third_party/nixpkgs/nixos/tests/ncdns.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ... }: +import ./make-test-python.nix ({ lib, pkgs, ... }: let fakeReply = pkgs.writeText "namecoin-reply.json" '' { "error": null, @@ -15,10 +15,18 @@ let } } ''; + + # Disabled because DNSSEC does not currently validate, + # see https://github.com/namecoin/ncdns/issues/127 + dnssec = false; + in { name = "ncdns"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ rnhmjoj ]; + }; nodes.server = { ... }: { networking.nameservers = [ "127.0.0.1" ]; @@ -44,13 +52,15 @@ in services.ncdns = { enable = true; - dnssec.enable = true; + dnssec.enable = dnssec; + identity.hostname = "example.com"; + identity.hostmaster = "root@example.com"; + identity.address = "1.0.0.1"; }; services.pdns-recursor = { enable = true; dns.allowFrom = [ "127.0.0.0/8" ]; - settings.loglevel = 8; resolveNamecoin = true; }; @@ -58,20 +68,29 @@ in }; - testScript = '' - with subtest("DNSSEC keys have been generated"): - server.wait_for_unit("ncdns") - server.wait_for_file("/var/lib/ncdns/bit.key") - server.wait_for_file("/var/lib/ncdns/bit-zone.key") + testScript = + (lib.optionalString dnssec '' + with subtest("DNSSEC keys have been generated"): + server.wait_for_unit("ncdns") + server.wait_for_file("/var/lib/ncdns/bit.key") + server.wait_for_file("/var/lib/ncdns/bit-zone.key") - with subtest("DNSKEY bit record is present"): - server.wait_for_unit("pdns-recursor") - server.wait_for_open_port("53") - server.succeed("host -t DNSKEY bit") + with subtest("DNSKEY bit record is present"): + server.wait_for_unit("pdns-recursor") + server.wait_for_open_port("53") + server.succeed("host -t DNSKEY bit") + '') + + '' + with subtest("can resolve a .bit name"): + server.wait_for_unit("namecoind") + server.wait_for_unit("ncdns") + server.wait_for_open_port("8332") + assert "1.2.3.4" in server.succeed("dig @localhost -p 5333 test.bit") - with subtest("can resolve a .bit name"): - server.wait_for_unit("namecoind") - server.wait_for_open_port("8332") - assert "1.2.3.4" in server.succeed("host -t A test.bit") - ''; + with subtest("SOA record has identity information"): + assert "example.com" in server.succeed("dig SOA @localhost -p 5333 bit") + + with subtest("bit. zone forwarding works"): + assert "1.2.3.4" in server.succeed("host test.bit") + ''; }) diff --git a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix index fdcc407213..ad2fff2b01 100644 --- a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix +++ b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix @@ -457,6 +457,31 @@ let ''; }; + openvpn = { + exporterConfig = { + enable = true; + group = "openvpn"; + statusPaths = ["/run/openvpn-test"]; + }; + metricProvider = { + users.groups.openvpn = {}; + services.openvpn.servers.test = { + config = '' + dev tun + status /run/openvpn-test + status-version 3 + ''; + up = "chmod g+r /run/openvpn-test"; + }; + systemd.services."openvpn-test".serviceConfig.Group = "openvpn"; + }; + exporterTest = '' + wait_for_unit("openvpn-test.service") + wait_for_unit("prometheus-openvpn-exporter.service") + succeed("curl -sSf http://localhost:9176/metrics | grep -q 'openvpn_up{.*} 1'") + ''; + }; + postfix = { exporterConfig = { enable = true; @@ -466,10 +491,12 @@ let }; exporterTest = '' wait_for_unit("prometheus-postfix-exporter.service") + wait_for_file("/var/lib/postfix/queue/public/showq") wait_for_open_port(9154) succeed( "curl -sSf http://localhost:9154/metrics | grep -q 'postfix_smtpd_connects_total 0'" ) + succeed("curl -sSf http://localhost:9154/metrics | grep -q 'postfix_up{.*} 1'") ''; }; diff --git a/third_party/nixpkgs/nixos/tests/rsyncd.nix b/third_party/nixpkgs/nixos/tests/rsyncd.nix new file mode 100644 index 0000000000..3639320f64 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/rsyncd.nix @@ -0,0 +1,25 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "rsyncd"; + meta.maintainers = with pkgs.lib.maintainers; [ ehmry ]; + + nodes.machine.services.rsyncd = { + enable = true; + settings = { + global = { + "reverse lookup" = false; + "forward lookup" = false; + }; + tmp = { + path = "/nix/store"; + comment = "test module"; + }; + + }; + }; + + testScript = '' + start_all() + machine.wait_for_unit("rsyncd") + machine.succeed("rsync localhost::") + ''; +}) diff --git a/third_party/nixpkgs/pkgs/applications/audio/bsequencer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bsequencer/default.nix index 37dcada961..2c9217183e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bsequencer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bsequencer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BSEQuencer"; - version = "1.6.0"; + version = "1.8.4"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = "${version}"; - sha256 = "0w21kzq695xy4i1r6xvvh7sad5m0rlmdgc7ykmrlzfsm1252dz80"; + sha256 = "0hagnn104ybzdp13r95idw20fhmzif8p3kmiypnr20m6c64rdd29"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/cantata/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cantata/default.nix index 95b7dd1842..df19ac9422 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cantata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cantata/default.nix @@ -16,7 +16,7 @@ , withDevices ? true, udisks2 , withDynamic ? true , withHttpServer ? true -, withLibVlc ? false, vlc +, withLibVlc ? false, libvlc , withStreams ? true }: @@ -71,7 +71,7 @@ in mkDerivation { ++ lib.optional withMtp libmtp ++ lib.optional withMusicbrainz libmusicbrainz5 ++ lib.optional withUdisks udisks2 - ++ lib.optional withLibVlc vlc; + ++ lib.optional withLibVlc libvlc; nativeBuildInputs = [ cmake pkgconfig qttools ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/cheesecutter/0001-fix-impure-build-date-display.patch b/third_party/nixpkgs/pkgs/applications/audio/cheesecutter/0001-Drop-baked-in-build-date-for-r13y.patch similarity index 74% rename from third_party/nixpkgs/pkgs/applications/audio/cheesecutter/0001-fix-impure-build-date-display.patch rename to third_party/nixpkgs/pkgs/applications/audio/cheesecutter/0001-Drop-baked-in-build-date-for-r13y.patch index 2e2746f434..9bc0e7b933 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cheesecutter/0001-fix-impure-build-date-display.patch +++ b/third_party/nixpkgs/pkgs/applications/audio/cheesecutter/0001-Drop-baked-in-build-date-for-r13y.patch @@ -1,3 +1,13 @@ +From eb21fd64a19a0e10c4c3826fc71610fd5850fa2f Mon Sep 17 00:00:00 2001 +From: Christoph Neidahl +Date: Sun, 13 Sep 2020 23:18:51 +0200 +Subject: [PATCH 1/2] Drop baked-in build date for r13y + +--- + src/ct2util.d | 2 +- + src/ui/ui.d | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + diff --git a/src/ct2util.d b/src/ct2util.d index 523cadc..e462b09 100644 --- a/src/ct2util.d @@ -24,3 +34,6 @@ index e418dda..21af408 100644 screen.cprint(4, 0, 1, headerColor, hdr); screen.cprint(screen.width - 14, 0, 1, headerColor, "F12 = Help"); int c1 = audio.player.isPlaying ? 13 : 12; +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/applications/audio/cheesecutter/0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch b/third_party/nixpkgs/pkgs/applications/audio/cheesecutter/0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch new file mode 100644 index 0000000000..6e33307f9f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/cheesecutter/0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch @@ -0,0 +1,25 @@ +From abc5e8786d41803300b56ef40c08db0d867eb01a Mon Sep 17 00:00:00 2001 +From: Christoph Neidahl +Date: Sun, 13 Sep 2020 23:22:33 +0200 +Subject: [PATCH 2/2] Prepend libSDL.dylib to macOS SDL loader + +--- + src/derelict/sdl/sdl.d | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/derelict/sdl/sdl.d b/src/derelict/sdl/sdl.d +index e31a52f..f7915b1 100644 +--- a/src/derelict/sdl/sdl.d ++++ b/src/derelict/sdl/sdl.d +@@ -54,7 +54,7 @@ public: + super( + "sdl.dll", + "libSDL.so, libSDL.so.0, libSDL-1.2.so, libSDL-1.2.so.0", +- "@executable_path/../Frameworks/SDL.framework/SDL, /Library/Frameworks/SDL.framework/SDL, /System/Library/Frameworks/SDL.framework/SDL" ++ "@rpath/libSDL.dylib, @executable_path/../Frameworks/SDL.framework/SDL, /Library/Frameworks/SDL.framework/SDL, /System/Library/Frameworks/SDL.framework/SDL" + ); + } + +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/applications/audio/cheesecutter/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cheesecutter/default.nix index 732c2968fd..84f6b18303 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cheesecutter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cheesecutter/default.nix @@ -1,27 +1,32 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch -, acme, ldc, patchelf +{ stdenv +, lib +, fetchFromGitHub +, acme +, ldc +, patchelf , SDL }: - stdenv.mkDerivation rec { pname = "cheesecutter"; - version = "unstable-2019-12-06"; + version = "unstable-2020-04-03"; src = fetchFromGitHub { owner = "theyamo"; repo = "CheeseCutter"; - rev = "6b433c5512d693262742a93c8bfdfb353d4be853"; - sha256 = "1szlcg456b208w1237581sg21x69mqlh8cr6v8yvbhxdz9swxnwy"; + rev = "68d6518f0e6249a2a5d122fc80201578337c1277"; + sha256 = "0xspzjhc6cp3m0yd0mwxncg8n1wklizamxvidrnn21jgj3mnaq2q"; }; - nativeBuildInputs = [ acme ldc patchelf ]; + patches = [ + ./0001-Drop-baked-in-build-date-for-r13y.patch + ] + ++ lib.optional stdenv.hostPlatform.isDarwin ./0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch; + + nativeBuildInputs = [ acme ldc ] + ++ lib.optional (!stdenv.hostPlatform.isDarwin) patchelf; buildInputs = [ SDL ]; - patches = [ - ./0001-fix-impure-build-date-display.patch - ]; - makefile = "Makefile.ldc"; installPhase = '' @@ -33,15 +38,21 @@ stdenv.mkDerivation rec { cp -r tunes/* $out/share/cheesecutter/example_tunes ''; - postFixup = '' - rpath=$(patchelf --print-rpath $out/bin/ccutter) - patchelf --set-rpath "$rpath:${lib.makeLibraryPath buildInputs}" $out/bin/ccutter - ''; + postFixup = + let + rpathSDL = lib.makeLibraryPath [ SDL ]; + in + if stdenv.hostPlatform.isDarwin then '' + install_name_tool -add_rpath ${rpathSDL} $out/bin/ccutter + '' else '' + rpath=$(patchelf --print-rpath $out/bin/ccutter) + patchelf --set-rpath "$rpath:${rpathSDL}" $out/bin/ccutter + ''; meta = with lib; { - description = "A tracker program for composing music for the SID chip."; + description = "A tracker program for composing music for the SID chip"; homepage = "https://github.com/theyamo/CheeseCutter/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ OPNA2608 ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/geonkick/default.nix b/third_party/nixpkgs/pkgs/applications/audio/geonkick/default.nix index dcfb542603..e32bef008d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/geonkick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/geonkick/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "geonkick"; - version = "2.3.7"; + version = "2.3.8"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "1wdcbwiyy6i5agq5lffkyilyc8mv1cc4mp9h0nybn240vb2flqc2"; + sha256 = "07809yy2q7dd6fcp0yndlg1vw2ca2zisnsplb3xrxvzdvrqlw910"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/giada/default.nix b/third_party/nixpkgs/pkgs/applications/audio/giada/default.nix index ce3f3df84a..1408deba97 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/giada/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/giada/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "giada"; - version = "0.16.3.1"; + version = "0.16.4"; src = fetchFromGitHub { owner = "monocasual"; repo = pname; rev = "v${version}"; - sha256 = "0z1jrkggdn630i3j59j30apaa9s242y1wiawqp4g1n9dkg3r9a1j"; + sha256 = "0qyx0bvivlvly0vj5nnnbiks22xh13sqlw4mfgplq2lbbpgisigp"; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix index fadc7e8f18..e32b2e54f4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.1.24"; + version = "1.1.26"; src = fetchFromGitHub { owner = "sadko4u"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0rzgzkg6wvhjcf664i16nz4v30drgv80s34bhdflcjzx2x7ix5zk"; + sha256 = "1apw8zh3a3il4smkjji6bih4vbsymj0hjs10fgkrd4nazqkjvgyd"; }; nativeBuildInputs = [ pkgconfig php makeWrapper ]; @@ -58,6 +58,10 @@ stdenv.mkDerivation rec { - Expander MidSide - Expander MidSide - Expander Mono - Expander Mono - Expander Stereo - Expander Stereo + - Crossover LeftRight x8 - Frequenzweiche LeftRight x8 + - Crossover MidSide x8 - Frequenzweiche MidSide x8 + - Crossover Mono x8 - Frequenzweiche Mono x8 + - Crossover Stereo x8 - Frequenzweiche Stereo x8 - Gate LeftRight - Gate LeftRight - Gate MidSide - Gate MidSide - Gate Mono - Gate Mono @@ -81,6 +85,16 @@ stdenv.mkDerivation rec { - Compressor Mono - Kompressor Mono - Compressor Stereo - Kompressor Stereo - Latency Meter - Latenzmessgerät + - Loudness Compensator Mono - Lautstärke Kompensator Mono + - Loudness Compensator Stereo - Lautstärke Kompensator Stereo + - Multiband Expander LeftRight x8 - Multi-band Expander LeftRight x8 + - Multiband Expander MidSide x8 - Multi-band Expander MidSide x8 + - Multiband Expander Mono x8 - Multi-band Expander Mono x8 + - Multiband Expander Stereo x8 - Multi-band Expander Stereo x8 + - Multiband Gate LeftRight x8 - Multi-band Gate LeftRight x8 + - Multiband Gate MidSide x8 - Multi-band Gate MidSide x8 + - Multiband Gate Mono x8 - Multi-band Gate Mono x8 + - Multiband Gate Stereo x8 - Multi-band Gate Stereo x8 - Multiband Compressor LeftRight x8 - Multi-band Kompressor LeftRight x8 - Multiband Compressor MidSide x8 - Multi-band Kompressor MidSide x8 - Multiband Compressor Mono x8 - Multi-band Kompressor Mono x8 @@ -96,12 +110,23 @@ stdenv.mkDerivation rec { - Parametric Equalizer x32 Stereo - Parametrischer Entzerrer x32 Stereo - Phase Detector - Phasendetektor - Profiler Mono - Profiler Mono + - Profiler Stereo - Profiler Stereo + - Room Builder Mono - Raumbaumeister Mono + - Room Builder Stereo - Raumbaumeister Stereo - Multi-Sampler x12 DirectOut - Schlagzeug x12 Direktausgabe - Multi-Sampler x12 Stereo - Schlagzeug x12 Stereo - Multi-Sampler x24 DirectOut - Schlagzeug x24 Direktausgabe - Multi-Sampler x24 Stereo - Schlagzeug x24 Stereo - Multi-Sampler x48 DirectOut - Schlagzeug x48 Direktausgabe - Multi-Sampler x48 Stereo - Schlagzeug x48 Stereo + - Sidechain Multiband Expander LeftRight x8 - Sidechain Multi-band Expander LeftRight x8 + - Sidechain Multiband Expander MidSide x8 - Sidechain Multi-band Expander MidSide x8 + - Sidechain Multiband Expander Mono x8 - Sidechain Multi-band Expander Mono x8 + - Sidechain Multiband Expander Stereo x8 - Sidechain Multi-band Expander Stereo x8 + - Sidechain Multiband Gate LeftRight x8 - Sidechain Multi-band Gate LeftRight x8 + - Sidechain Multiband Gate MidSide x8 - Sidechain Multi-band Gate MidSide x8 + - Sidechain Multiband Gate Mono x8 - Sidechain Multi-band Gate Mono x8 + - Sidechain Multiband Gate Stereo x8 - Sidechain Multi-band Gate Stereo x8 - Sidechain Multiband Compressor LeftRight x8 - Sidechain Multi-band Kompressor LeftRight x8 - Sidechain Multiband Compressor MidSide x8 - Sidechain Multi-band Kompressor MidSide x8 - Sidechain Multiband Compressor Mono x8 - Sidechain Multi-band Kompressor Mono x8 @@ -132,6 +157,8 @@ stdenv.mkDerivation rec { - Spectrum Analyzer x2 - Spektrumanalysator x2 - Spectrum Analyzer x4 - Spektrumanalysator x4 - Spectrum Analyzer x8 - Spektrumanalysator x8 + - Surge Filter Mono - Sprungfilter Mono + - Surge Filter Stereo - Sprungfilter Stereo - Trigger MIDI Mono - Triggersensor MIDI Mono - Trigger MIDI Stereo - Triggersensor MIDI Stereo - Trigger Mono - Triggersensor Mono diff --git a/third_party/nixpkgs/pkgs/applications/audio/lv2bm/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lv2bm/default.nix index aee910f56e..99a2665bc1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/lv2bm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/lv2bm/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, glib, lilv, lv2, pkgconfig, serd, sord, sratom }: +{ stdenv, fetchFromGitHub, glib, libsndfile, lilv, lv2, pkgconfig, serd, sord, sratom }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "lv2bm"; - version = "git-2015-11-29"; + version = "1.1"; src = fetchFromGitHub { owner = "moddevices"; repo = "lv2bm"; - rev = "e844931503b7597f45da6d61ff506bb9fca2e9ca"; - sha256 = "1rrz5sp04zjal6v34ldkl6fjj9xqidb8xm1iscjyljf6z4l516cx"; + rev = "v${version}"; + sha256 = "0vlppxfb9zbmffazs1kiyb79py66s8x9hihj36m2vz86zsq7ybl0"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib lilv lv2 serd sord sratom ]; + buildInputs = [ glib libsndfile lilv lv2 serd sord sratom ]; installPhase = '' make install PREFIX=$out diff --git a/third_party/nixpkgs/pkgs/applications/audio/lyrebird/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lyrebird/default.nix new file mode 100644 index 0000000000..b40dbfe65b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/lyrebird/default.nix @@ -0,0 +1,63 @@ +{ python3Packages +, lib +, fetchFromGitHub +, makeDesktopItem +, wrapGAppsHook +, gtk3 +, gobject-introspection +, sox +, pulseaudio +}: +let + desktopItem = makeDesktopItem { + name = "lyrebird"; + exec = "lyrebird"; + icon = "${placeholder "out"}/share/lyrebird/icon.png"; + desktopName = "Lyrebird"; + genericName = "Voice Changer"; + categories = "AudioVideo;Audio;"; + }; +in +python3Packages.buildPythonApplication rec { + pname = "lyrebird"; + version = "1.1.0"; + + format = "other"; + doCheck = false; + + src = fetchFromGitHub { + owner = "chxrlt"; + repo = "lyrebird"; + rev = "v${version}"; + sha256 = "0wmnww2wi8bb9m8jgc18n04gjia8pf9klmvij0w98xz11l6kxb13"; + }; + + propagatedBuildInputs = with python3Packages; [ toml pygobject3 ]; + + nativeBuildInputs = [ wrapGAppsHook ]; + + buildInputs = [ gtk3 gobject-introspection sox ]; + + dontWrapGApps = true; + makeWrapperArgs = [ + "--prefix 'PATH' ':' '${lib.makeBinPath [ sox pulseaudio ]}'" + "--prefix 'PYTHONPATH' ':' '${placeholder "out"}/share/lyrebird'" + "--run 'cd ${placeholder "out"}/share/lyrebird'" + ''"''${gappsWrapperArgs[@]}"'' + ]; + + installPhase = '' + mkdir -p $out/{bin,share/{applications,lyrebird}} + cp -at $out/share/lyrebird/ app icon.png + cp -at $out/share/applications/ ${desktopItem} + install -Dm755 app.py $out/bin/lyrebird + ''; + + meta = with lib; { + description = "Simple and powerful voice changer for Linux, written in GTK 3"; + homepage = "https://github.com/chxrlt/lyrebird"; + license = licenses.mit; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/opus-tools/default.nix b/third_party/nixpkgs/pkgs/applications/audio/opus-tools/default.nix index 9d95c362d9..b8253b078b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/opus-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/opus-tools/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Tools to work with opus encoded audio streams"; - homepage = "http://www.opus-codec.org/"; + homepage = "https://www.opus-codec.org/"; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; unix; diff --git a/third_party/nixpkgs/pkgs/applications/audio/opusfile/default.nix b/third_party/nixpkgs/pkgs/applications/audio/opusfile/default.nix index df3bf7c215..8c83eb01b3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/opusfile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/opusfile/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High-level API for decoding and seeking in .opus files"; - homepage = "http://www.opus-codec.org/"; + homepage = "https://www.opus-codec.org/"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pmidi/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pmidi/default.nix index 0da86ca9bd..3491afaaf7 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pmidi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pmidi/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ alsaLib ]; meta = with stdenv.lib; { - homepage = "http://www.parabola.me.uk/alsa/pmidi.html"; + homepage = "https://www.parabola.me.uk/alsa/pmidi.html"; description = "A straightforward command line program to play midi files through the ALSA sequencer"; maintainers = with maintainers; [ lheckemann ]; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix index 2fb8e30a64..5abab029bc 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Doing phonetics by computer"; - homepage = "http://www.fon.hum.uva.nl/praat/"; + homepage = "https://www.fon.hum.uva.nl/praat/"; license = stdenv.lib.licenses.gpl2Plus; # Has some 3rd-party code in it though platforms = stdenv.lib.platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/projectm/default.nix b/third_party/nixpkgs/pkgs/applications/audio/projectm/default.nix index 83952c271b..d55b79ece5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/projectm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/projectm/default.nix @@ -1,4 +1,5 @@ -{ mkDerivation +{ stdenv +, mkDerivation , lib , fetchFromGitHub , autoreconfHook @@ -39,12 +40,13 @@ mkDerivation rec { "--enable-sdl" ]; - fixupPhase = '' + fixupPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # NOTE: 2019-10-05: Upstream inserts the src path buring build into ELF rpath, so must delete it out # upstream report: https://github.com/projectM-visualizer/projectm/issues/245 for entry in $out/bin/* ; do patchelf --set-rpath "$(patchelf --print-rpath $entry | tr ':' '\n' | grep -v 'src/libprojectM' | tr '\n' ':')" "$entry" done + '' + '' wrapQtApp $out/bin/projectM-pulseaudio rm $out/bin/projectM-unittest ''; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix index b76be35da2..eaabcf4bef 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.22"; + version = "1.23"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "1w6lbq4366bawy975glvjizk57zhvl562xhxwzn7p5hpm2bvw09b"; + sha256 = "1vixpp0vqpawqviwl44wn8zf602zyyrgqnjzrlwjrmdzydx9c93y"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/r128gain/default.nix b/third_party/nixpkgs/pkgs/applications/audio/r128gain/default.nix index 17f6840d4e..3044acb326 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/r128gain/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/r128gain/default.nix @@ -1,6 +1,8 @@ { lib , fetchFromGitHub +, genericUpdater , substituteAll +, common-updater-scripts , ffmpeg_3 , python3Packages , sox @@ -8,13 +10,13 @@ python3Packages.buildPythonApplication rec { pname = "r128gain"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "desbma"; repo = "r128gain"; rev = version; - sha256 = "0fnxis2g7mw8mb0cz9bws909lrndli7ml54nnzda49vc2fhbjwxr"; + sha256 = "0w2i2szajv1vcmc96w0fczdr8xc28ijcf1gdg180f21gi6yh96sc"; }; patches = [ @@ -33,6 +35,13 @@ python3Packages.buildPythonApplication rec { # sandbox to be disabled. doCheck = false; + passthru = { + updateScript = genericUpdater { + inherit pname version; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; + }; + }; + meta = with lib; { description = "Fast audio loudness scanner & tagger (ReplayGain v2 / R128)"; homepage = "https://github.com/desbma/r128gain"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/r128gain/ffmpeg-location.patch b/third_party/nixpkgs/pkgs/applications/audio/r128gain/ffmpeg-location.patch index ff11802401..c01f115c1d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/r128gain/ffmpeg-location.patch +++ b/third_party/nixpkgs/pkgs/applications/audio/r128gain/ffmpeg-location.patch @@ -1,5 +1,3 @@ -diff --git i/r128gain/__init__.py w/r128gain/__init__.py -index 53fc3ef..f144e15 100755 --- i/r128gain/__init__.py +++ w/r128gain/__init__.py @@ -78,7 +78,7 @@ def get_ffmpeg_lib_versions(ffmpeg_path=None): @@ -14,7 +12,7 @@ index 53fc3ef..f144e15 100755 @@ -156,7 +156,7 @@ def get_r128_loudness(audio_filepaths, *, calc_peak=True, enable_ffmpeg_threadin os.devnull, **additional_ffmpeg_args, - f="null"), + f="null").global_args("-hide_banner", "-nostats"), - cmd=ffmpeg_path or "ffmpeg") + cmd=ffmpeg_path or "@ffmpeg@/bin/ffmpeg") diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix index dd063b2d03..a2001996c9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "spotify-tui"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "0pvgq8r1bb7bdxm50hxl0n7ajplpzp1gnf6j55dn6xwck0syml9y"; + sha256 = "0w1y37qh9n3936d59hvqzjz2878x2nwxqxc4s7mp4f9xqcfl0c5r"; }; - cargoSha256 = "07v1qm5ky99j2lwbl00g80z0f8hfrpwgyqsm8fnda6y9s3vzzdgz"; + cargoSha256 = "1ri054p08si95x1gh2bkh4fk50ja79c5izzjnkvs0yhfj1wzbghi"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig python3 ]; buildInputs = [ ] diff --git a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix index f278b68b92..d6428e4031 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix @@ -30,7 +30,7 @@ , withGstreamer ? true , gst_all_1 ? null , withVlc ? true -, vlc ? null +, libvlc ? null }: mkDerivation rec { @@ -75,7 +75,7 @@ mkDerivation rec { gst-plugins-good gst-plugins-ugly ]) - ++ lib.optional withVlc vlc; + ++ lib.optional withVlc libvlc; nativeBuildInputs = [ cmake ninja pkgconfig qttools ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix index 83a6cfaf05..a61df3e91b 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "3.3.1"; + version = "3.3.3"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "1qr1vfb6mhm2hxl2ksydkhadm7phadn93lwm3f9zni01plk56bb5"; + sha256 = "1lsqshpbc5p5qm8kic8a90xmvd2zx2s7jf613j9ng4h3hh75wbff"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix index 6952d469ad..20778fc986 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "go-ethereum"; - version = "1.9.21"; + version = "1.9.22"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0mr5pw08jka11lzgl28555nb90cqxx9vlqd1plfmyic6rb5z11df"; + sha256 = "08i31xil2lygfcn2igsvn4hpg8xnf8l6g914f78hgl4wj6v1dja9"; }; runVend = true; - vendorSha256 = "155hmny3543h02ryn1nnlpmvs0qvhd0lb66vmkhw5351m6gkbx7x"; + vendorSha256 = "1qbg44cryiv9kvcak6qjrbmkc9bxyk5fybj62vdkskqfjvv86068"; doCheck = false; 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 f35e695d1b..f07854ca8a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -19,9 +19,9 @@ let sha256Hash = "sha256-qbxmR9g8DSKzcP09bJuc+am79BSXWG39UQxFEb1bZ88="; }; latestVersion = { # canary & dev - version = "4.2.0.11"; # "Android Studio 4.2 Canary 11" - build = "202.6825553"; - sha256Hash = "sha256-la3J0mgUxJA50l1PLr9FPMKI5QYkoBRriVyu3aVq7io="; + version = "4.2.0.13"; # "Android Studio 4.2 Canary 13" + build = "202.6863838"; + sha256Hash = "sha256-avkRelP5/sDXW7pdVrOknmb3PtR6XQEmQXivZFljpLc="; }; in { # Attributes are named by their corresponding release channels diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix index 71bb472d09..f2904f3e01 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix @@ -75,9 +75,9 @@ in stdenv.mkDerivation { "${lib.getLib stdenv.cc.libc}/lib" # Executable paths necessary for compilation (ld, as): - "${lib.getBin stdenv.cc.cc}" - "${lib.getBin stdenv.cc.bintools}" - "${lib.getBin stdenv.cc.bintools.bintools}" + "${lib.getBin stdenv.cc.cc}/bin" + "${lib.getBin stdenv.cc.bintools}/bin" + "${lib.getBin stdenv.cc.bintools.bintools}/bin" ])); in '' substituteInPlace lisp/emacs-lisp/comp.el --replace \ diff --git a/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix b/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix index 347c5970ca..69d4f91713 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix @@ -2,25 +2,25 @@ buildGoModule rec { pname = "glow"; - version = "0.2.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "glow"; rev = "v${version}"; - sha256 = "0vhl8d7xxqqyl916nh8sgm1xdaf7xlc3r18464bd2av22q9yz68n"; + sha256 = "0cgi7rz5al5smjsna9p2v5zxjn3lwpnhd38vpr1qhz8n0z37vss5"; }; - vendorSha256 = "1c16s5xiqr36azh2w90wg14jlw67ca2flbgjijpz7qd0ypxyfqlk"; + vendorSha256 = "180g6d9w3lfmxj4843kqvq4ikg8lwmwprgfxdgz1lzvjmbfjj3g9"; doCheck = false; buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ]; meta = with lib; { - description = "Render markdown on the CLI"; + description = "Render markdown on the CLI, with pizzazz!"; homepage = "https://github.com/charmbracelet/glow"; license = licenses.mit; - maintainers = with maintainers; [ ehmry filalex77 ]; + maintainers = with maintainers; [ ehmry filalex77 penguwin ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index 2747176e01..d54513971a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -385,12 +385,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2020.2.2"; /* updated by script */ + version = "2020.2.3"; /* 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 = "1v3n4mg8b55ni72bdgsgiwyqcvp9zhqlkqshscwfjggv0iai9r6p"; /* updated by script */ + sha256 = "01namzd29chj975w3awanlzf38hh30cfjzyljqfkp6y3djn0if1r"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/qt.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/qt.nix index b04c575dde..323f08c23f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/qt.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/qt.nix @@ -4,17 +4,18 @@ let unwrapped = mkDerivation rec { pname = "neovim-qt-unwrapped"; - version = "0.2.15"; + version = "0.2.16.1"; src = fetchFromGitHub { owner = "equalsraf"; repo = "neovim-qt"; rev = "v${version}"; - sha256 = "097nykglqp4jyvla4yp32sc1f1hph4cqqhp6rm9ww7br8c0j54xl"; + sha256 = "0x5brrim3f21bzdmh6wyrhrislwpx1248wbx56csvic6v78hzqny"; }; cmakeFlags = [ "-DUSE_SYSTEM_MSGPACK=1" + "-DENABLE_TESTS=0" # tests fail because xcb platform plugin is not found ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/qxw/default.nix b/third_party/nixpkgs/pkgs/applications/editors/qxw/default.nix new file mode 100644 index 0000000000..aed69e4f56 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/qxw/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkg-config, gtk2, pcre }: + +stdenv.mkDerivation rec { + pname = "qxw"; + version = "20200708"; + + src = fetchurl { + url = "https://www.quinapalus.com/qxw-${version}.tar.gz"; + sha256 = "1si3ila7137c7x4mp3jv1q1mh3jp0p4khir1yz1rwy0mp3znwv7d"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk2 pcre ]; + + makeFlags = [ "DESTDIR=$(out)" ]; + + patchPhase = '' + sed -i 's/ `dpkg-buildflags[^`]*`//g; + /mkdir -p/d; + s/cp -a/install -D/; + s,/usr/games,/bin,' Makefile + ''; + + meta = with stdenv.lib; { + description = "A program to help create and publish crosswords"; + homepage = "https://www.quinapalus.com/qxw.html"; + license = licenses.gpl2; + maintainers = [ maintainers.tckmn ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim-configurable.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim-configurable.nix new file mode 100644 index 0000000000..087a375c50 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim-configurable.nix @@ -0,0 +1,67 @@ +{ stdenv, callPackage, vimUtils, buildEnv, makeWrapper }: + +let + macvim = callPackage ./macvim.nix { inherit stdenv; }; + + makeCustomizable = macvim: macvim // { + # configure expects the same args as vimUtils.vimrcFile. + # This is the same as the value given to neovim.override { configure = … } + # or the value of vim_configurable.customize { vimrcConfig = … } + # + # Note: Like neovim and vim_configurable, configuring macvim disables the + # sourcing of the user's vimrc. Use `customRC = "source $HOME/.vim/vimrc"` + # if you want to preserve that behavior. + configure = let + inherit (stdenv) lib; + doConfig = config: let + vimrcConfig = config // { + # always source the bundled system vimrc + beforePlugins = '' + source $VIM/vimrc + ${config.beforePlugins or ""} + ''; + }; + in buildEnv { + name = macvim.name; + paths = [ macvim ]; + pathsToLink = [ + "/" + "/bin" + "/Applications/MacVim.app/Contents/MacOS" + "/Applications/MacVim.app/Contents/bin" + ]; + buildInputs = [ makeWrapper ]; + # We need to do surgery on the resulting app. We can't just make a wrapper for vim because this + # is a GUI app. We need to copy the actual GUI executable image as AppKit uses the loaded image's + # path to locate the bundle. We can use symlinks for other executables and resources though. + postBuild = '' + # Replace the Contents/MacOS/MacVim symlink with the original file + target=$(readlink $out/Applications/MacVim.app/Contents/MacOS/MacVim) + rm $out/Applications/MacVim.app/Contents/MacOS/MacVim + cp -a -t $out/Applications/MacVim.app/Contents/MacOS "$target" + + # Wrap the Vim binary for our vimrc + wrapProgram $out/Applications/MacVim.app/Contents/MacOS/Vim \ + --add-flags "-u ${vimUtils.vimrcFile vimrcConfig}" + + # Replace each symlink in bin/ with the original. Most of them point at other symlinks + # and we need those original symlinks to point into our new app bundle. + for prefix in bin Applications/MacVim.app/Contents/bin; do + for link in $out/$prefix/*; do + target=$(readlink "$link") + # don't copy binaries like vimtutor, but we do need mvim + [ -L "$target" ] || [ "$(basename "$target")" = mvim ] || continue; + rm "$link" + cp -a -t $out/$prefix "$target" + done + done + ''; + meta = macvim.meta; + }; + in lib.makeOverridable (lib.setFunctionArgs doConfig (lib.functionArgs vimUtils.vimrcFile)); + + override = f: makeCustomizable (macvim.override f); + overrideAttrs = f: makeCustomizable (macvim.overrideAttrs f); + }; +in + makeCustomizable macvim diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix index 93ec48e54e..ef6c6a1440 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix @@ -27,13 +27,13 @@ in stdenv.mkDerivation { pname = "macvim"; - version = "8.2.539"; + version = "8.2.1719"; src = fetchFromGitHub { owner = "macvim-dev"; repo = "macvim"; - rev = "snapshot-163"; - sha256 = "0ibc6h7zmk81dygkxd8a2rcq72zbqmr9kh64xhsm9h0p70505cdk"; + rev = "snapshot-166"; + sha256 = "1p51q59l1dl5lnf1ms960lm8zfg39p8xq0pdjw6wdyypjj3r8v3v"; }; enableParallelBuilding = true; @@ -68,8 +68,6 @@ stdenv.mkDerivation { "--disable-sparkle" ]; - makeFlags = ''PREFIX=$(out) CPPFLAGS="-Wno-error"''; - # Remove references to Sparkle.framework from the project. # It's unused (we disabled it with --disable-sparkle) and this avoids # copying the unnecessary several-megabyte framework into the result. @@ -85,7 +83,10 @@ stdenv.mkDerivation { DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer configureFlagsArray+=( - "--with-developer-dir=$DEV_DIR" + --with-developer-dir="$DEV_DIR" + LDFLAGS="-L${ncurses}/lib" + CPPFLAGS="-isystem ${ncurses.dev}/include" + CFLAGS="-Wno-error=implicit-function-declaration" ) '' # For some reason having LD defined causes PSMTabBarControl to fail at link-time as it diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.patch b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.patch index 6b90b623cb..49354aa9a8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.patch +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.patch @@ -1,5 +1,5 @@ diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc -index 23a06bf..dfb10fe 100644 +index af43549..dfb10fe 100644 --- a/src/MacVim/vimrc +++ b/src/MacVim/vimrc @@ -14,35 +14,5 @@ set backspace+=indent,eol,start @@ -29,22 +29,22 @@ index 23a06bf..dfb10fe 100644 -" or an installation from python.org: -if exists("&pythonthreedll") && exists("&pythonthreehome") && - \ !filereadable(&pythonthreedll) -- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.7/Python") -- " MacPorts python 3.7 -- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.7/Python -- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.7/Python") +- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.8/Python") +- " MacPorts python 3.8 +- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.8/Python +- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.8/Python") - " https://www.python.org/downloads/mac-osx/ -- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.7/Python +- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.8/Python - endif -endif - +" Default cscopeprg to the Nix-installed path +set cscopeprg=@CSCOPE@ diff --git a/src/Makefile b/src/Makefile -index 24c6934..d0f094e 100644 +index fd2d5e1..37a6d6a 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -1407,7 +1407,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ +@@ -1397,7 +1397,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ MacVim/MacVim.m MACVIMGUI_OBJ = objects/gui.o objects/gui_beval.o \ objects/gui_macvim.o objects/MMBackend.o objects/MacVim.o @@ -54,10 +54,10 @@ index 24c6934..d0f094e 100644 MACVIMGUI_LIBS_DIR = MACVIMGUI_LIBS1 = -framework Cocoa -framework Carbon diff --git a/src/auto/configure b/src/auto/configure -index 730d6d5..0259112 100755 +index 06257a5..68437df 100755 --- a/src/auto/configure +++ b/src/auto/configure -@@ -5859,10 +5859,7 @@ $as_echo "not found" >&6; } +@@ -5872,10 +5872,7 @@ $as_echo "not found" >&6; } for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do if test "X$path" != "X"; then @@ -69,7 +69,7 @@ index 730d6d5..0259112 100755 MZSCHEME_LIBS="${path}/libmzscheme3m.a" MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" elif test -f "${path}/libracket3m.a"; then -@@ -6247,23 +6244,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } +@@ -6260,23 +6257,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } fi if test "x$MACOS_X" = "xyes"; then @@ -93,7 +93,7 @@ index 730d6d5..0259112 100755 PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` fi -@@ -6486,13 +6466,7 @@ __: +@@ -6499,13 +6479,7 @@ __: eof eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" rm -f -- "${tmp_mkf}" @@ -108,7 +108,7 @@ index 730d6d5..0259112 100755 vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'` -@@ -6507,7 +6481,6 @@ eof +@@ -6520,7 +6494,6 @@ eof fi vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` @@ -116,7 +116,7 @@ index 730d6d5..0259112 100755 fi -@@ -6586,13 +6559,6 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -6599,13 +6572,6 @@ rm -f core conftest.err conftest.$ac_objext \ $as_echo "no" >&6; } fi @@ -130,19 +130,19 @@ index 730d6d5..0259112 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 $as_echo_n "checking if compile and link flags for Python are sane... " >&6; } cflags_save=$CFLAGS -@@ -7486,11 +7452,7 @@ $as_echo "$tclver - OK" >&6; }; +@@ -7499,11 +7465,7 @@ $as_echo "$tclver - OK" >&6; }; { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 $as_echo_n "checking for location of Tcl include... " >&6; } - if test "x$MACOS_X" != "xyes"; then tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver" - else -- tclinc="/System/Library/Frameworks/Tcl.framework/Headers" +- tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /System/Library/Frameworks/Tcl.framework/Headers `xcrun --show-sdk-path`/System/Library/Frameworks/Tcl.framework/Versions/Current/Headers" - fi TCL_INC= for try in $tclinc; do if test -f "$try/tcl.h"; then -@@ -7508,12 +7470,8 @@ $as_echo "" >&6; } +@@ -7521,13 +7483,8 @@ $as_echo "" >&6; } if test -z "$SKIP_TCL"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 $as_echo_n "checking for location of tclConfig.sh script... " >&6; } @@ -150,12 +150,13 @@ index 730d6d5..0259112 100755 tclcnf=`echo $tclinc | sed s/include/lib/g` tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" - else -- tclcnf="/System/Library/Frameworks/Tcl.framework" +- tclcnf=`echo $tclinc | sed s/include/lib/g` +- tclcnf="$tclcnf /System/Library/Frameworks/Tcl.framework `xcrun --show-sdk-path`/System/Library/Frameworks/Tcl.framework" - fi for try in $tclcnf; do if test -f "$try/tclConfig.sh"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 -@@ -7703,10 +7661,6 @@ $as_echo "$rubyhdrdir" >&6; } +@@ -7717,10 +7674,6 @@ $as_echo "$rubyhdrdir" >&6; } if test -f "$rubylibdir/$librubya"; then librubyarg="$librubyarg" RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" @@ -167,10 +168,10 @@ index 730d6d5..0259112 100755 if test "X$librubyarg" != "X"; then diff --git a/src/vim.h b/src/vim.h -index 87d1c92..8a7d5a5 100644 +index bbc01ee..5a93591 100644 --- a/src/vim.h +++ b/src/vim.h -@@ -250,17 +250,6 @@ +@@ -244,17 +244,6 @@ # define SUN_SYSTEM #endif diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index a99cba67d3..73fc1d3752 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1kgvwcwkdvywsiyg86srfzcq6jcas6hyi9ds4qvndsnd64j0fgkn"; - x86_64-darwin = "03jci05psxkknpjrrgjpdxsii2xyf5cfpkhrp5nnfafb5acfvs1x"; + x86_64-linux = "103p0daf13zsqz2481pw6zpr6n0vaf57dq89i4djcm449i9c959i"; + x86_64-darwin = "0bxggvi0wzsy801iylszqp8rv6kij6j2v05b6qyf6af7j3cmd1qf"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.49.1"; + version = "1.49.3"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index d311e644a2..4e640f04a4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "10v13j1zg1bpgmr99vqhs1gwcipvnbkln0w6yphwn9440fw9fyp4"; - x86_64-darwin = "1mgi2awrqsm11l1yb8rgmfrxvjfn9z3qvp5np76vgbaibq2ihh0k"; + x86_64-linux = "19y25yfkls53w4qlmipfvjig7zykgwx1010ny58k339fv181vdyq"; + x86_64-darwin = "1ak3pfvwdg51hcv2kyqpnhzkl7k23k5qk197sf6rv02kgwan7pxl"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.49.1"; + version = "1.49.3"; pname = "vscodium"; executableName = "codium"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix index e7abc94a42..bd4fa4b531 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -10,6 +10,7 @@ let else if stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin" then "x86-64" else if stdenv.hostPlatform.system == "armv7l-linux" then "armv7l" else if stdenv.hostPlatform.system == "aarch64-linux" then "aarch64" + else if stdenv.hostPlatform.system == "powerpc64le-linux" then "ppc64le" else throw "ImageMagick is not supported on this platform."; cfg = { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix index 7a2ae8e4d6..0222efff64 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix @@ -10,11 +10,12 @@ let else if stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin" then "x86-64" else if stdenv.hostPlatform.system == "armv7l-linux" then "armv7l" else if stdenv.hostPlatform.system == "aarch64-linux" then "aarch64" + else if stdenv.hostPlatform.system == "powerpc64le-linux" then "ppc64le" else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.11-14"; - sha256 = "0x51vf48g75cfp0mbwf3ckmlwa6v00592xx3gvrqzjzx7vlayjyg"; + version = "6.9.11-29"; + sha256 = "0adjdpi91ya0g3v7y503n95833m25aibkim5swg5lnwjrba407hg"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. diff --git a/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix index 2c0dbd5f3f..52de023e16 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix @@ -26,12 +26,15 @@ , exiv2 , ffmpeg , flex +, graphviz +, imagemagick , lcms2 , lensfun , libgphoto2 , libkipi , libksane , liblqr1 +, libqtav , libusb1 , marble , libGL @@ -39,22 +42,24 @@ , opencv3 , pcre , threadweaver +, x265 # For panorama and focus stacking , enblend-enfuse , hugin , gnumake +, breeze-icons , oxygen }: mkDerivation rec { pname = "digikam"; - version = "6.4.0"; + version = "7.1.0"; src = fetchurl { - url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "0vwd97zkxv30y8x0z76s4fsj4w9ysgsmpjclp2h2bpava7zi4l3p"; + url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; + sha256 = "1gmblnsm0aida3yynyddm6jdh59hx3w177hrhfar616z793ch0xi"; }; nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; @@ -66,17 +71,21 @@ mkDerivation rec { exiv2 ffmpeg flex + graphviz + imagemagick lcms2 lensfun libgphoto2 libkipi libksane liblqr1 + libqtav libusb1 libGL libGLU opencv3 pcre + x265 qtbase qtxmlpatterns @@ -94,6 +103,7 @@ mkDerivation rec { kwidgetsaddons kxmlgui + breeze-icons marble oxygen threadweaver diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix index 5d037bba5b..5a5ce5d8b2 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 = "13.6.2"; + version = "13.7.3"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "17nahdv06d41vyqkcqflf652wjp410i3hn4rhlv5cnd3jcr5vgih"; + sha256 = "14wcj9jbpv1rg0g7djihzzq088aj96mwys4rc9540ajbkbbm9d36"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix index 657caeca8b..f9322add5c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix @@ -1,5 +1,5 @@ { stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, -xercesc, ode, eigen, qtbase, qttools, qtwebkit, wrapQtAppsHook, +xercesc, ode, eigen, qtbase, qttools, qtwebengine, qtxmlpatterns, wrapQtAppsHook, opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig, gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkgconfig, mpi ? null }: @@ -8,14 +8,14 @@ assert mpi != null; let pythonPackages = python3Packages; in mkDerivation rec { - pname = "freecad"; - version = "0.18.4"; + pname = "freecad-unstable"; + version = "2020-09-25"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; - rev = version; - sha256 = "1phs9a0px5fnzpyx930cz39p5dis0f0yajxzii3c3sazgkzrd55s"; + rev = "7616153b3c31ace006169cdc2fdafab484498858"; + sha256 = "1vffvzv3gkndfj2k8ik0afyk9rgngnr4aai5py66qd63qd7kmxch"; }; nativeBuildInputs = [ @@ -29,20 +29,11 @@ in mkDerivation rec { buildInputs = [ cmake coin3d xercesc ode eigen opencascade-occt gts zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile - libGLU libXmu qtbase qttools qtwebkit + libGLU libXmu qtbase qttools qtwebengine qtxmlpatterns ] ++ (with pythonPackages; [ matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost ]); - # Fix missing app icon on Wayland. Has been upstreamed and should be safe to - # remove in versions >= 0.19 - patches = [ - (fetchpatch { - url = "https://github.com/FreeCAD/FreeCAD/commit/c4d2a358ca125d51d059dfd72dcbfba326196dfc.patch"; - sha256 = "0yqc9zrxgi2c2xcidm8wh7a9yznkphqvjqm9742qm5fl20p8gl4h"; - }) - ]; - cmakeFlags = [ "-DBUILD_QT5=ON" "-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include" diff --git a/third_party/nixpkgs/pkgs/applications/graphics/freecad/stable.nix b/third_party/nixpkgs/pkgs/applications/graphics/freecad/stable.nix new file mode 100644 index 0000000000..657caeca8b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/freecad/stable.nix @@ -0,0 +1,85 @@ +{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, +xercesc, ode, eigen, qtbase, qttools, qtwebkit, wrapQtAppsHook, +opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig, +gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkgconfig, mpi ? null }: + +assert mpi != null; + +let + pythonPackages = python3Packages; +in mkDerivation rec { + pname = "freecad"; + version = "0.18.4"; + + src = fetchFromGitHub { + owner = "FreeCAD"; + repo = "FreeCAD"; + rev = version; + sha256 = "1phs9a0px5fnzpyx930cz39p5dis0f0yajxzii3c3sazgkzrd55s"; + }; + + nativeBuildInputs = [ + cmake + ninja + pkgconfig + pythonPackages.pyside2-tools + wrapQtAppsHook + ]; + + buildInputs = [ + cmake coin3d xercesc ode eigen opencascade-occt gts + zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile + libGLU libXmu qtbase qttools qtwebkit + ] ++ (with pythonPackages; [ + matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost + ]); + + # Fix missing app icon on Wayland. Has been upstreamed and should be safe to + # remove in versions >= 0.19 + patches = [ + (fetchpatch { + url = "https://github.com/FreeCAD/FreeCAD/commit/c4d2a358ca125d51d059dfd72dcbfba326196dfc.patch"; + sha256 = "0yqc9zrxgi2c2xcidm8wh7a9yznkphqvjqm9742qm5fl20p8gl4h"; + }) + ]; + + cmakeFlags = [ + "-DBUILD_QT5=ON" + "-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include" + "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken" + ("-DPYSIDE_INCLUDE_DIR=${pythonPackages.pyside2}/include" + + ";${pythonPackages.pyside2}/include/PySide2/QtCore" + + ";${pythonPackages.pyside2}/include/PySide2/QtWidgets" + + ";${pythonPackages.pyside2}/include/PySide2/QtGui" + ) + "-DPYSIDE_LIBRARY=PySide2::pyside2" + ]; + + # This should work on both x86_64, and i686 linux + preBuild = '' + export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS"; + ''; + + # Their main() removes PYTHONPATH=, and we rely on it. + preConfigure = '' + sed '/putenv("PYTHONPATH/d' -i src/Main/MainGui.cpp + + qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") + ''; + + qtWrapperArgs = [ + "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1" + ]; + + postFixup = '' + mv $out/share/doc $out + ''; + + meta = with stdenv.lib; { + description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; + homepage = "https://www.freecadweb.org/"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ viric gebner ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix index 2906026c48..5125df7b7d 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.8.1"; + version = "2.9.1"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz"; - sha256 = "00g2vw7lz3yb4nq358x8d3r4mf3hkrq2vw1g9lli27zdp5p6jja1"; + sha256 = "1ls6n1a8vjgwkb40drpc3rapjligaf9fp218539fnwvhv26div69"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -29,6 +29,7 @@ perlPackages.buildPerlPackage rec { Glib GlibObjectIntrospection GooCanvas2 + LocaleCodes LocaleGettext PDFAPI2 ImageSane diff --git a/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix index bde8999eb4..75940fdc45 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix @@ -88,7 +88,7 @@ mkDerivation rec { meta = { description = "A system for processing and editing 3D triangular meshes."; - homepage = "http://www.meshlab.net/"; + homepage = "https://www.meshlab.net/"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix index 08dc87f668..2c3e9fa865 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "0fb7l1h4dhn100y2ydq50cgj63fbr4p11x8h803rv6x3xwmviwcg"; + sha256 = "0cbbbf93gxx768fs6pldy25xk46k7mc8k94r3f7cd83f1qd3s5zn"; }; - vendorSha256 = "06xlwygqw3kzbjqlx09rs9hl4pfsmay5pj4c5hvkrj5z123ldvyw"; + vendorSha256 = "1i0w4284icbl40yrjny9qd5iqrq18x63lrs7p1gz58nybc606azx"; # No tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pinta/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pinta/default.nix index af51c78a16..b534763b24 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pinta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pinta/default.nix @@ -74,7 +74,7 @@ buildDotnetPackage rec { ''; meta = { - homepage = "http://www.pinta-project.com/"; + homepage = "https://www.pinta-project.com/"; description = "Drawing/editing program modeled after Paint.NET"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix index 5f39116e85..11b4971769 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix @@ -13,14 +13,14 @@ let pythonPackages = python3Packages; in mkDerivation rec { - version = "1.9"; + version = "1.10"; pname = "renderdoc"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "18nparkd435hdbm924jfdvmym7f3xd2fcy96jr4lrkl5rhj2sf85"; + sha256 = "1ibf2lv3q69fkzv1nsva2mbdjlayrpxicrd96d9nfcw64f2mv6ds"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/unigine-valley/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/unigine-valley/default.nix index 14ff5f9a51..8043f15308 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/unigine-valley/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/unigine-valley/default.nix @@ -107,7 +107,7 @@ in meta = { description = "The Unigine Valley GPU benchmarking tool"; - homepage = "http://unigine.com/products/benchmarks/valley/"; + homepage = "https://unigine.com/products/benchmarks/valley/"; license = stdenv.lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf maintainers = [ stdenv.lib.maintainers.kierdavis ]; platforms = ["x86_64-linux" "i686-linux"]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/yacreader/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/yacreader/default.nix index 9162e0bdef..2d253d4462 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/yacreader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/yacreader/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "yacreader"; - version = "9.6.2"; + version = "9.7.1"; src = fetchFromGitHub { owner = "YACReader"; repo = pname; rev = version; - sha256 = "1s7kb72skhr364kq8wr2i012jjmaz2vzcz526h0b2bch8921wrnf"; + sha256 = "17kzh69sxpyk4n7c2gkbsvr9y4j14azdy1qxzghsbwp7ij4iw9kv"; }; nativeBuildInputs = [ qmake pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/kde/elisa.nix b/third_party/nixpkgs/pkgs/applications/kde/elisa.nix index a2bfa88f81..bd2cd52947 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/elisa.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/elisa.nix @@ -14,13 +14,13 @@ , kinit , kirigami2 , baloo -, vlc +, libvlc }: mkDerivation rec { name = "elisa"; - buildInputs = [ vlc ]; + buildInputs = [ libvlc ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix b/third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix index 715af073d8..14e1f64ebe 100644 --- a/third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix @@ -1,9 +1,9 @@ { buildGoModule, fetchFromGitHub, installShellFiles, stdenv }: let - humioCtlVersion = "0.26.1"; - sha256 = "1zpcbfv7zlym0jfyz78piggm8zhqlzbwpwq0dn255d0zc48zp773"; - vendorSha256 = "1l2wa4w43srfrkb4qrgiyzdb6bnaqvp9g3fnrln6bhrcw6jsgj4z"; + humioCtlVersion = "0.27.0"; + sha256 = "1h65g10dxcaw4wk0gyyyqj9f94xlphj30lp9w6rsfrk4pi3irzr4"; + vendorSha256 = "0anvah2rpqvxgmdrdj73k3vbf8073nmsl3aykgvb1nraf3gz3bpk"; in buildGoModule { name = "humioctl-${humioCtlVersion}"; pname = "humioctl"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ape/apeclex.nix b/third_party/nixpkgs/pkgs/applications/misc/ape/apeclex.nix index 710ddfec99..8accc06fac 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ape/apeclex.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ape/apeclex.nix @@ -2,7 +2,7 @@ callPackage ./. { pname = "ape-clex"; - lexicon = "${attemptoClex}/clex_lexicon.pl"; + lexiconPath = "${attemptoClex}/clex_lexicon.pl"; description = "Parser for Attempto Controlled English (ACE) with a large lexicon (~100,000 entries)"; license = with stdenv.lib; [ licenses.lgpl3 licenses.gpl3 ]; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/ape/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ape/default.nix index 0d8ebccb3d..dda6c812c8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ape/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ape/default.nix @@ -1,10 +1,10 @@ { stdenv, swiProlog, makeWrapper, fetchFromGitHub, - lexicon ? "prolog/lexicon/clex_lexicon.pl", + lexiconPath ? "prolog/lexicon/clex_lexicon.pl", pname ? "ape", description ? "Parser for Attempto Controlled English (ACE)", license ? with stdenv.lib; licenses.lgpl3 - }: +}: stdenv.mkDerivation rec { inherit pname; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patchPhase = '' # We move the file first to avoid "same file" error in the default case - cp ${lexicon} new_lexicon.pl + cp ${lexiconPath} new_lexicon.pl rm prolog/lexicon/clex_lexicon.pl cp new_lexicon.pl prolog/lexicon/clex_lexicon.pl ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/archiver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/archiver/default.nix index 114021eb78..fed1dc4847 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/archiver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/archiver/default.nix @@ -5,16 +5,18 @@ buildGoModule rec { pname = "archiver"; - version = "3.3.0"; + version = "3.3.2"; src = fetchFromGitHub { owner = "mholt"; repo = pname; rev = "v${version}"; - sha256 = "1yr2jhidqvbwh1y08lpqaidwpr5yx3bhvznm5fc9pk64s7z5kq3h"; + sha256 = "1fi86g27c660g3mv9c5rfm0mmvh5q08704c19xnvrpwlg65glqrz"; }; - vendorSha256 = "1ikrgl03r9zkn86kxkqi2kf540g3qzzz24i5wvh6g3d5q49nygl9"; + vendorSha256 = "1rqhra3rfarq8f750zszkrm0jcsxa4sjbfpmcdlj5z000df699zq"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/audio/sox/default.nix b/third_party/nixpkgs/pkgs/applications/misc/audio/sox/default.nix index 32ea821b22..ab9242c132 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/audio/sox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/audio/sox/default.nix @@ -8,6 +8,7 @@ , enableFLAC ? true, flac ? null , enablePNG ? true, libpng ? null , enableLibsndfile ? true, libsndfile ? null +, enableWavpack ? true, wavpack ? null # amrnb and amrwb are unfree, disabled by default , enableAMR ? false, amrnb ? null, amrwb ? null , enableLibpulseaudio ? true, libpulseaudio ? null @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { optional enableFLAC flac ++ optional enablePNG libpng ++ optional enableLibsndfile libsndfile ++ + optional enableWavpack wavpack ++ optionals enableAMR [ amrnb amrwb ] ++ optional enableLibpulseaudio libpulseaudio ++ optional (stdenv.isDarwin) CoreAudio; diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix index 2a28a4edc4..17f0ffdb92 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -18,11 +18,11 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.90.0"; + version = "2.90.1"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "08qkvgdfrqh4ljqw5m64bbki1dsfcs4xnwzq6829z3ddhiwrxw84"; + sha256 = "169xcmm1zkvab14qdxggqc758xdkqs7r7imwi6yx2fl2djacr3g7"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; diff --git a/third_party/nixpkgs/pkgs/applications/misc/blogc/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blogc/default.nix new file mode 100644 index 0000000000..72e2619145 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/blogc/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ronn, git, cmocka }: + +stdenv.mkDerivation rec { + pname = "blogc"; + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "blogc"; + repo = pname; + rev = "v${version}"; + sha256 = "0hx0gpvmv7rd910czafvmcpxabbvfmvdyxk4d1mckmblx8prb807"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ ronn git cmocka ]; + + configureFlags = [ + "--enable-git-receiver" + "--enable-make" + "--enable-runserver" + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "A blog compiler"; + license = licenses.bsd3; + homepage = "https://blogc.rgm.io"; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/calcurse/default.nix b/third_party/nixpkgs/pkgs/applications/misc/calcurse/default.nix index ce3a2c0a27..9f55975764 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/calcurse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/calcurse/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { customized to suit user needs and a very powerful set of command line options can be used to filter and format appointments, making it suitable for use in scripts. ''; - homepage = "http://calcurse.org/"; + homepage = "https://calcurse.org/"; license = licenses.bsd2; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix new file mode 100644 index 0000000000..5f6b443183 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "charm"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "charmbracelet"; + repo = "charm"; + rev = "v${version}"; + sha256 = "1hgw3sxh7ary75286051v5xmdcw70ns1fm7m5nkqz04cx113hlwj"; + }; + + vendorSha256 = "0lhml6m0j9ksn09j7z4d9pix5aszhndpyqajycwj3apvi3ic90il"; + + doCheck = false; + + buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ]; + + meta = with lib; { + description = "Manage your charm account on the CLI"; + homepage = "https://github.com/charmbracelet/charm"; + license = licenses.mit; + maintainers = with maintainers; [ penguwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix index c3efed72cb..d3f3eb6fcf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "coolreader"; - version = "3.2.45"; + version = "3.2.49"; src = fetchFromGitHub { owner = "buggins"; repo = pname; rev = "cr${version}"; - sha256 = "0nkk4d0j04yjwanjszq8h8hvx87rnwax2k6akm4bpjxwpcs4icws"; + sha256 = "10i3w4zjlilz3smjzbwm50d91ns3w0wlgmsf38fn2lv76zczv8ia"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index e8a04aa2e1..3d7d7bb40a 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.2.0"; + version = "7.2.1"; 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 = "0zpxsdzhn5fsrlq04v5kvkrgf4dsj5zmpypj9awsd2mjcbp6yxd7"; + sha256 = "0vdwbgff55aq5l67fczdvw7kn7kf0dsz183x5lz2v1sb2blsjvjj"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbvisualizer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbvisualizer/default.nix deleted file mode 100644 index 7612c00393..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/dbvisualizer/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, jre, makeWrapper }: - -stdenv.mkDerivation { - name = "dbvisualizer-9.5.7"; - - src = fetchurl { - url = "https://www.dbvis.com/product_download/dbvis-9.5.7/media/dbvis_unix_9_5_7.tar.gz"; - sha256 = "1xv4fw7cji2ffvv7z8vjl5lap512pj60s2ynihirrqld7pmklnyr"; - }; - - buildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/bin - cp -a . $out - ln -sf $out/dbvis $out/bin - wrapProgram $out/bin/dbvis --set INSTALL4J_JAVA_HOME ${jre} - ''; - - meta = { - description = "The universal database tool"; - homepage = "https://www.dbvis.com/"; - license = stdenv.lib.licenses.unfree; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix index d0f84df784..d5c02f6955 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dstask"; - version = "0.20"; + version = "0.21"; src = fetchFromGitHub { owner = "naggie"; repo = pname; rev = "v${version}"; - sha256 = "0hrhvfkqflr4wx1r2xbfbi566pglrp4rp5yq0cr2ml0x6kw3yz0j"; + sha256 = "0af85rs4s0wfnibdhn28qycvy90aafkczccs5vyh36y7cnyhvgkl"; }; # Set vendorSha256 to null because dstask vendors its dependencies (meaning diff --git a/third_party/nixpkgs/pkgs/applications/misc/effitask/default.nix b/third_party/nixpkgs/pkgs/applications/misc/effitask/default.nix index f8adc7f61f..4f3255551c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/effitask/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/effitask/default.nix @@ -4,6 +4,7 @@ , pkg-config , openssl , gtk3 +, rust }: rustPlatform.buildRustPackage rec { @@ -29,7 +30,7 @@ rustPlatform.buildRustPackage rec { # default installPhase don't install assets installPhase = '' runHook preInstall - make install PREFIX="$out" + make install PREFIX="$out" TARGET="target/${rust.toRustTarget stdenv.hostPlatform}/release/effitask" runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/fff/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fff/default.nix index 1397f0a057..cf307afd1b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fff/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fff/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fff"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "dylanaraps"; repo = pname; rev = version; - sha256 = "0s5gi5ghwax5gc886pvbpcmsbmzhxzywajwzjsdxwjyd1v1iynwh"; + sha256 = "14ymdw6l6phnil0xf1frd5kgznaiwppcic0v4hb61s1zpf4wrshg"; }; pathAdd = stdenv.lib.makeSearchPath "bin" ([ xdg_utils file coreutils w3m xdotool ]); diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index 9ee3b96a5b..cc357917c8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -1,28 +1,24 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qmake, qttools, qttranslations }: +{ stdenv, mkDerivation, fetchFromGitHub, qmake, qttools, qttranslations, substituteAll }: mkDerivation rec { pname = "gpxsee"; - version = "7.31"; + version = "7.32"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0y60h66p8ydkinxk9x4sp4cm6gq66nc9jcavy135vmycsiq9gphn"; + sha256 = "0mcd6zv71laykg1208vkqmaxv1v12mqq47156gb78a5ww8paa0ka"; }; - patches = [ + patches = (substituteAll { # See https://github.com/NixOS/nixpkgs/issues/86054 - ./fix-qttranslations-path.diff - ]; + src = ./fix-qttranslations-path.diff; + inherit qttranslations; + }); nativeBuildInputs = [ qmake qttools ]; - postPatch = '' - substituteInPlace src/GUI/app.cpp \ - --subst-var-by qttranslations ${qttranslations} - ''; - preConfigure = '' lrelease gpxsee.pro ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix index a04c2bddaf..37965fd6e3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.74.3"; + version = "0.75.1"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "0rikr4yrjvmrv8smvr8jdbcjqwf61y369wn875iywrj63pyr74r9"; + sha256 = "1c3l3q2xkibl1lz2mbvhgj94s6d9g5nakhpzj252s3m3cgk4w5wh"; }; - vendorSha256 = "17xn6bdy942g6nx5xky41ixmd5kaz68chj3rb02ibpyraamx04nm"; + vendorSha256 = "0gdd8fqd4mwg69wj8dxmm5wh1pjhdc189l2gy6njgpmwh93xbvdg"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix index 7b99f82922..8d161b1d4e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix @@ -1,39 +1,31 @@ -{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3, makeDesktopItem }: +{ stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3, undmg }: let pname = "joplin-desktop"; - version = "1.0.245"; + version = "1.1.4"; name = "${pname}-${version}"; + inherit (stdenv.hostPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; + + suffix = { + x86_64-linux = "AppImage"; + x86_64-darwin = "dmg"; + }.${system} or throwSystem; + src = fetchurl { - url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.AppImage"; - sha256 = "1xybzjixqmp95b2a97kbbygn0jwndws9115cd7mbw8czl7nshdq6"; + url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; + sha256 = { + x86_64-linux = "1jgmjwjl2y3nrywnwidpk6p31sypy3gjghmzzqkrgjpf77ccbssm"; + x86_64-darwin = "1v06k4qrk3n1ncgpmnqp4axmn7gvs3mgbvf8n6ldhgjhj3hq9day"; + }.${system} or throwSystem; }; appimageContents = appimageTools.extractType2 { inherit name src; }; -in appimageTools.wrapType2 rec { - inherit name src; - profile = '' - export LC_ALL=C.UTF-8 - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS - ''; - - multiPkgs = null; # no 32bit needed - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; - extraInstallCommands = '' - mv $out/bin/{${name},${pname}} - install -m 444 -D ${appimageContents}/joplin.desktop $out/share/applications/joplin.desktop - install -m 444 -D ${appimageContents}/joplin.png \ - $out/share/pixmaps/joplin.png - substituteInPlace $out/share/applications/joplin.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - ''; - - - meta = with lib; { + meta = with stdenv.lib; { description = "An open source note taking and to-do application with synchronisation capabilities"; longDescription = '' Joplin is a free, open source note taking and to-do application, which can @@ -45,6 +37,41 @@ in appimageTools.wrapType2 rec { homepage = "https://joplinapp.org"; license = licenses.mit; maintainers = with maintainers; [ hugoreeves ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; -} + + linux = appimageTools.wrapType2 rec { + inherit name src meta; + + profile = '' + export LC_ALL=C.UTF-8 + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + multiPkgs = null; # no 32bit needed + extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; + extraInstallCommands = '' + mv $out/bin/{${name},${pname}} + install -Dm444 ${appimageContents}/joplin.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/joplin.png -t $out/share/pixmaps + substituteInPlace $out/share/applications/joplin.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + }; + + darwin = stdenv.mkDerivation { + inherit name src meta; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "Joplin.app"; + + installPhase = '' + mkdir -p $out/Applications/Joplin.app + cp -R . $out/Applications/Joplin.app + ''; + }; +in +if stdenv.isDarwin +then darwin +else linux diff --git a/third_party/nixpkgs/pkgs/applications/misc/kapow/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kapow/default.nix new file mode 100644 index 0000000000..ccdc57dd0e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/kapow/default.nix @@ -0,0 +1,25 @@ +{ stdenv, qmake, fetchFromGitHub, qtbase, qttools, wrapQtAppsHook }: + +stdenv.mkDerivation rec { + pname = "kapow"; + version = "1.5.10"; + + src = fetchFromGitHub { + owner = "gottcode"; + repo = pname; + rev = "v${version}"; + sha256 = "1fz9fb4w21ax8hjs6dwfn2410ig4lqvzdlijq0jcj3jbgxd4i1gw"; + }; + + nativeBuildInputs = [ qmake qttools wrapQtAppsHook ]; + + buildInputs = [ qtbase ]; + + meta = with stdenv.lib; { + description = "Punch clock to track time spent on projects"; + homepage = "https://gottcode.org/kapow/"; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + license = licenses.gpl3Plus; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/kitty/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kitty/default.nix index 65d7df7248..e2eda846d6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kitty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kitty/default.nix @@ -2,6 +2,7 @@ harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel, libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext, wayland-protocols, wayland, + lcms2, installShellFiles, dbus, Cocoa, @@ -20,19 +21,20 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.18.3"; + version = "0.19.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "0y05bw6d1m79dyhm7b6lk6wy82pmy2s9jhf01kf8gr2p0rjjp9yl"; + sha256 = "145fx4nnn0gszawllfwqf1h65ak0ij6ffargs7y0cgaxsc991s6m"; }; buildInputs = [ harfbuzz ncurses + lcms2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa CoreGraphics @@ -63,17 +65,17 @@ buildPythonApplication rec { patches = [ ./fix-paths.patch - ] ++ stdenv.lib.optionals stdenv.isDarwin [ - ./no-lto.patch ]; # Causes build failure due to warning - hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; + hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "strictoverflow"; dontConfigure = true; buildPhase = if stdenv.isDarwin then '' - ${python.interpreter} setup.py kitty.app --update-check-interval=0 + ${python.interpreter} setup.py kitty.app \ + --update-check-interval=0 \ + --disable-link-time-optimization make man '' else '' ${python.interpreter} setup.py linux-package \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/kitty/no-lto.patch b/third_party/nixpkgs/pkgs/applications/misc/kitty/no-lto.patch deleted file mode 100644 index b1f38f9fd4..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/kitty/no-lto.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -287,10 +287,6 @@ def init_env( - cppflags += shlex.split(os.environ.get('CPPFLAGS', '')) - cflags += shlex.split(os.environ.get('CFLAGS', '')) - ldflags += shlex.split(os.environ.get('LDFLAGS', '')) -- if not debug and not sanitize: -- # See https://github.com/google/sanitizers/issues/647 -- cflags.append('-flto') -- ldflags.append('-flto') - - if profile: - cppflags.append('-DWITH_PROFILER') diff --git a/third_party/nixpkgs/pkgs/applications/misc/netsurf/buildsystem/default.nix b/third_party/nixpkgs/pkgs/applications/misc/netsurf/buildsystem/default.nix deleted file mode 100644 index 9d69054610..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/netsurf/buildsystem/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - - pname = "netsurf-buildsystem"; - version = "1.8"; - - src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/buildsystem-${version}.tar.gz"; - sha256 = "0ffdjwskxlnh8sk40qqfgksbb1nrdzfxsshrscra0p4nqpkj98z6"; - }; - - makeFlags = [ - "PREFIX=$(out)" - ]; - - meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; - description = "Build system for netsurf browser"; - license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libhubbub/default.nix b/third_party/nixpkgs/pkgs/applications/misc/netsurf/libhubbub/default.nix deleted file mode 100644 index 7cfd0a935f..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libhubbub/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, perl -, buildsystem -, libparserutils -}: - -stdenv.mkDerivation rec { - - name = "netsurf-${libname}-${version}"; - libname = "libhubbub"; - version = "0.3.6"; - - src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "1x3v7xvagx85v9h3pypzc86rcxs4mij87mmcqkp8pq50q6awfmnp"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ perl - buildsystem - libparserutils - ]; - - makeFlags = [ - "PREFIX=$(out)" - "NSSHARED=${buildsystem}/share/netsurf-buildsystem" - ]; - - meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; - description = "HTML5 parser library for netsurf browser"; - license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libnsfb/default.nix b/third_party/nixpkgs/pkgs/applications/misc/netsurf/libnsfb/default.nix deleted file mode 100644 index 4e56ce7f5a..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libnsfb/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, uilib? "framebuffer", SDL -, buildsystem -}: - -stdenv.mkDerivation rec { - - name = "netsurf-${libname}-${version}"; - libname = "libnsfb"; - version = "0.2.1"; - - src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "09qag9lgn5ahanbcyf2rvfmsz15vazfwnl8xpn8f1iczd44b0bv0"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ buildsystem SDL ]; - - makeFlags = [ - "PREFIX=$(out)" - "NSSHARED=${buildsystem}/share/netsurf-buildsystem" - "TARGET=${uilib}" - ]; - - meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; - description = "CSS parser and selection library for netsurf browser"; - license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/netsurf/nsgenbind/default.nix b/third_party/nixpkgs/pkgs/applications/misc/netsurf/nsgenbind/default.nix deleted file mode 100644 index 2dd4b83010..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/netsurf/nsgenbind/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl -, flex, bison -, buildsystem -}: - -stdenv.mkDerivation rec { - - pname = "netsurf-nsgenbind"; - version = "0.7"; - - src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/nsgenbind-${version}-src.tar.gz"; - sha256 = "0rplmky4afsjwiwh7grkmcdmzg86zksa55j93dvq92f91yljwqqq"; - }; - - buildInputs = [ buildsystem flex bison ]; - - makeFlags = [ - "PREFIX=$(out)" - "NSSHARED=${buildsystem}/share/netsurf-buildsystem" - ]; - - meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; - description = "Generator for JavaScript bindings for netsurf browser"; - license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 44bd043d34..4e53657a74 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.8.12"; + version = "0.9.1"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "1rvdxdxrfhw0ldslbnmx26znlvznb1iqpk95c0rh12hlzh4nlgxm"; + sha256 = "1skilcqfawvvyj9dnacsmlls55cqq6a4hzz9is165cwkyab185c5"; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pipr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pipr/default.nix index b5a12f9ce7..b3bde2a1c2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pipr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pipr/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "pipr"; - version = "0.0.12"; + version = "0.0.15"; src = fetchFromGitHub { owner = "ElKowar"; repo = pname; rev = "v${version}"; - sha256 = "0l7yvpc59mbzh87lngj6pj8w586fwa07829l5x9mmxnkf6srapmc"; + sha256 = "1pbj198nqi27kavz9bm31a3h7h70by6l00046x09yf9n8qjpp01w"; }; - cargoSha256 = "1xzc1x5mjvj2jgdhwmjbdbqi8d7ln1ss7akn72d96kmy1wsj1qsa"; + cargoSha256 = "1dcrafpf252dpjvimaibb93082nymb26wwbvr34zd6j7z285vach"; nativeBuildInputs = [ makeWrapper ]; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix index 43197c6bf2..26bc6cc0a0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix @@ -6,16 +6,16 @@ stdenv.mkDerivation rec { pname = "pwsafe"; - version = "3.52.0"; + version = "3.53.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${version}"; - sha256 = "1ka7xsl63v0559fzf3pwc1iqr37gwr4vq5iaxa2hzar2g28hsxvh"; + sha256 = "0nh5jnf5yls2qv5hpfhm6i854zsknyh7d93c987a0cg14sg820fv"; }; - nativeBuildInputs = [ + nativeBuildInputs = [ cmake gettext perl pkgconfig zip ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofimoji/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofimoji/default.nix new file mode 100644 index 0000000000..b76b1d6d21 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/rofimoji/default.nix @@ -0,0 +1,45 @@ +{ buildPythonApplication +, fetchFromGitHub +, lib + +, waylandSupport ? true +, x11Support ? true + +, ConfigArgParse +, pyxdg +, rofi +, wl-clipboard +, wtype +, xdotool +, xsel +}: + +buildPythonApplication rec { + pname = "rofimoji"; + version = "4.3.0"; + + src = fetchFromGitHub { + owner = "fdw"; + repo = "rofimoji"; + rev = version; + sha256 = "08ayndpifr04njpijc5n5ii5nvibfpab39p6ngyyj0pb43792a8j"; + }; + + # `rofi` and the `waylandSupport` and `x11Support` dependencies + # contain binaries needed at runtime. + propagatedBuildInputs = with lib; [ ConfigArgParse pyxdg rofi ] + ++ optionals waylandSupport [ wl-clipboard wtype ] + ++ optionals x11Support [ xdotool xsel ]; + + # The 'extractors' sub-module is used for development + # and has additional dependencies. + postPatch = "rm -rf extractors"; + + meta = with lib; { + description = "A simple emoji and character picker for rofi"; + homepage = "https://github.com/fdw/rofimoji"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ justinlovinger ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/rsibreak/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rsibreak/default.nix index eefc0a0c57..432cbfb9b6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rsibreak/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rsibreak/default.nix @@ -7,13 +7,13 @@ let pname = "rsibreak"; version = "0.12"; - revision = ".8"; + revision = ".13"; in mkDerivation rec { name = "rsibreak-${version}${revision}"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${name}.tar.xz"; - sha256 = "1qn9xdjx9zzw47jsj7f4nkqmrangfhdgafm2jxm7cm6z6kcvzr28"; + sha256 = "N0C+f788fq5yotSC54H2K4WDc6PnGi8Nh/vXL4v0fxo="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sakura/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sakura/default.nix index 34a6142e83..89a4cf25b8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sakura/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sakura/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A terminal emulator based on GTK and VTE"; - homepage = "http://www.pleyades.net/david/projects/sakura"; + homepage = "https://www.pleyades.net/david/projects/sakura"; license = licenses.gpl2; maintainers = with maintainers; [ astsmtl codyopel ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sigal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sigal/default.nix index 1802eef540..f2333aa994 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sigal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sigal/default.nix @@ -1,14 +1,16 @@ { lib, python3Packages, ffmpeg_3 }: python3Packages.buildPythonApplication rec { - version = "2.0"; + version = "2.1.1"; pname = "sigal"; src = python3Packages.fetchPypi { inherit version pname; - sha256 = "0ff8hpihbd30xjy155ksfpypjskilqg4zmyavgvpri8jaf1qpv89"; + sha256 = "0l07p457svznirz7qllgyl3qbhiisv7klhz7cbdw6417hxf9bih8"; }; + disabled = !(python3Packages.pythonAtLeast "3.6"); + checkInputs = with python3Packages; [ pytest ]; propagatedBuildInputs = with python3Packages; [ jinja2 @@ -18,6 +20,8 @@ python3Packages.buildPythonApplication rec { clint click blinker + natsort + setuptools_scm ]; makeWrapperArgs = [ "--prefix PATH : ${ffmpeg_3}/bin" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/swappy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/swappy/default.nix new file mode 100644 index 0000000000..ddd9b43485 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/swappy/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub +, meson +, ninja +, wayland +, cairo +, pango +, gtk +, pkgconfig +, cmake +, scdoc +, libnotify +, gio-sharp +, glib +}: + +stdenv.mkDerivation rec { + name = "swappy-${version}"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "jtheoof"; + repo = "swappy"; + rev = "v${version}"; + sha256 = "14ac2jmnak7avcz0jhqjm30vk7pv3gq5aq5rdyh84k8c613kkicf"; + }; + + nativeBuildInputs = [ glib meson ninja pkgconfig cmake scdoc ]; + + buildInputs = [ cairo pango gtk libnotify wayland glib ]; + + strictDeps = true; + + mesonFlags = [ + # TODO: https://github.com/NixOS/nixpkgs/issues/36468 + "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/jtheoof/swappy"; + description = "A Wayland native snapshot editing tool, inspired by Snappy on macOS "; + license = licenses.mit; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/default.nix b/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/default.nix index 6b3ef60d63..d3a8e26a4d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/default.nix @@ -8,7 +8,7 @@ bundlerEnv { meta = { description = "A modern and powerful project management tool"; - homepage = "http://taskjuggler.org/"; + homepage = "https://taskjuggler.org/"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/default.nix index 6475339783..5c15748f2b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/default.nix @@ -13,7 +13,7 @@ bundlerApp { meta = with lib; { description = "A modern and powerful project management tool"; - homepage = "http://taskjuggler.org/"; + homepage = "https://taskjuggler.org/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ manveru nicknovitski ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/vifm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/vifm/default.nix index d939beb443..b014543e8c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/vifm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/vifm/default.nix @@ -4,25 +4,25 @@ , utillinux, file, which, groff # adds support for handling removable media (vifm-media). Linux only! -, mediaSupport ? false, python3 ? null, udisks2 ? null, lib ? null +, mediaSupport ? false, python3 ? null, udisks2 ? null, lib ? null }: let isFullPackage = mediaSupport; in stdenv.mkDerivation rec { pname = if isFullPackage then "vifm-full" else "vifm"; - version = "0.10.1"; + version = "0.11"; src = fetchurl { url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2"; - sha256 = "0fyhxh7ndjn8fyjhj14ymkr3pjcs3k1xbs43g7xvvq85vdb6y04r"; + sha256 = "0rqyd424y0g5b5basw2ybb60r9gar4f40d1xgzr3c2dsy4jpwvyh"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ ncurses libX11 utillinux file which groff ]; postFixup = let - path = lib.makeBinPath - [ udisks2 + path = lib.makeBinPath + [ udisks2 (python3.withPackages (p: [p.dbus-python])) ]; @@ -42,4 +42,3 @@ in stdenv.mkDerivation rec { updateWalker = true; }; } - diff --git a/third_party/nixpkgs/pkgs/applications/misc/vp/default.nix b/third_party/nixpkgs/pkgs/applications/misc/vp/default.nix index 7284fa65e8..8bebed45fc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/vp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/vp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="-I${SDL}/include/SDL -I${SDL_image}/include/SDL"; meta = with stdenv.lib; { - homepage = "http://brlcad.org/~erik/"; + homepage = "https://brlcad.org/~erik/"; description = "SDL based picture viewer/slideshow"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix index 259eb93771..11a4b1a51a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix @@ -2,7 +2,7 @@ , wayland, wlroots, gtkmm3, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell , howard-hinnant-date, cmake , traySupport ? true, libdbusmenu-gtk3 -, pulseSupport ? false, libpulseaudio +, pulseSupport ? true, libpulseaudio , nlSupport ? true, libnl , udevSupport ? true, udev , swaySupport ? true, sway @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "0ks719khhg2zwpyiwa2079i6962qcxpapm28hmr4ckpsp2n659ck"; + sha256 = "038vnma7y7z81caywp45yr364bc1aq8d01j5vycyiyfv33nm76fy"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/xiphos/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xiphos/default.nix index ae18ff72d2..a51cc18bc7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xiphos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xiphos/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { and featureful environment for reading, study, and research using modules from The SWORD Project and elsewhere. ''; - homepage = "http://www.xiphos.org/"; + homepage = "https://www.xiphos.org/"; license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix index 5c4df9880d..a6869179e3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "getzola"; repo = pname; rev = "v${version}"; - sha256 = "119ikgall6bv1r6h1pqcmc6nxkxld2lch04gk860zzk54jragbrp"; + sha256 = "00fkcrr40v93z23h3q2wqlfx0120g59j6j9szk8nx9x85i40j3if"; }; - cargoSha256 = "1jx5bgfmbv0wljps1yv6yir2pjlb0vwzzba4i2sv32awv9y0q3v6"; + cargoSha256 = "1wdypyy787dzdq5q64a9mjfygg0kli49yjzw7xh66sjd7263w9fs"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl oniguruma ] diff --git a/third_party/nixpkgs/pkgs/applications/networking/Sylk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/Sylk/default.nix index 1ab7a0da5d..818ec5d2a6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/Sylk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/Sylk/default.nix @@ -2,7 +2,7 @@ let pname = "Sylk"; - version = "2.8.4"; + version = "2.9.0"; in appimageTools.wrapType2 rec { @@ -10,7 +10,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; - hash = "sha256-2s4ezyszNZD9YBj69f62aqtJWwFeida6G/fOA1exu2M="; + hash = "sha256-vhLZkU4MNAlITsJD+xYPDxeimGw6nHn/Rb5nu35uOfQ="; }; profile = '' @@ -24,7 +24,7 @@ appimageTools.wrapType2 rec { meta = with lib; { description = "Sylk WebRTC client"; - homepage = "http://sylkserver.com/"; + homepage = "https://sylkserver.com/"; license = licenses.agpl3Plus; maintainers = with maintainers; [ zimbatm ]; platforms = [ "i386-linux" "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix b/third_party/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix index 0c8136724f..141bbe654b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix @@ -1,10 +1,6 @@ -{ stdenv, fetchurl, xorg, jre, makeWrapper, makeDesktopItem }: +{ stdenv, fetchurl, jdk14, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret }: let - rpath = stdenv.lib.makeLibraryPath (with xorg; [ - libXtst - ]); - desktopItem = makeDesktopItem { name = "apache-directory-studio"; exec = "ApacheDirectoryStudio"; @@ -14,8 +10,8 @@ let genericName = "Apache Directory Studio"; categories = "Java;Network"; }; - version = "2.0.0-M14"; - versionWithDate = "2.0.0.v20180908-M14"; + version = "2.0.0-M15"; + versionWithDate = "2.0.0.v20200411-M15"; in stdenv.mkDerivation rec { pname = "apache-directory-studio"; @@ -25,16 +21,12 @@ stdenv.mkDerivation rec { if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "mirror://apache/directory/studio/${versionWithDate}/ApacheDirectoryStudio-${versionWithDate}-linux.gtk.x86_64.tar.gz"; - sha256 = "0kq4l3755q69p7bry9xpm5xxw56ksncp76fdqqd1xzbvsg309bps"; - } - else if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - url = "mirror://apache/directory/studio/${versionWithDate}/ApacheDirectoryStudio-${versionWithDate}-linux.gtk.x86.tar.gz"; - sha256 = "038dy8jjgq5gj5r56y9ps3ycqi9gn57i4q1r3mmjx1b1950wmh1q"; + sha256 = "1rkyb0qcsl9hk2qcwp5mwaab69q3sn77v5xyn9mbvi5wg9icbc37"; } else throw "Unsupported system: ${stdenv.hostPlatform.system}"; - buildInputs = [ makeWrapper ]; + buildInputs = [ glib libsecret ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; installPhase = '' dest="$out/libexec/ApacheDirectoryStudio" @@ -44,10 +36,10 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ "$dest/ApacheDirectoryStudio" + makeWrapper "$dest/ApacheDirectoryStudio" \ "$out/bin/ApacheDirectoryStudio" \ - --prefix PATH : "${jre}/bin" \ - --prefix LD_LIBRARY_PATH : "${rpath}" + --prefix PATH : "${jdk14}/bin" install -D icon.xpm "$out/share/pixmaps/apache-directory-studio.xpm" install -D -t "$out/share/applications" ${desktopItem}/share/applications/* ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix index ccdd591cdb..7d67ecdb37 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix @@ -4,7 +4,7 @@ enableGuile ? false, guile ? null , enablePython ? false, python ? null , enablePerl ? (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null -, enableSpidermonkey ? (stdenv.hostPlatform == stdenv.buildPlatform), spidermonkey ? null +, enableSpidermonkey ? (stdenv.hostPlatform == stdenv.buildPlatform), spidermonkey_38 ? null }: assert enableGuile -> guile != null; @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enableGuile guile ++ stdenv.lib.optional enablePython python ++ stdenv.lib.optional enablePerl perl - ++ stdenv.lib.optional enableSpidermonkey spidermonkey + ++ stdenv.lib.optional enableSpidermonkey spidermonkey_38 ; - + nativeBuildInputs = [ autoconf automake gettext pkgconfig ]; configureFlags = [ @@ -50,9 +50,9 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableGuile "--with-guile" ++ stdenv.lib.optional enablePython "--with-python" ++ stdenv.lib.optional enablePerl "--with-perl" - ++ stdenv.lib.optional enableSpidermonkey "--with-spidermonkey=${spidermonkey}" + ++ stdenv.lib.optional enableSpidermonkey "--with-spidermonkey=${spidermonkey_38}" ; - + preConfigure = '' patchShebangs ./autogen.sh ./autogen.sh diff --git a/third_party/nixpkgs/pkgs/applications/misc/netsurf/browser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix similarity index 63% rename from third_party/nixpkgs/pkgs/applications/misc/netsurf/browser/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix index f2fdd01215..407d94a4dc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/netsurf/browser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix @@ -1,25 +1,21 @@ { stdenv, fetchurl, fetchpatch, makeWrapper, wrapGAppsHook # Buildtime dependencies. - , check, pkgconfig, xxd # Runtime dependencies. - , curl, expat, libXcursor, libXrandr, libidn, libjpeg, libpng, libwebp, libxml2 , openssl, perl, perlPackages # uilib-specific dependencies - , gtk2 # GTK 2 +, gtk3 # GTK 3 , SDL # Framebuffer # Configuration - -, uilib ? "framebuffer" +, uilib # Netsurf-specific dependencies - , libcss, libdom, libhubbub, libnsbmp, libnsfb, libnsgif , libnslog, libnspsl, libnsutils, libparserutils, libsvgtiny, libutf8proc , libwapcaplet, nsgenbind @@ -29,24 +25,14 @@ let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - pname = "netsurf"; - version = "3.9"; + version = "3.10"; src = fetchurl { - url = "http://download.netsurf-browser.org/netsurf/releases/source/netsurf-${version}-src.tar.gz"; - sha256 = "1hzcm2s2wh5sapgr000lg63hcdbj6hyajxl43xa1x80kc5piqbyp"; + url = "http://download.netsurf-browser.org/netsurf/releases/source/${pname}-${version}-src.tar.gz"; + sha256 = "sha256-NkhEKeGTYUaFwv8kb1W9Cm3d8xoBi+5F4NH3wohRmV4="; }; - patches = [ - # GTK: prefer using curl's intrinsic defaults for CURLOPT_CA* - (fetchpatch { - name = "0001-GTK-prefer-using-curl-s-intrinsic-defaults-for-CURLO.patch"; - url = "http://source.netsurf-browser.org/netsurf.git/patch/?id=87177d8aa109206d131e0d80a2080ce55dab01c7"; - sha256 = "08bc60pc5k5qpckqv21zgmgszj3rpwskfc84shs8vg92vkimv2ai"; - }) - ]; - nativeBuildInputs = [ makeWrapper perl @@ -54,10 +40,10 @@ stdenv.mkDerivation rec { pkgconfig xxd ] - ++ optional (uilib == "gtk") wrapGAppsHook + ++ optional (uilib == "gtk2" || uilib == "gtk3") wrapGAppsHook ; - buildInputs = [ + buildInputs = [ check curl libXcursor libXrandr libidn libjpeg libpng libwebp libxml2 openssl # Netsurf-specific libraries nsgenbind libnsfb libwapcaplet libparserutils libnslog libcss @@ -65,7 +51,8 @@ stdenv.mkDerivation rec { libutf8proc ] ++ optionals (uilib == "framebuffer") [ expat SDL ] - ++ optional (uilib == "gtk") gtk2 + ++ optional (uilib == "gtk2") gtk2 + ++ optional (uilib == "gtk3") gtk3 ; preConfigure = '' @@ -81,10 +68,16 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; - description = "Free opensource web browser"; - license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; + homepage = "https://www.netsurf-browser.org/"; + description = "A free, open source, small web browser"; + longDescription = '' + NetSurf is a free, open source web browser. It is written in C and + released under the GNU Public Licence version 2. NetSurf has its own + layout and rendering engine entirely written from scratch. It is small and + capable of handling many of the web standards in use today. + ''; + license = licenses.gpl2Only; + maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/buildsystem.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/buildsystem.nix new file mode 100644 index 0000000000..2d625b7254 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/buildsystem.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "netsurf-${libname}"; + libname = "buildsystem"; + version = "1.9"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}.tar.gz"; + sha256 = "sha256-k4QeMUpoggmiC4dF8GU5PzqQ8Bvmj0Xpa8jS9KKqmio="; + }; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + meta = with stdenv.lib; { + homepage = "https://www.netsurf-browser.org/"; + description = "NetSurf browser shared build system"; + license = licenses.mit; + maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/default.nix new file mode 100644 index 0000000000..409ab80ce3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/default.nix @@ -0,0 +1,36 @@ +{ lib, pkgs }: + +lib.makeScope pkgs.newScope (self: with self; { + # ui can be: gtk2, gtk3, sixel, framebuffer. Note that console display (sixel) + # requires a terminal that supports `sixel` capabilities, such as mlterm + # or xterm -ti 340 + ui = "gtk3"; + uilib = + if ui == "gtk2" || + ui == "gtk3" || + ui == "framebuffer" then ui + else if ui == "sixel" then "framebuffer" + else null; # Never will happen + SDL = + if ui == "sixel" then pkgs.SDL_sixel + else if ui == "framebuffer" then pkgs.SDL + else null; + + browser = callPackage ./browser.nix { }; + + buildsystem = callPackage ./buildsystem.nix { }; + libcss = callPackage ./libcss.nix { }; + libdom = callPackage ./libdom.nix { }; + libhubbub = callPackage ./libhubbub.nix { }; + libnsbmp = callPackage ./libnsbmp.nix { }; + libnsfb = callPackage ./libnsfb.nix { }; + libnsgif = callPackage ./libnsgif.nix { }; + libnslog = callPackage ./libnslog.nix { }; + libnspsl = callPackage ./libnspsl.nix { }; + libnsutils = callPackage ./libnsutils.nix { }; + libparserutils = callPackage ./libparserutils.nix { }; + libsvgtiny = callPackage ./libsvgtiny.nix { }; + libutf8proc = callPackage ./libutf8proc.nix { }; + libwapcaplet = callPackage ./libwapcaplet.nix { }; + nsgenbind = callPackage ./nsgenbind.nix { }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libcss/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libcss.nix similarity index 50% rename from third_party/nixpkgs/pkgs/applications/misc/netsurf/libcss/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libcss.nix index 528b0d9b95..db907edd87 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libcss/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libcss.nix @@ -1,26 +1,25 @@ { stdenv, fetchurl, pkgconfig, perl , buildsystem -, libwapcaplet , libparserutils +, libwapcaplet }: stdenv.mkDerivation rec { - - name = "netsurf-${libname}-${version}"; + pname = "netsurf-${libname}"; libname = "libcss"; - version = "0.9.0"; + version = "0.9.1"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "1vw9j3d2mr4wbvs8fyqmgslkbxknvac10456775hflxxcivbm3xr"; + sha256 = "sha256-0tzhbpM5Lo1qcglCDUfC1Wo4EXAaDoGnJPxUHGPTxtw="; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ perl - buildsystem - libwapcaplet + buildInputs = [ + perl libparserutils - ]; + libwapcaplet + buildsystem ]; makeFlags = [ "PREFIX=$(out)" @@ -30,10 +29,16 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE= "-Wno-error=implicit-fallthrough"; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = "https://www.netsurf-browser.org/projects/${libname}/"; description = "Cascading Style Sheets library for netsurf browser"; - license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; + longDescription = '' + LibCSS is a CSS parser and selection engine. It aims to parse the forward + compatible CSS grammar. It was developed as part of the NetSurf project + and is available for use by other software, under a more permissive + license. + ''; + license = licenses.mit; + maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libdom/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libdom.nix similarity index 50% rename from third_party/nixpkgs/pkgs/applications/misc/netsurf/libdom/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libdom.nix index 8dde3e336c..3aa9e3a187 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libdom/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libdom.nix @@ -6,23 +6,22 @@ }: stdenv.mkDerivation rec { - - name = "netsurf-${libname}-${version}"; + pname = "netsurf-${libname}"; libname = "libdom"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "1ixkqsl3f7dl1kajksm0c231w1v5xy8z6hm3v67hgm9nh4qcvfcy"; + sha256 = "sha256-mO4HJHHlXiCMmHjlFcQQrUYso2+HtK/L7K0CPzos70o="; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ expat - buildsystem + buildInputs = [ + expat + libhubbub libparserutils libwapcaplet - libhubbub - ]; + buildsystem ]; makeFlags = [ "PREFIX=$(out)" @@ -30,10 +29,15 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = "https://www.netsurf-browser.org/projects/${libname}/"; description = "Document Object Model library for netsurf browser"; - license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; + longDescription = '' + LibDOM is an implementation of the W3C DOM, written in C. It is currently + in development for use with NetSurf and is intended to be suitable for use + in other projects under a more permissive license. + ''; + license = licenses.mit; + maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libhubbub.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libhubbub.nix new file mode 100644 index 0000000000..53b8d270d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libhubbub.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, pkgconfig, perl +, buildsystem +, libparserutils +}: + +stdenv.mkDerivation rec { + pname = "netsurf-${libname}"; + libname = "libhubbub"; + version = "0.3.7"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; + sha256 = "sha256-nnriU+bJBp51frmtTkhG84tNtSwMoBUURqn6Spd3NbY="; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + perl + libparserutils + buildsystem ]; + + makeFlags = [ + "PREFIX=$(out)" + "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + ]; + + meta = with stdenv.lib; { + homepage = "https://www.netsurf-browser.org/projects/hubbub/"; + description = "HTML5 parser library for netsurf browser"; + longDescription = '' + Hubbub is an HTML5 compliant parsing library, written in C. It was + developed as part of the NetSurf project and is available for use by other + software under the MIT licence. + + The HTML5 specification defines a parsing algorithm, based on the + behaviour of mainstream browsers, which provides instructions for how to + parse all markup, both valid and invalid. As a result, Hubbub parses web + content well. + ''; + license = licenses.mit; + maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libnsbmp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix similarity index 63% rename from third_party/nixpkgs/pkgs/applications/misc/netsurf/libnsbmp/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix index 8a7e8b6074..95487eed00 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libnsbmp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix @@ -3,20 +3,17 @@ }: stdenv.mkDerivation rec { - - name = "netsurf-${libname}-${version}"; + pname = "netsurf-${libname}"; libname = "libnsbmp"; version = "0.1.6"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "0krjg69a2amxjsahdgm3wmy9ngnyr3gfs2a1zhdlbvb0z1jr7i3r"; + sha256 = "sha256-ecSTZfhg7UUb/EEJ7d7I3j6bfOWjvgaVlr0qoZJ5Mk8="; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - buildsystem - ]; + buildInputs = [ buildsystem ]; makeFlags = [ "PREFIX=$(out)" @@ -24,10 +21,10 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = "https://www.netsurf-browser.org/"; description = "BMP Decoder for netsurf browser"; - license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; + license = licenses.mit; + maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsfb.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsfb.nix new file mode 100644 index 0000000000..d37766f533 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsfb.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pkgconfig +, uilib, SDL +, buildsystem +}: + +stdenv.mkDerivation rec { + pname = "netsurf-${libname}"; + libname = "libnsfb"; + version = "0.2.2"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; + sha256 = "sha256-vkRso+tU35A/LamDEdEH11dM0R9awHE+YZFW1NGeo5o="; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL buildsystem ]; + + makeFlags = [ + "PREFIX=$(out)" + "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + "TARGET=${uilib}" + ]; + + meta = with stdenv.lib; { + homepage = "https://www.netsurf-browser.org/projects/${libname}/"; + description = "Netsurf framebuffer abstraction library"; + license = licenses.mit; + maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libnsgif/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsgif.nix similarity index 62% rename from third_party/nixpkgs/pkgs/applications/misc/netsurf/libnsgif/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsgif.nix index 8bb67df70d..d8683280c4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libnsgif/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsgif.nix @@ -3,18 +3,17 @@ }: stdenv.mkDerivation rec { - - name = "netsurf-${libname}-${version}"; + pname = "netsurf-${libname}"; libname = "libnsgif"; version = "0.2.1"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "0jwshypgmx16xlsbx3d8njk8a5khazlplca5mxd3rdbhrlsabbly"; + sha256 = "sha256-nq6lNM1wtTxar0UxeulXcBaFprSojb407Sb0+q6Hmks="; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ buildsystem]; + buildInputs = [ buildsystem ]; makeFlags = [ "PREFIX=$(out)" @@ -22,10 +21,10 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = "https://www.netsurf-browser.org/projects/${libname}/"; description = "GIF Decoder for netsurf browser"; - license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; + license = licenses.mit; + maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libnslog/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnslog.nix similarity index 62% rename from third_party/nixpkgs/pkgs/applications/misc/netsurf/libnslog/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnslog.nix index 43b4622ab0..12fdcff50b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libnslog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnslog.nix @@ -3,20 +3,17 @@ }: stdenv.mkDerivation rec { - - name = "netsurf-${libname}-${version}"; + pname = "netsurf-${libname}"; libname = "libnslog"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "1ggs6xvxp8fbg5w8pifalipm458ygr9ab6j2yvj8fnnmxwvdh4jd"; + sha256 = "sha256-/JjcqdfvpnCWRwpdlsAjFG4lv97AjA23RmHHtNsEU9A="; }; nativeBuildInputs = [ pkgconfig bison flex ]; - buildInputs = [ - buildsystem - ]; + buildInputs = [ buildsystem ]; makeFlags = [ "PREFIX=$(out)" @@ -24,10 +21,10 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = "https://www.netsurf-browser.org/"; description = "NetSurf Parametric Logging Library"; - license = licenses.mit; - maintainers = [ maintainers.samueldr ]; + license = licenses.isc; + maintainers = [ maintainers.samueldr maintainers.AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libnspsl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnspsl.nix similarity index 65% rename from third_party/nixpkgs/pkgs/applications/misc/netsurf/libnspsl/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnspsl.nix index 5ded38d974..4338f78247 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libnspsl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnspsl.nix @@ -3,20 +3,17 @@ }: stdenv.mkDerivation rec { - - name = "netsurf-${libname}-${version}"; + pname = "netsurf-${libname}"; libname = "libnspsl"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "0siq8zjfxv75i9fw6q5hkaijpdm1w3zskd5qk6vsvz8cqan4vifd"; + sha256 = "sha256-08WCBct40xC/gcpVNHotCYcZzsrHBGvDZ5g7E4tFAgs="; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - buildsystem - ]; + buildInputs = [ buildsystem ]; makeFlags = [ "PREFIX=$(out)" @@ -24,10 +21,10 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = "https://www.netsurf-browser.org/"; description = "NetSurf Public Suffix List - Handling library"; license = licenses.mit; - maintainers = [ maintainers.samueldr ]; + maintainers = [ maintainers.samueldr maintainers.AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libnsutils/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsutils.nix similarity index 60% rename from third_party/nixpkgs/pkgs/applications/misc/netsurf/libnsutils/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsutils.nix index 6d3a3d1f10..42c8b8b062 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libnsutils/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsutils.nix @@ -3,18 +3,17 @@ }: stdenv.mkDerivation rec { - - name = "netsurf-${libname}-${version}"; + pname = "netsurf-${libname}"; libname = "libnsutils"; - version = "0.0.5"; + version = "0.1.0"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "09w1rixps1iiq6wirjwxmd6h87llvjzvw565rahjb3rlyhcplfqf"; + sha256 = "sha256-eQxlFjRKvoL2KJ1lY5LpzOvkdbIMx+Hi2EMBE4X3rvA="; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ buildsystem]; + buildInputs = [ buildsystem ]; makeFlags = [ "PREFIX=$(out)" @@ -22,10 +21,10 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = "https://www.netsurf-browser.org/projects/${libname}/"; description = "Generalised utility library for netsurf browser"; - license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; + license = licenses.mit; + maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libparserutils/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libparserutils.nix similarity index 60% rename from third_party/nixpkgs/pkgs/applications/misc/netsurf/libparserutils/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libparserutils.nix index 9fcd5cfebf..b96018d92e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libparserutils/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libparserutils.nix @@ -3,17 +3,16 @@ }: stdenv.mkDerivation rec { - - name = "netsurf-${libname}-${version}"; + pname = "netsurf-${libname}"; libname = "libparserutils"; version = "0.2.4"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "1n2794y2l0c8nv8z2pxwfnbn882987ifmxjv60zdxkhcndhswarj"; + sha256 = "sha256-MiuuYbMMzt4+MFv26uJBSSBkl3W8X/HRtogBKjxJR9g="; }; - buildInputs = [ buildsystem perl ]; + buildInputs = [ perl buildsystem ]; makeFlags = [ "PREFIX=$(out)" @@ -21,10 +20,10 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = "https://www.netsurf-browser.org/projects/${libname}/"; description = "Parser building library for netsurf browser"; - license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; + license = licenses.mit; + maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libsvgtiny/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix similarity index 71% rename from third_party/nixpkgs/pkgs/applications/misc/netsurf/libsvgtiny/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix index b6e1b5a166..aef154bbc1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libsvgtiny/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix @@ -7,24 +7,22 @@ }: stdenv.mkDerivation rec { - - name = "netsurf-${libname}-${version}"; + pname = "netsurf-${libname}"; libname = "libsvgtiny"; version = "0.1.7"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "10bpkmvfpydj74im3r6kqm9vnvgib6afy0alx71q5n0w5yawy39c"; + sha256 = "sha256-LA3PlS8c2ILD6VQB75RZ8W27U8XT5FEjObL563add4E="; }; nativeBuildInputs = [ pkgconfig gperf ]; buildInputs = [ - buildsystem libdom libhubbub libparserutils libwapcaplet - ]; + buildsystem ]; makeFlags = [ "PREFIX=$(out)" @@ -32,10 +30,10 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = "https://www.netsurf-browser.org/projects/${libname}/"; description = "NetSurf SVG decoder"; license = licenses.mit; - maintainers = [ maintainers.samueldr ]; + maintainers = [ maintainers.samueldr maintainers.AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libutf8proc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix similarity index 63% rename from third_party/nixpkgs/pkgs/applications/misc/netsurf/libutf8proc/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix index dcd56182e3..59bae9e941 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libutf8proc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix @@ -3,18 +3,17 @@ }: stdenv.mkDerivation rec { - - name = "netsurf-${libname}-${version}"; + pname = "netsurf-${libname}"; libname = "libutf8proc"; version = "2.4.0-1"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "0wn409laqaqlqnz2d77419b5rya99vvc696vj187biy1i5livaq1"; + sha256 = "sha256-AasdaYnBx3VQkNskw/ZOSflcVgrknCa+xRQrrGgCxHI="; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ buildsystem]; + buildInputs = [ buildsystem ]; makeFlags = [ "PREFIX=$(out)" @@ -22,10 +21,10 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = "https://www.netsurf-browser.org/projects/${libname}/"; description = "UTF8 Processing library for netsurf browser"; - license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; + license = licenses.mit; + maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libwapcaplet/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix similarity index 65% rename from third_party/nixpkgs/pkgs/applications/misc/netsurf/libwapcaplet/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix index f3c7bcbd1a..8c5af461fd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/netsurf/libwapcaplet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix @@ -3,14 +3,13 @@ }: stdenv.mkDerivation rec { - - name = "netsurf-${libname}-${version}"; + pname = "netsurf-${libname}"; libname = "libwapcaplet"; - version = "0.4.2"; + version = "0.4.3"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "1fjwzbn7j8bi1b9bvwxsy3i2cr6byq2s2d29866801pjnf528g86"; + sha256 = "sha256-myqh3W1mRfjpkrNpf9vYfwwOHaVyH6VO0ptITRMWDFw="; }; buildInputs = [ buildsystem ]; @@ -23,10 +22,10 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = "https://www.netsurf-browser.org/projects/${libname}/"; description = "String internment library for netsurf browser"; - license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; + license = licenses.mit; + maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/nsgenbind.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/nsgenbind.nix new file mode 100644 index 0000000000..0be7adc4a5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/nsgenbind.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl +, flex, bison +, buildsystem +}: + +stdenv.mkDerivation rec { + pname = "netsurf-${libname}"; + libname = "nsgenbind"; + version = "0.8"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; + sha256 = "sha256-TY1TrQAK2nEncjZeanPrj8XOl1hK+chlrFsmohh/HLM="; + }; + + buildInputs = [ flex bison buildsystem ]; + + makeFlags = [ + "PREFIX=$(out)" + "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + ]; + + meta = with stdenv.lib; { + homepage = "https://www.netsurf-browser.org/"; + description = "Generator for JavaScript bindings for netsurf browser"; + license = licenses.mit; + maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; + 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 3e24a3d060..7a5ecc5c80 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helm"; - version = "3.3.1"; + version = "3.3.4"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "0y3ilvafzwizd9zqvp8jijkkd1c2yy7zyl5xfma1zv2x96p7xgqh"; + sha256 = "1b719kzchgis4imscgf6i7dvc1mq3ymgh5ganpb89kcs88qw3szj"; }; vendorSha256 = "0f8a0psvic923rh13f5041p7hr6w8dy9qxdw3l195yky5cf3fj6w"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix index 3b3794e953..3656d28fbf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.128.0"; + version = "0.130.0"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "1ihvjbh3v91wxny9jq0x9qi3s2zzdpg96w1vrhiim43nnv0ydg1y"; + sha256 = "17wn1jmgc9hcy4yfrxvamy4w1n65afkn7k830sj8b02j0kl6vir4"; }; - vendorSha256 = "181iksfadjqrgsia8zy0zf5lr4h732s7hxjjfkr4gac586dlbj0w"; + vendorSha256 = "1k3aamsm97w22pdip2916a5f619rvnif7s8g6815pzsapgnpp4qp"; doCheck = false; 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 3c793cc9ec..c365bf1e7a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.21.7"; + version = "0.22.1"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "1rw1vzxfjzklzdpcxz7mplvlmggavaym260s7vzvbgvd1snf38cb"; + sha256 = "1qyibpvfbd8yahfmci431qd0zy4wwz03gwj1ak8rn3qxpv1cdbmk"; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - vendorSha256 = "05rsbi40pihdh212d5zn6cchnkrqd6rsyl3vfsw77ksybwakrbf7"; + vendorSha256 = "1432ppgd3lc0h83i6vzklfhp95s2xwaf41mv4xfryzzszjfndmvl"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix index c370d12270..a380cc200d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix @@ -2,19 +2,21 @@ buildGoModule rec { pname = "kpt"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = pname; rev = "v${version}"; - sha256 = "1lvfbpxxddm1pk4mb4sm0chw15dalsfyhgy86npz94xjf1jssyh8"; + sha256 = "1x4g45sq8licjcccvad6w1yb9h2z2cc2xbpp073j1pafnqwmrswq"; }; - vendorSha256 = "1xkjgzy9z7v5z4kl1769dgrrr0ljr0fdxfdj7xbic9hl6nm94kif"; + vendorSha256 = "1vpljhqbvwv3a7k4c7p3n4ixh32f8hp9cqj8jz03mzqlmf60pyfs"; subPackages = [ "." ]; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/GoogleContainerTools/kpt/run.version=${version}" ]; + meta = with lib; { description = "A toolkit to help you manage, manipulate, customize, and apply Kubernetes Resource configuration data files"; homepage = "https://googlecontainertools.github.io/kpt/"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix index 0c1f452ea5..bb3b7aedd8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kube3d"; - version = "3.0.1"; + version = "3.0.2"; k3sVersion = "1.18.6-k3s1"; excludedPackages = ''tools''; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "1l6mh0dpf2bw9sxpn14iivv3pr8mj4favzx2hhn8k1j71cm1w4rj"; + sha256 = "182n4kggwr6z75vsagfd0rl89ixcw5h13whf56jh4cd38dj8is5l"; }; buildFlagsArray = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix new file mode 100644 index 0000000000..4d883553bc --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, buildGoModule, go }: + +buildGoModule rec { + pname = "kubelogin"; + version = "0.0.6"; + + src = fetchFromGitHub { + owner = "Azure"; + repo = pname; + rev = "v${version}"; + sha256 = "18rkjdl8asr5c1kgdm2iqb5qwkfcrv2sk3nns3hhfqzs2v9mxmha"; + }; + + vendorSha256 = "0al8y65xvnwl34jkpqyf6zwr21xn30zswknlym9nnn1n47fyayxb"; + + buildFlagsArray = '' + -ldflags= + -X main.version=${version} + -X main.goVersion=${stdenv.lib.getVersion go} + ''; + + meta = with stdenv.lib; { + description = "A Kubernetes credential plugin implementing Azure authentication"; + inherit (src.meta) homepage; + license = licenses.mit; + maintainers = with maintainers; [ yurrriq ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix index 98b71cfe11..e0a6cd48d6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix @@ -9,11 +9,11 @@ let }; in with python.pkgs; buildPythonApplication rec { pname = "luigi"; - version = "3.0.1"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "02c480f5pjgqsvqnkaw7f6n4nhdspmhq5w7lw8sgg2v3jghg8n7i"; + sha256 = "b4b1ccf086586d041d7e91e68515d495c550f30e4d179d63863fea9ccdbb78eb"; }; propagatedBuildInputs = [ dateutil tornado_5 python-daemon boto3 ]; 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 117fb874bc..4ffe430544 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 @@ -244,9 +244,9 @@ { owner = "poseidon"; repo = "terraform-provider-ct"; - rev = "v0.5.0"; - version = "0.5.0"; - sha256 = "1zqfaxlyhr9vpqj2qqpfyh1f1nfpynb7c5ris6mdmy9zin55ppni"; + rev = "v0.6.1"; + version = "0.6.1"; + sha256 = "0hh3hvi8lwb0h8x9viz5p991w94gn7354nw95b51rdmir9qi2x89"; }; datadog = { 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 686b9ef950..8b28f8bab5 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 @@ -17,7 +17,7 @@ let }; # Terraform allow checking the provider versions, but this breaks # if the versions are not provided via file paths. - postBuild = "mv go/bin/${repo}{,_v${version}}"; + postBuild = "mv $NIX_BUILD_TOP/go/bin/${repo}{,_v${version}}"; }; # Google is now using the vendored go modules, which works a bit differently @@ -39,6 +39,8 @@ let # just build and install into $GOPATH/bin buildPhase = '' go install -mod=vendor -v -p 16 . + + runHook postBuild ''; # don't run the tests, they are broken in this setup 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 a6d9278f58..b531055a1b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -132,8 +132,8 @@ in rec { }); terraform_0_13 = pluggable (generic { - version = "0.13.3"; - sha256 = "1bjgsabkyh3xf4gdp41mwhw6bpmjg45bnq2hk522glk02n2xngpw"; + version = "0.13.4"; + sha256 = "1yvcz14q82v9jq4b9knn6wgnhlhrsz2ncvxv4lh9y1avn56chsqc"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix new file mode 100644 index 0000000000..1954f867eb --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, ... }: + +stdenv.mkDerivation rec { + + pname = "terranix"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "mrVanDalo"; + repo = "terranix"; + rev = version; + sha256 = "030067h3gjc02llaa7rx5iml0ikvw6szadm0nrss2sqzshsfimm4"; + }; + + installPhase = '' + mkdir -p $out + mv bin core modules lib $out/ + ''; + + meta = with stdenv.lib; { + description = "A NixOS like terraform-json generator"; + homepage = "https://terranix.org"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ mrVanDalo ]; + }; + +} + diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix index 18c3958877..3b8f6e0a05 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -1,26 +1,29 @@ { stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkg-config, libxml2, json_c, ncurses -, asciidoctor, libiconv, Security, makeWrapper }: +, asciidoctor, libiconv, Security, Foundation, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.20.1"; + version = "2.21"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - sha256 = "1i9dpkdlsm3ya0w2x4c8kplrp3qzd8slbkcqvzfpqggb67gvczvv"; + sha256 = "0ignfmh5193bigvk9f057r0r4yaxymxv2afycn2b98w05gljccb6"; }; - cargoSha256 = "1ykffx2lhn4w56qm1wypkg9wsqpvzzrz419qkl95w1384xf3f7ix"; + cargoSha256 = "16652i2hbs6d3fam2hdlc947i5nrb3na186zfcb4nfh7hnb7lh8g"; postPatch = '' substituteInPlace Makefile --replace "|| true" "" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - # Allow other ncurses versions on Darwin - substituteInPlace config.sh \ - --replace "ncurses5.4" "ncurses" - ''; + '' + # TODO: Check if that's still needed + + stdenv.lib.optionalString stdenv.isDarwin '' + # Allow other ncurses versions on Darwin + substituteInPlace config.sh \ + --replace "ncurses5.4" "ncurses" + '' + ; nativeBuildInputs = [ pkg-config @@ -29,7 +32,7 @@ rustPlatform.buildRustPackage rec { ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ncurses ]; buildInputs = [ stfl sqlite curl libxml2 json_c ncurses ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv gettext ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ Security Foundation libiconv gettext ]; postBuild = '' make prefix="$out" @@ -38,6 +41,13 @@ rustPlatform.buildRustPackage rec { # TODO: Check if that's still needed NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -Wno-error=format-security"; + # https://github.com/NixOS/nixpkgs/pull/98471#issuecomment-703100014 . We set + # these for all platforms, since upstream's gettext crate behavior might + # change in the future. + GETTEXT_LIB_DIR = "${stdenv.lib.getLib gettext}/lib"; + GETTEXT_INCLUDE_DIR = "${stdenv.lib.getDev gettext}/include"; + GETTEXT_BIN_DIR = "${stdenv.lib.getBin gettext}/bin"; + doCheck = true; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index 649e3b673d..8672f64be3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.112"; + version = "0.0.114"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "1ibw3lsk1060g6b79v78292q45ayqj3izrs3ilvg4gfwmfxmm1a0"; + sha256 = "0j3w4jf4jisrpz03462sqjsrvjw50kqqq3psyympw0jb1wjccc41"; }; }; }.${branch} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 8d2632420f..25685916ca 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.7", + "version": "1.7.8", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -56,12 +56,12 @@ "tar": "^6.0.1" }, "hakDependencies": { - "matrix-seshat": "^2.1.0", + "matrix-seshat": "^2.1.1", "keytar": "^5.6.0" }, "build": { "appId": "im.riot.app", - "electronVersion": "9.1.2", + "electronVersion": "10.1.1", "files": [ "package.json", { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index d44fadea78..d86970f405 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.7"; + version = "1.7.8"; src = fetchFromGitHub { owner = "vector-im"; repo = "riot-desktop"; rev = "v${version}"; - sha256 = "1h3v3d41ykgwn397nhm9zaqgf3n69zh592sjzrprvk1gsn5kj5h2"; + sha256 = "04pfx8knixwlz6s7yxcbff6hpyq75hd4wyj9npil6pcmkxglns5l"; }; electron = electron_9; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix index 3130c2cac4..e9af910809 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.7"; + version = "1.7.8"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1hly102725qh4xjggxv85w1hyq26mhkgj3y6s76yar7i3smj6kpw"; + sha256 = "1ss5hf4vbr1gr4x3js9blv85fzy8asa1s2gv3rds8aiqnia83alf"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index 7bb2517a18..72309e3479 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pidgin-skypeweb"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "EionRobb"; repo = "skype4pidgin"; rev = version; - sha256 = "1q3m8hyr77mxm4y0zify2xhjp9d8y4pgwvqyfly4zcpmyd2argi1"; + sha256 = "11snyrjhm58gjvdmr5h5ajii3ah4a7c8zw3cavjv9xnnwrpfm5rb"; }; setSourceRoot = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix index 7d7abbd1ee..5b3a1564ae 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "purple-slack-unstable"; - version = "2019-08-18"; + version = "2020-09-22"; src = fetchFromGitHub { owner = "dylex"; repo = "slack-libpurple"; - rev = "be97802c7fd0b611722d2f551756e2a2672f6084"; - sha256 = "0l6hwnnv6zzszxkk0a3nli88w5gijvlc9qgkkai0sb4v4c504y5v"; + rev = "2e9fa028224b02e29473b1b998fc1e5f487e79ec"; + sha256 = "1sksqshiwldd32k8jmiflp2pcax31ym6rypr4qa4v5vdn907g80m"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 5c46a5a0fd..c1b9cdc122 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.6.8"; + version = "0.6.10"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "0gcyj8r7156zn5zzfnabf0mw3kcaq7v29vsjb6mdvj8cjjm05dvd"; + sha256 = "0zglcx5ylqjc3hjkzi84mjhp9dchnnkv12qq75q5pqkx1w45rmim"; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; 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 881d7458c0..85f71fd0eb 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 @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.36.1"; # Please backport all updates to the stable channel. + version = "1.36.3"; # 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: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0lc56g09g2xfwxwm046bcykvxd0nq63zazamnp268z28lnn937mc"; + sha256 = "1b75b5li0im2mwskkf1xsa6sjprl56isvcz2iy1gc48bambc72pc"; }; nativeBuildInputs = [ 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 bdcaf3bd60..bc5fa0e1f1 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.63.0.76"; + version = "8.64.0.81"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -65,7 +65,7 @@ let "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 = "0gmrk1giabr53imiwdflf6ykwpcj2q5zn3bynvrncnhivsbvaavy"; + sha256 = "0p6sp45kabm97p3hp3wp087b3k42m26ji99kzhpsz3n9vzjiczjh"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; 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 d176b66f7e..3109db89ff 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "5.3.465578.0920"; + version = "5.3.469451.0927"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "0gqpisbzyx2xic0drvyqfbd2x2a5qcizl355qkwwibq3v24mx7kp"; + sha256 = "0qb9jx2zd5p6jk1g0xmh1f6xlf4gfl38ns6ixpc653qfimy8b0av"; }; }; @@ -27,8 +27,8 @@ let desktopIntegration = fetchFromGitHub { owner = "flathub"; repo = "us.zoom.Zoom"; - rev = "0d294e1fdd2a4ef4e05d414bc680511f24d835d7"; - sha256 = "0rm188844a10v8d6zgl2pnwsliwknawj09b02iabrvjw5w1lp6wl"; + rev = "25e14f8141cdc682b4f7d9ebe15608619f5a19f2"; + sha256 = "0w3pdd5484r3nsb4iahi37jdlm37vm1053sb8k2zlqb9s554zjwp"; }; in mkDerivation { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix index c1ae0ce0a0..dbf6cf46e9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,12 +5,12 @@ let pname = "zulip"; - version = "5.4.0"; + version = "5.4.3"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - sha256 = "14p0nly144rivd9yk273asfjza5p9qncpbmh4qxnd4gq01f98igh"; + sha256 = "0yd4g87kcwiy1arx3y2nyb7lq1nlh4cn87762k2sd8n4s9i52c7r"; name="${pname}-${version}.AppImage"; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/iptraf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/iptraf/default.nix index 83d9a019e4..e57c8bbae0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/iptraf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/iptraf/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus; description = "Console-based network statistics utility for Linux"; platforms = stdenv.lib.platforms.linux; + broken = true; # required isdn headers have been removed from the linux kernel }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix index 7a30737c04..9487780634 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix @@ -6,13 +6,13 @@ with stdenv.lib; perlPackages.buildPerlPackage rec { pname = "convos"; - version = "4.33"; + version = "4.40"; src = fetchFromGitHub { owner = "Nordaaker"; repo = pname; rev = version; - sha256 = "0mxq4jpjk4vvhi5lqslj614dvk84iq12rsdyykxr8h9cnjjs57im"; + sha256 = "0yyykr86d494xq1ga5ncr6jmdf0ny1r4gm0wzwn49bxn2x1l0xck"; }; nativeBuildInputs = [ makeWrapper ] diff --git a/third_party/nixpkgs/pkgs/applications/networking/libcoap/default.nix b/third_party/nixpkgs/pkgs/applications/networking/libcoap/default.nix index d3a3dd6e29..2448e8a76f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/libcoap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/libcoap/default.nix @@ -1,13 +1,13 @@ { fetchFromGitHub, automake, autoconf, which, pkgconfig, libtool, stdenv }: stdenv.mkDerivation rec { pname = "libcoap"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { repo = "libcoap"; owner = "obgm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0mmvkq72i4rda6b7g93qrwg2nwh2rvkq4xw70yppj51hsdrnpfl7"; + sha256 = "1jkvha52lic13f13hnppizkl80bb2rciayb5hxici0gj6spphgha"; }; nativeBuildInputs = [ automake diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 08acda3adb..a2a26010e4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,5 +1,5 @@ -{ config, fetchurl, fetchpatch, stdenv, wrapGAppsHook, autoreconfHook -, curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme +{ config, fetchurl, stdenv, wrapGAppsHook, autoreconfHook +, curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme, gumbo , libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager , openldap, perl, pkgconfig, poppler, python, shared-mime-info , glib-networking, gsettings-desktop-schemas, libSM, libytnef, libical @@ -13,6 +13,7 @@ , enableNetworkManager ? config.networking.networkmanager.enable or false , enablePgp ? true , enablePluginArchive ? false +, enablePluginLitehtmlViewer ? false , enablePluginNotificationDialogs ? true , enablePluginNotificationSounds ? true , enablePluginPdf ? false @@ -30,25 +31,17 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "claws-mail"; - version = "3.17.6"; + version = "3.17.7"; src = fetchurl { - url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; - sha256 = "1s05qw0r0gqwvvkxvrrwbjkbi61dvilixiwrpgcq21qc9csc9r0m"; + url = "https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; + sha256 = "1j6x09621wng0lavh53nwzh9vqjzpspl8kh5azh7kbihpi4ldfb0"; }; outputs = [ "out" "dev" ]; patches = [ ./mime.patch - - # Backports a mitigation to the "mailto vulnerability". This patch is - # included in the next release and must therefore be removed. - (fetchpatch { - name = "fix-4373-4374.patch"; - url = "https://git.claws-mail.org/?p=claws.git;a=patch;h=4c9d15b4b37cdc57edfa16df550a0a881a156153"; - sha256 = "0sp0vxr6pk2fv5ydpcakb50rmn2w2nma98apgfsgcgan82qmwk7n"; - }) ]; preConfigure = '' @@ -73,6 +66,7 @@ stdenv.mkDerivation rec { ++ optional enablePluginArchive libarchive ++ optional enablePluginNotificationSounds libcanberra-gtk2 ++ optional enablePluginNotificationDialogs libnotify + ++ optional enablePluginLitehtmlViewer gumbo ++ optional enablePluginRssyl libxml2 ++ optional enableNetworkManager networkmanager ++ optional enableLdap openldap @@ -88,6 +82,7 @@ stdenv.mkDerivation rec { "--disable-pgpmime-plugin" ] ++ optional (!enablePluginArchive) "--disable-archive-plugin" + ++ optional (!enablePluginLitehtmlViewer) "--disable-litehtml_viewer-plugin" ++ optional (!enablePluginPdf) "--disable-pdf_viewer-plugin" ++ optional (!enablePluginPython) "--disable-python-plugin" ++ optional (!enablePluginRavatar) "--disable-libravatar-plugin" diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix index fc9001e59e..2ac32f3430 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -1,36 +1,30 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, libiconv, ruby ? null }: +{ stdenv, lib, fetchFromGitHub, installShellFiles, libiconv, ruby ? null }: stdenv.mkDerivation rec { pname = "mblaze"; - version = "0.5.1"; + version = "1.0"; + nativeBuildInputs = [ installShellFiles ]; buildInputs = [ ruby ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; src = fetchFromGitHub { - owner = "chneukirchen"; + owner = "leahneukirchen"; repo = "mblaze"; rev = "v${version}"; - sha256 = "11x548dl2jy9cmgsakqrzfdq166whhk4ja7zkiaxrapkjmkf6pbh"; + sha256 = "0hxy3mjjv4hg856sl1r15fdmqaw4s9c26b3lidsd5x0kpqy601ai"; }; - patches = [ - (fetchpatch { - url = "https://github.com/leahneukirchen/mblaze/commit/53151f4f890f302291eb8d3375dec4f8ecb66ed7.patch"; - sha256 = "1mcyrh053iiyzdhgm09g5h3a77np496whnc7jr4agpk1nkbcpfxc"; - }) - ]; - makeFlags = [ "PREFIX=$(out)" ]; postInstall = '' - install -Dm644 -t $out/share/zsh/site-functions contrib/_mblaze + installShellCompletion contrib/_mblaze '' + lib.optionalString (ruby != null) '' install -Dt $out/bin contrib/msuck contrib/mblow ''; meta = with lib; { - homepage = "https://github.com/chneukirchen/mblaze"; - description = "Unix utilities to deal with Maildir"; + homepage = "https://github.com/leahneukirchen/mblaze"; + description = "Unix utilities for processing and interacting with mail messages which are stored in maildir folders"; license = licenses.cc0; platforms = platforms.all; maintainers = [ maintainers.ajgrf ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix index 1a6ae282a8..1abaeb6f16 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix @@ -15,15 +15,15 @@ rustPlatform.buildRustPackage rec { pname = "meli"; - version = "alpha-0.6.1"; + version = "alpha-0.6.2"; src = fetchgit { url = "https://git.meli.delivery/meli/meli.git"; rev = version; - sha256 = "0fs3wccbdfxf4nmx9l5wy7qpjk4r11qg0fc59y0pdvjrrslcjsds"; + sha256 = "0ycyksrrp4llwklzx3ipac8hmpfxa1pa7dqsm82wic0f6p5d1dp6"; }; - cargoSha256 = "sha256:19j7jrizp7yifmqwrmnv66pka7131jl7ks4zgs3nr5gbb28zvdrz"; + cargoSha256 = "sha256:0lxwhb2c16w5z7rqzch0ij8n8hxb5xcin31w9i28mzv1xm7sg8ks"; cargoBuildFlags = lib.optional withNotmuch "--features=notmuch"; @@ -35,9 +35,10 @@ rustPlatform.buildRustPackage rec { postInstall = '' mkdir -p $out/share/man/man1 - gzip < meli.1 > $out/share/man/man1/meli.1.gz + gzip < docs/meli.1 > $out/share/man/man1/meli.1.gz mkdir -p $out/share/man/man5 - gzip < meli.conf.5 > $out/share/man/man5/meli.conf.5.gz + gzip < docs/meli.conf.5 > $out/share/man/man5/meli.conf.5.gz + gzip < docs/meli-themes.5 > $out/share/man/man5/meli-themes.5.gz ''; meta = with stdenv.lib; { 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 84c81ecff6..8d3fb26b06 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,18 +1,19 @@ { 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, elinks, mailcap, runtimeShell, sqlite, zlib +, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, runtimeShell, sqlite, zlib , glibcLocales +, fetchpatch }: stdenv.mkDerivation rec { - version = "20200821"; + version = "20200925"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "0l66xf6qp2fdhm5h2v58bbc73pwj72c80mriqac9pfyjh5padir5"; + sha256 = "1q931n9sijq1iin3swzk57rz7qmy485hvr1fahy5i2wd1xx9yhb2"; }; buildInputs = [ @@ -21,8 +22,20 @@ stdenv.mkDerivation rec { mailcap sqlite ]; + patches = [ + # To be removed on next release. Fixes two bugs in the sidebar behavior. + (fetchpatch { + url = "https://github.com/neomutt/neomutt/commit/96753674e70edb695c1dc7af73e3317956c1b259.patch"; + sha256 = "0yjmgdfhn8ra7bc3d40c3c29imgpgbhzphjxp6575llh9kw5h53s"; + }) + (fetchpatch { + url = "https://github.com/neomutt/neomutt/commit/6078653c9233644ca76c24bdb64e49bd443dd714.patch"; + sha256 = "1s1p86bqpc9xq9z5qfh0mxxh6syps8shq0dm7bbkg1bz7qya5phy"; + }) + ]; + nativeBuildInputs = [ - docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib elinks + docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib w3m ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index a2ff6ce963..4540943c7b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.2.2"; + version = "78.3.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/af/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/af/thunderbird-78.3.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "12d8b417fe101e45460b66faa04e0c99bacd454b563c96b7bd7d5b77cabb8f2c"; + sha256 = "dc14e5319ecee546f10f7decca4489718bfc94bc30f8b08e9571ef2ea6a3d6bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ar/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/ar/thunderbird-78.3.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "1fa7a01cd370114ce9dc65c2d48e001d6969f953ba138fc4005329b2fce7f1fc"; + sha256 = "c2b3315de4d006ca44e3c5a68ed8e77024b89de2323970d4615490b86e0fdfd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ast/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/ast/thunderbird-78.3.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "c002ba6b4cded5b085abfad61daccad36a7936af40eacf77e4378caff42f9138"; + sha256 = "0ffaca9fdce6bd88a0a850e149f1e3fc4e2cb167c637af7f9d674616038cf0a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/be/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/be/thunderbird-78.3.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "17021647dd58eb851f99e8f63e9d4a6ec302a7a7a1f5a0e561fe96bc63abb5f7"; + sha256 = "e52c73a0e1a93d6cb51004dd041f88213658673adfc67860f9550ee39adf9250"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/bg/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/bg/thunderbird-78.3.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "e813d46a0ba8dccec07a1bc5201da859a8c23b1cb9140420d902ed9f3fa6f7fd"; + sha256 = "62ceac4d1085e1fcbc2446069c6b667be8391a4be5ade4b5f78107ddd3fcc170"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/br/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/br/thunderbird-78.3.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "0bc12e80e5923271973a3037a26a2fd2702118deba326ab98a8a9d776d25c9ca"; + sha256 = "0de6e27f09912f549e92136d46e02fa3738a3177897dd34e2858ee56b803224c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ca/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/ca/thunderbird-78.3.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "f8e6abea863956613d646af01ca09f53311e325d6006a28319cb3f9932a03eaf"; + sha256 = "ace99257cea52ecf6f99d9a819cf343a23b74e56c1f0bf2a3e66600dbcded779"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/cak/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/cak/thunderbird-78.3.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "c7603bc86b2d86a9ceddc55a44f9a8a116ec67d1b23ea659f705ad78ecfc02e3"; + sha256 = "f39736d27349ba66d142d61070e2c37c4c0a463a1cf89ea72fb1cabb264d38eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/cs/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/cs/thunderbird-78.3.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "058405304cf6523cbcb1d217ebb393a66067b5cbf839d0b588930b59c828d700"; + sha256 = "a068533fc0ac55972956aa9a9520f403df9519bc291c5102618476f249c911a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/cy/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/cy/thunderbird-78.3.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "e6af1a50954e495bd3145513dd7b7c5b3129862cbe5aa2622229855133233e6c"; + sha256 = "bfd66cda463454684865f055339072513fc4b8774b34e96f3c799c6f555122fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/da/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/da/thunderbird-78.3.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "39a61048e47af6d96242291581ca29d016f4b667ff373167e7de9d5629f4e4d0"; + sha256 = "885bdd4063aa9d8d8dbd352af7291208766fb864b9989b68bb2fa038d314bd8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/de/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/de/thunderbird-78.3.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "9ab3e2dc60662d37ab7623fafc8dc586c9baa13819c753331539879463bd6b63"; + sha256 = "f1d9d91e6a4ef5e3945d958457e96cedde86a0f3b62ac5aee21eeff54c40c999"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/dsb/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/dsb/thunderbird-78.3.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "114cd0d19683c0b8c7a5ff0d258d2cf01304eb26f4c7dc466b895c460b129e5b"; + sha256 = "73628a6c666f69529b04ea8c60dc2fdffce17e9cf13ed6e3af24c8443f093b74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/el/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/el/thunderbird-78.3.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "011bb98710b5c6c371e122ada559ec010aa9b965da54bfbc73aef14681f39f97"; + sha256 = "ec532079ebac4e8ba6e58e97d0c7eb1d7f5e0e20c1563985cabd03101dc2c995"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/en-CA/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/en-CA/thunderbird-78.3.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "ff39f524ffd7f455940df65c42a40c045cdae4ead311de5dae8c3d563e0e77fc"; + sha256 = "1a1366cf35f9ab6b39300405538590e55d6a0833e406a61c9e3924a72adc2bcc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/en-GB/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/en-GB/thunderbird-78.3.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "ce353fc8e6e8e8d2ec1378f76879c0bebb55f867f39488fe48a1995685c85b00"; + sha256 = "1f62e839e1fff1c0a833ad2ee73fc72542bc3723e0e368ac1d9f153378da8859"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/en-US/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/en-US/thunderbird-78.3.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "e3af4f4b1eaf21c3137047cb5190780fd51e4d27a620efeb6157ffab5ecca950"; + sha256 = "c46a8dde6a03c9588d0101354f2a09123d940bce507ea0a693807ea825b5edd1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/es-AR/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/es-AR/thunderbird-78.3.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "30ba14c91750200fc8f4bb8c031fc7b9ecd3efc2d658d9debcafbe8f4b44ad22"; + sha256 = "3885122a529f8cc9cc7a579696f6e74f0d42a37309f44a33a18dbc99d01a433a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/es-ES/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/es-ES/thunderbird-78.3.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "0e3d5f0a0f6f505b52d958cf34f26ea98e716516a7f06664aa3806fb1ade55db"; + sha256 = "d61e5d9e82f52de243cecfc8ccf0ec4476e3309167a33f9c4b7f513c31808527"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/et/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/et/thunderbird-78.3.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "32acee8023857d5ed54ceb72acb0f5a621ce1884ecf114760f670a3166e7eea9"; + sha256 = "1ddc1fb310c75104c2642c145f9250fbffa834d5a9fb100c12c2e3ea31955321"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/eu/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/eu/thunderbird-78.3.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "8827e24c546ccf27c8a02e61794675e675c475a833621840152bc840964bce56"; + sha256 = "fdb2fd4d1650edc40f193c028a8bd6ac832742a383a2537f7cf7244f8d736717"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/fa/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/fa/thunderbird-78.3.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "9b072f89cc4288443eb986cb6798d35e08ff003c73d0bbf54a2ccdfea1866d17"; + sha256 = "7ea9ed9eef1167792c2468372bd5c35a9a36401ec40d63a14a8b3d86cb6f6687"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/fi/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/fi/thunderbird-78.3.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "9ba017f70955a1aa9c8ff2c94653be569ff0dcdd4784e8ea21e425e5e29140f7"; + sha256 = "efd073de097cb5f82a26a239fbb360b653041a48bf4c98e983b2fa9675e8c64e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/fr/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/fr/thunderbird-78.3.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "7eea9eb22bd47467740e1fa22977dcddd326ca7e9ad7adc8cf7964b9db5da6ce"; + sha256 = "c07c981bc7fa69a10b3c78602e5cff029860b90243ccc3270f7df56505163b81"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/fy-NL/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/fy-NL/thunderbird-78.3.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "c0987516569372c9f98d5c8b6b90ad9a1468c4ed8a4b543130a023c25affbeb1"; + sha256 = "433912fe6bf0b36788f55f34d28cc56dc9a9c6f19684132e4ce51def7b968097"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ga-IE/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/ga-IE/thunderbird-78.3.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "344122ad4b549ce1610ce409e7f3ef2ab0144abb3c5ef1fe98a3e499ed292441"; + sha256 = "36a890c2aef942121a0e0717118328668d51961d506eab833141cb80c826768a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/gd/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/gd/thunderbird-78.3.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "7dc155a4a6bbf1b92822e23a7454e6021a3aa29b807bf9fb16327ecfb627b68f"; + sha256 = "146853c4725c744d636acfcae4fdb3e65e2f37bd15d5abcbe105bf7ef8854b2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/gl/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/gl/thunderbird-78.3.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "c99e642618e273f96ef102bafd61c8bd10b626c3ee2d7072c1bb4264a9653fd1"; + sha256 = "32f7c157a764c58a4b2d7aa45388919553300e6c0212ac1b48f30121a04332ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/he/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/he/thunderbird-78.3.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "bbf0acf24c1f8e14833b801512b57d80cf5a07662cbfec841a6b7fa3de6facfb"; + sha256 = "49e44de01ad2f13f1c2f82d137a1eab13d5800a1f72d7eb99514ea3d8bbac1d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/hr/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/hr/thunderbird-78.3.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "22237f9fa29556853af1d70343d6087f11b677a3648f521e215ffddf0a583407"; + sha256 = "de3df9903e42dbaa6d2f98da953ff141ac81728537c94505414c7df0721580ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/hsb/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/hsb/thunderbird-78.3.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "2ed485f1cf5e431cfa561bd266624fdf7e14c725e36fa89f653f71a4a1249eda"; + sha256 = "3a851331fb698a7f6b5e54b26bba180f9952d55c29a0f8387e2637c0d8a83c79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/hu/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/hu/thunderbird-78.3.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "8e3b4ad2fdbdd5f84be3a8c77e8c0f4ce09449190eb0d54fe693f5a619d27562"; + sha256 = "bbfeee0ce02dfc34012c994d914c69fe6a7d5b4ff0e36bc9e9ec453edc756725"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/hy-AM/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/hy-AM/thunderbird-78.3.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "bdd7a97b027d30804b60d86559b15b0bfde2f688bc166677d3762887020e2a1b"; + sha256 = "b43ca227a53d8587da34219b02c1bd58f8ed23d63e425cd4911c5e1caa3a5254"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/id/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/id/thunderbird-78.3.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "259e8fd126c426d8c5bb7c120ccfe28d41183551f41d49f20767e98f8f28d728"; + sha256 = "87ed1fb328b592418c515ac16dc8c45349c2dba4c69f8552f3e1f2aa9753bfca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/is/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/is/thunderbird-78.3.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "1c74ec8e38bad9396faac387321608efb3463f539a91782db620ca73dfb26efd"; + sha256 = "acfdf1a9dba0372966c82aa3629b5488111b8592b26aec3aa5162c6527ec29a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/it/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/it/thunderbird-78.3.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "659fca198575c52c5d90de4456368ea995b2e0dbf7dcb7578e310457142a2421"; + sha256 = "04480c988c1518b7d2dc06c836f42b4bbbe243df7014a332d195a774fbafbd93"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ja/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/ja/thunderbird-78.3.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "b9464e9364241e94f4e40286f1b0ffdbeb392d9986b9a9cb18c41f5b96baac6c"; + sha256 = "a8041d9fc9c2e25367682b0c8d3343cf1a748d32616d4befc2ee3ab0cec24ee6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ka/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/ka/thunderbird-78.3.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "7c73eb7efdca2e7648383c25ec3d0e2a4250b87908c9644e220eb16e1f5a0219"; + sha256 = "d6df8809fd92b9a70a4cd95a035abbb14e0c0e8869034d3c90e50b2e531fa4d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/kab/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/kab/thunderbird-78.3.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "d4d44ccb61058423ed42767d519215bd169dd022d8aa460df7622091522300dc"; + sha256 = "6170fb0321369588af4417ce8ac25bb74ec14c932a8ecc22119f3c7d15bc9336"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/kk/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/kk/thunderbird-78.3.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "3b8af8f7eed6da665baf1ed477d5f5f1b797baf8c63f3af6ecdc257d66e446e2"; + sha256 = "a3a9d5e5c1651f0d46fb6c3d74e87cbde964f2aac9484dbe0b12afabb66adfdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ko/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/ko/thunderbird-78.3.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "4129db882fde4040e1e87b4aa724b055dadeee98c46e201d24e9f485f3c2b31a"; + sha256 = "729a243dd4b5ab5dfd615228875ebba18a8b99d34ade0711cb7c1d2f4534b11d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/lt/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/lt/thunderbird-78.3.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "fb1d9fc89edbe4434ecfe18d7ccdeb33c4ced3ad5adb1853baf5b115a784a120"; + sha256 = "df653c6a2af688591a1e549fddf29f176046723601e5ef85633f69105f5ce23e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ms/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/ms/thunderbird-78.3.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "b6498d8ba9fbf63cd61cc968f375b0ecc50e3fadff993fa5070a249b679855da"; + sha256 = "278252b8d98cc29ce713eb00f59c87b54a324a0d3e833434a9912b3e1a0cd796"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/nb-NO/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/nb-NO/thunderbird-78.3.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "1d931fad5ca59c3eb29cb8155cbb15a578de28b365cb680e6aab3dc51274078b"; + sha256 = "665760b1c1035a831624c690053c5400d0ae93e28bc04a50bcc8014bc0111f5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/nl/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/nl/thunderbird-78.3.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "1378867782f5e0b9cb9efbcc78e5ce9c28d89baca0f353a027fc6878cbb6de58"; + sha256 = "466cc2363465d0e3b6e80a9b3a27faaf010f693ed6b8b26f99610c1b4943db10"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/nn-NO/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/nn-NO/thunderbird-78.3.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "bbe5f3cc81eac55401ac4a3a2498906077b1e831d369f7f40a4ddca4dfc146bc"; + sha256 = "32f6aedcc9c9dad560e84c6de83452808e87b903c5cf69834f3a315ff560503c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/pa-IN/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/pa-IN/thunderbird-78.3.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "ea617550d8e2aa0b99d81ec8e39c587194a0b7978b3444261caf12fcc7a5b172"; + sha256 = "12073cbc4476a11c717a35f8281d9e8590f7eb35b20faf46aadeb41ffd875bfa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/pl/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/pl/thunderbird-78.3.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "84b15d310cb1fb7217f21891ee24654b13effa4f004315811d3bb221a8fc54c7"; + sha256 = "3b8131571d497c6479615c48f908f324a76b297f9f0430eb18228283ab4de198"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/pt-BR/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/pt-BR/thunderbird-78.3.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "2e5682b09d8c6f6d260dd47b2ac7ab0f710103b0b28755c58375ccb132aea464"; + sha256 = "618abb8f3e7c48f33002e4c99f05769b66036331a040ff395c65fd1dc9d60dbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/pt-PT/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/pt-PT/thunderbird-78.3.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "8a7f90d4ce1b9bdc2d117fabd19fd4f6ca362b89138c5470f7d76f7ec456df54"; + sha256 = "a43ea5f9181d9a7abc977ae3b0f5a20215c45d8d3e9baeae581ef15be0909489"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/rm/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/rm/thunderbird-78.3.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "c5a04ab8644dea990c938ab462eb8610471de524f78e09a2293ee9c79260339a"; + sha256 = "69ea896f45830fe8eeb08e2244579a7454fc18fbdbafe781331bbad97ca4ccec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ro/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/ro/thunderbird-78.3.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "84b555842d0502dffa99e388bcc6d90355ac4731b66876c279c84c8735a78fd9"; + sha256 = "751137453712a435060346649a3f16a2422379ab0dab9141add053e85f0de8d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ru/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/ru/thunderbird-78.3.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "d5bdde6bd4e155d78ef4fbc91718468406afc3888a80ab751647163aa087bef5"; + sha256 = "26f2d8b5704ee445835bb7a0f5bcec222359ea83d7d53fe9c9870e664fe3a70f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/si/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/si/thunderbird-78.3.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "0311422b20df0b1081e889aa6301bb8930accd1c5b9b2e0e9850f4565f0ac5c3"; + sha256 = "1f450ffc77cf5309e8b01646c90324b14cc465b5b7d04566f3ff6cc56506d202"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/sk/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/sk/thunderbird-78.3.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "b91e58219d46ab7770958ec34a54323b5f7af0cf2548be93de786b76fa92db45"; + sha256 = "f95af873292f04fe6c224e24a68ed715a8e4015a81be7b45352363f16233ee58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/sl/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/sl/thunderbird-78.3.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "e993d4c974b00452696dc68037537e18c550c3b6a634cc2da3cd28014594934f"; + sha256 = "ae49c848187a5eae1d8e8bb3f3b85e9c51794a5caed2832a38c9ac38910c85b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/sq/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/sq/thunderbird-78.3.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "6b18bc35ad9127b6fb149aa71b7e93b556506820e661ddd3a1b9ab298c56ae14"; + sha256 = "aa10a2fa4c73cef05c2b0657daa27c80697cda70e792be56b09ab1f9a66f544d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/sr/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/sr/thunderbird-78.3.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "8fee447a4212f399645923c35de17d882a815adb81bd0b11f9fb1869b5dfaf39"; + sha256 = "92daea64a552175341b8223d9264a1bd5bbc5f3938f3420c8b81c7d0e9685b9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/sv-SE/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/sv-SE/thunderbird-78.3.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "2500816667416a3e4af77098451b98b3e975a1f30e3f393c4e8ebf36ca7495bf"; + sha256 = "d001f1c61dea17d34dc309f6a1f120c57d6fdfe9fd0b3d336b1a1493f47dc196"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/th/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/th/thunderbird-78.3.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "b035f9424db935281a57a181ac1116e8fa137c27a31b9bfb515bb3fef4ca4c0e"; + sha256 = "0f640917646cb88c90aa7f85a79942f0e9dcce70e5d6d65da7e2d4cabfb73fb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/tr/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/tr/thunderbird-78.3.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "c1cd6f9a2ebe163b8de18d26ecef4fe4beafe8e7212365c2aa71bba3b9fe0967"; + sha256 = "2150dc844df54651020d8ab4d43ba86d0624cbc06fceb12ab41eec5bafe7339e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/uk/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/uk/thunderbird-78.3.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "de843a0f9c09bc9d37b5d1bb1925075b80efdbe678f5009cd237cb91bc423b55"; + sha256 = "1d9bdddcd7e53d47e77c4fedef5f50559c45e61778e29fc98c04cc4538dcadd7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/uz/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/uz/thunderbird-78.3.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "770bfd792effc548a619deeb0385f9c8cf6475d1233ce79e83028cfed8e41859"; + sha256 = "281f2cb9c35c5710c387fd17a6a55b85c29a01b3f1e32a2b377392566d821b55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/vi/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/vi/thunderbird-78.3.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "8183106b59c8999dc3054ead72dad3a14eabe3827ce3211278a35b20656efd62"; + sha256 = "1678dae6f876b7799f61701db64ab1aa4d6aa3c316535a04734ec7f9481d6042"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/zh-CN/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/zh-CN/thunderbird-78.3.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "c35ec93bd0e24f2cafb6948546a46ccde62677e6f73e2afa1e378ed040582544"; + sha256 = "42c8fcced2d06b91f402c6a9c12b48dc1b024f1a5b2d01aa96a80df088700656"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/zh-TW/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/zh-TW/thunderbird-78.3.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "444861cc1fa351dce587725d67eec87eecb56a581ce94f812ccd4dbc4ae198bb"; + sha256 = "bbea2d5abe313825efd93e7fe8e63f5c73eeff72ab247b1990210256efee8aad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/af/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/af/thunderbird-78.3.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "05eb2e50d4129c39eb28e22f7b3922868d87d310261b765a4a2c721c4ed7c04a"; + sha256 = "a54cfb6c0965d464ddfaa96dd214444ee51cea6c894e5efac236925d43de0be3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ar/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/ar/thunderbird-78.3.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "264e3f57fed68ced27fb89bf8a1e5b715c465fc70a6fbaf8f161e69f80f46c68"; + sha256 = "4d79eb10a38b01539b0c6d31db50f69004fbe5816c09e876cc338984aab0496b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ast/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/ast/thunderbird-78.3.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "5bfbefd9be834682cc144c063f6bffd56a09d2ea7ec9e83f78f0e984350a4006"; + sha256 = "5aa985186c01afe978961b64d702d98a59851257b1a3cd3d9873b7f67dcf1f61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/be/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/be/thunderbird-78.3.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "fa1b7c0432320aa293f89529f23321066e2c4e0e474313d267650bba8b39ed90"; + sha256 = "08d6da278f79b3e7c0132b8aec649b804d3a64b0d5c02223b66f83061e421c6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/bg/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/bg/thunderbird-78.3.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "1d3f1a298d6ebda804e0aa2a9ad5491c0211dae96ec96e16a8816e5d3e202f63"; + sha256 = "c8749049c243474693272795cc3706e096873f743d22be171bb373746afe8a6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/br/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/br/thunderbird-78.3.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "d7f71155d8696d9c17c4cb0e66b987652815761137578819fb4a137c32170347"; + sha256 = "ecc9f08ef1b384d4844ea039ede864ad0f37c1cf83a75b8ee73a34b7f229e4f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ca/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/ca/thunderbird-78.3.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "44e651bcd4010a00212ea3e295cc6e3e6e7de9e118078d5631c59158a132126c"; + sha256 = "92c9e0bbd375c525ad5c28dca4f8bc68726477ed49d908bf479d32729fb44c0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/cak/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/cak/thunderbird-78.3.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "8f7849d17ae9a0d7f1b85b128a542d092c49b2b552369ce7de70ed108e4dc07e"; + sha256 = "33127a2b75dbdab2c33c8fb8a65e6bf053da6422449cb463c7cbf08fe7839d1e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/cs/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/cs/thunderbird-78.3.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "0426981c8c381227ec2dd19b59cc2c3a62b91f26541dbb8e57bc97b8f4cf3578"; + sha256 = "67d137a336085ffbc414d870d57152a275b082c80d240a6b9079f6573e172df0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/cy/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/cy/thunderbird-78.3.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "12629cfeafc74a979a621c0c8f4ebee0aa6f35dfd6fbda8a59f26e0a63311c17"; + sha256 = "18115d42cf211dc6a90881d836c9431624d54adc30a9521d6b1a1718d95a864b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/da/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/da/thunderbird-78.3.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "b280271248e99a68c2d38293275fb7ee5631bd96e7a2f67c96c60280e5148f13"; + sha256 = "faea4b3a26149a036d8b44aa0709c4d04e5e917d321d13d1b00cd80b629e5627"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/de/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/de/thunderbird-78.3.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "1caeeaa0b096378b3cab2e41d832a5c60da4e0a3cf9f84230bfe65edde106536"; + sha256 = "1bb244032bfefc15c6e7e2a1e564fa51cfc80c18b6501f079ae65aa5bddc269d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/dsb/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/dsb/thunderbird-78.3.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "d1822f534ee3d2e95cc412a7f51eabcdf3f56955650da8806f4acd5e48d19d83"; + sha256 = "687089560ea3561b21ba7f8cef77970f467b953671e5cfe956e0c0aa3dfa72cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/el/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/el/thunderbird-78.3.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "7ec20a9b566728041394245ef5875be10b70fd04a58419fdf2150168aa86abad"; + sha256 = "5c8021489c7fdfea19446832b6676640134f805537474814f5a7e8d840a2e01c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/en-CA/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/en-CA/thunderbird-78.3.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "62f31fd438ec2e33d5a1d72c57769cea3323d318ed8ad82ebf01050f4ca84fa2"; + sha256 = "a2c9c7f94191e9883f29dd43d7bee51158287cb45e3330ee5649f6553428d6f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/en-GB/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/en-GB/thunderbird-78.3.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "e857efaa39cd409de86be87934896ecdf82d4e74dd615022995f708d18119a9c"; + sha256 = "6afea217b721756cc1ebfd7b99e86a2af239855ef1fe04d6e7fe9e00e00f787c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/en-US/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/en-US/thunderbird-78.3.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "54589215c44e291a11e2cb2b2a3de682d4c48367fa8bdac59035b550a07551b6"; + sha256 = "24ae6fe44729cad965c36c8294b00831f426a815bda43bd39fb6e4ed8248a611"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/es-AR/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/es-AR/thunderbird-78.3.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "b4075d697d141aa13cbcefce1e7082752588d2fc3ba00074550d6e8c1156c5d1"; + sha256 = "3fd89cac92b8ae97766b56a84d0e8a16f51966cd77a8963ab92b5706cb8fafce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/es-ES/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/es-ES/thunderbird-78.3.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "7d5f59720037153e0fbf059b0b8aea0dbb5dd20f616deea7744de87ab183023d"; + sha256 = "5227c2e2624bbc0ff3ec35be01ed42579c280ccbc5b2ab195aca3a6a760bb944"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/et/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/et/thunderbird-78.3.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "9c999d231cb404fcaf3614483e6c74801cd52f9c2ba7988cab50e1d690bc3551"; + sha256 = "1991aa5a22f7a4f6435ed9a116cbbc1b87eccf957f1401b6f20af3ae67b1b3fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/eu/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/eu/thunderbird-78.3.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "79a74421f364e5d9a5db182d54058eb6c243418a1960b4a653f554584ecd05da"; + sha256 = "b9a6cdbd518ab307c646f38757bf8f2706ad51d4dd5f5193e719e112f343f021"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/fa/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/fa/thunderbird-78.3.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "db6835853ceb2f597330c9e65c09df48ac308ab01d7320006b9943e3a10b471e"; + sha256 = "49805c2c97109cc22075d08503926a57910f367010a2ff8ed9c91556ad4d419b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/fi/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/fi/thunderbird-78.3.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "e96ea32da9cfd941b037d0a6bf95d4a293be6f3f9800e4008c62088f06bdcf6b"; + sha256 = "ce6e16cc46ee16ca9aad6154be7442dd8bdaee09e89a75c13639f1c1979dbb57"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/fr/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/fr/thunderbird-78.3.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "dd6dacbffa7968596666615f52cac80e776f75b4e1943e218856ab80f902f950"; + sha256 = "d2e4abb6fead6aeda1e8172c04ce7b809bfa8038ffaec89431791422e70b8932"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/fy-NL/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/fy-NL/thunderbird-78.3.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "ed009214b863fa44048514870f835682944df010fcd5e1e1c149ec544fbfdaa8"; + sha256 = "6286b7bdee544c51137c2bdc423eb72523b20ddde3eb4bee7b4ab575aebf30fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ga-IE/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/ga-IE/thunderbird-78.3.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "fad826ef9820facc37bbd278c2bed11802f6b44b70416c803dc6b8fe50220c6b"; + sha256 = "b145a9b44cbafce2ebc22f4454ee6d4017c531918dd690598eb421822f4b0548"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/gd/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/gd/thunderbird-78.3.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "cccfdd4c3170969ca3f47c0a8398a257650fae0c64ecc375ab044eef969bfa8f"; + sha256 = "c0835ac49602ad6de4d37e016d40f51268bf3e43ff04a2bc1a83c5f7f7b12556"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/gl/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/gl/thunderbird-78.3.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "dd40efa2751705b0f023a98c01b030c04eb6101fe43062b3607421b1efc462aa"; + sha256 = "22c5cfdfb8c64d18d10e2c839166ffbdb21b54d4bcebb51bb7bcaec21a3efdbb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/he/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/he/thunderbird-78.3.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "ff94efe5cd1fae04401d3d6fe364c309c24424c54b0e3787ad080ee1f468443e"; + sha256 = "85f2170d4f4e20f91631a717bf78f28ac7ca45d47bb4fbfef3e56aeba291fbfc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/hr/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/hr/thunderbird-78.3.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "4109b3a8da687d2c4b8e9f6539f40e51475b43243ff1fcb19b78b5d6f6d7594d"; + sha256 = "2aa8960e96ebbb32be8f019f30d9eca73f69aefef0989b760223569ed8e1bca6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/hsb/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/hsb/thunderbird-78.3.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "58fd8901df13d7f7fed552326553ce632d36d07f1a0eed63f1e8b671cf519e5e"; + sha256 = "0c1f3803399da44d1c518057f191c3a544a3a3af3e2893be44e386edd43a5ae2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/hu/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/hu/thunderbird-78.3.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "5145b3b137f6a905721a0cafe7b574b66f70891e75187fa082b852b67e195f03"; + sha256 = "2f357cb86c535ec8bbe657d6987b657ed1d0257d2c94620359cab42570d35983"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/hy-AM/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/hy-AM/thunderbird-78.3.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "7c1e163a78dc5a0791a4a5a730a3ec9d58f24619f5274ce4d4b0197ca4936e5c"; + sha256 = "ab3582a00d26e83a6b01cc2daa17ab9cf9708de1e1dcf9260f827f4e3fdde100"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/id/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/id/thunderbird-78.3.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "57254afb187662b15338b0133afa378432c9018af4d843ea2f81c1ab40ab4940"; + sha256 = "8d5a97914ee601a47a89dd7bbe971f95a1b5bfb4a7047feb164875daa316417d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/is/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/is/thunderbird-78.3.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "ca0066237afa76925d294eb714bceeb7aaed0a512b9320ace604fcbe2d443f2c"; + sha256 = "089b7c67b70763d3e0080aba6a7d8201cd656e2c85bfe60739ad57b569b9c54a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/it/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/it/thunderbird-78.3.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "5c29da94a9408220824f4ab11a0f4e46bfa38230eaf1fef266372620ad9c4220"; + sha256 = "45aa6b0c5d3c00812efd815e197dc35a538002c63639d3b9857ca49f8e3e3692"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ja/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/ja/thunderbird-78.3.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ab4685eae09e25018ab2a227d13642a47a0c0e8e6258975967449754bc16697a"; + sha256 = "ea52820e216c79d015dc8715e5341ec2fdd4c7e99f772086652721488681d69b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ka/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/ka/thunderbird-78.3.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "152394685517d4e3e2ddb39ac6e297d14b4ead115ead325175797bf85d88bedd"; + sha256 = "6fc3af0c7a5b78350714d9f8f640f71c7094cc77590038cb6e817bbc40ccd74b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/kab/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/kab/thunderbird-78.3.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "2f3e1b7db83247add30da0372d1c1c125231e689b5005ed5a06359a02aed4180"; + sha256 = "2b387a1fec481a3a98c0a62b3bcc06cf83c1b8504b46b89d1bec12572252db6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/kk/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/kk/thunderbird-78.3.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "d0d2caffb144d6f64cd73780267cea99dc54f4ae63a0fbcb5a86fc917674d0c8"; + sha256 = "55f5d12ac7b5c0aee1d1d616a871f9c7ed3f5bd882acb9fd9538a3d29a0e58ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ko/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/ko/thunderbird-78.3.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "f42bda1eb1f4a422d4f60345c7e6cda1b7bc57ac3d0899ab32fac16b394e4953"; + sha256 = "8090cf9a8ce14dfe2dfd65b985501ab9580ca28f923377dca8a57b0529b0eb23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/lt/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/lt/thunderbird-78.3.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "da55137e808a9c64cd6534afe8579b9077b3cfaccce918fca34f07ae2d74e6d8"; + sha256 = "17584b8859a7356022a39b14fe2ee81f5b1d37df3ef0fc9e2caeae297bff61ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ms/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/ms/thunderbird-78.3.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "65a44f52ae326b7ad777f4e66d29825f3cb7aae5e18e2c645b5889d664889f2e"; + sha256 = "0a0119c8f5f458003aec3d4b933d9f4f1c9d7dca30a25886ec11079906a327a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/nb-NO/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/nb-NO/thunderbird-78.3.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "6d3abd2b862d3fb1e0285eb6851388a079c129d3132865eb424191f8064798c9"; + sha256 = "d22e4ff9b10f278fa382a6e045790231fcdca2b0adfb5678d50963afce2c1cad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/nl/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/nl/thunderbird-78.3.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "90f78511b8ecee01c8e441c4c18cb1b40f7f9e2de0350be365dc317d8c06415f"; + sha256 = "882d4eec92d78f61b3fac34277bef4d9f331bfafc7c80fcd4518862a4e96ea7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/nn-NO/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/nn-NO/thunderbird-78.3.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "2ec0103d3a89c3a57731542bd82e28e0da0b54c62ee0ab7755e395d991dfa5c5"; + sha256 = "b97c95e6e483185ae010d21ce9c977ef71209363ceba56a91ebbf26e62febda6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/pa-IN/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/pa-IN/thunderbird-78.3.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d169f161bdb32a2ce6e25df9d5a643de9ac4e1345dc90cf1a54560b12bfb03ae"; + sha256 = "804f3ea53314ff6ea73d16a7b46f37e603161bdcd60272d7fbe1ce16a3588d62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/pl/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/pl/thunderbird-78.3.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "5e7fbd12291d16f98f996eb0d3660902c9cddf9849e7082a1963b73afe0e4ec2"; + sha256 = "faedc7b47d029583c3e1d2549b3f85ed37d933e545aeb5782b6c7db59cda71e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/pt-BR/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/pt-BR/thunderbird-78.3.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "eed9d4a6378496dac0fefdf70f3c2f98d56c4daa1300bc041a3974d03303a0f6"; + sha256 = "4b1dfb1ff39d6200502746ffbdd1c97267c496276d6d019f27f8788be67c8dbc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/pt-PT/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/pt-PT/thunderbird-78.3.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "7fef461f1a2b0239c2825a9fdd2dc5237b5b5b0cffa0c9675451449a9e69372c"; + sha256 = "ca48dea62d3934197317e737a68ed685d60fcd21274022fbf74956e7b5767b26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/rm/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/rm/thunderbird-78.3.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "f3cf46324d1f1e5ab7e858fb3f203ac6762ba98986f510486146fb745535123e"; + sha256 = "2c71fcd755e02377499ee364c5777c9dd02e856de1923417fd1caa22a5fbae72"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ro/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/ro/thunderbird-78.3.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "921285ad32ed408229b07d34d358cc6dd78bc519cb60370fff01525a7cb0e96e"; + sha256 = "0c28dd6d2345432beba854984384c7ef48eb33e93860ce601f977ba95286837e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ru/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/ru/thunderbird-78.3.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "37f28db57fc4d101df92ff5f2ca1ed800de35ecc6b3b00480bc8ee67805f47d0"; + sha256 = "98b29b6d65f93a265a1b77a717b49445f8a51209a1bd83a160ecb51ff4217a91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/si/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/si/thunderbird-78.3.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "96d2ff616eae7bba706bd3af8fa5de0dc2444c0b57b612775e61b0e23007404c"; + sha256 = "c8b63b0fe37222493b1f35fbdd9aeedd4af9bb10585ed9ec2f2dc1e2c52eba40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/sk/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/sk/thunderbird-78.3.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "5f3ba3d2bcf1437373df7553dd4296511ea4845b87e0c02e7714f9838cadf281"; + sha256 = "c9d7715b8330e35ebefc386d8258c6ab00a12f14400fe01ad61037cd396b2cfa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/sl/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/sl/thunderbird-78.3.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "f00c798638bc88a107f4ebb0feb0156f2d7667a040ef8fe9104340997df83741"; + sha256 = "2403387bbaab64e925c2729076ea039206d8b4e6964e7aa825877074eb6ccf57"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/sq/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/sq/thunderbird-78.3.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "42e2fb9ed08ce138d50e0fdddfc67d9feccbf6e5aa4cfd50d81f2ed493cb2dee"; + sha256 = "a8e83d18620b057c6981a170fafcef44f0e7800168c305abeb3ed6c5a936220c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/sr/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/sr/thunderbird-78.3.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "72dc5e5f0024c17e4e1b30b3990d1cd1f1fd240da5c32ca4ddf2737290fa4bac"; + sha256 = "6cfd9ddd429240f48c8f478d785b881047e262ebe6d3460f7780f57248b22da6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/sv-SE/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/sv-SE/thunderbird-78.3.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "2f3c882db2034adf74d638fc7a6055bb421fe08f890ac6d3c89433a818b06ca3"; + sha256 = "e8db182f239050020f91b1aab23514245c04d3aab977df6215165c401c010ce0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/th/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/th/thunderbird-78.3.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "3830e09d6aab98fddec1e60fea92ec3c5ba51dee63225c219010a37bc80f633a"; + sha256 = "20d5cc43be200cc6359c56a3988f76583fb6887834bed0512125296f2c25b0f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/tr/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/tr/thunderbird-78.3.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "bdf2cf1a6a0c6cb8ae6d598adf30d84d1f43f399a2135cb041a17329fab78f73"; + sha256 = "8e74feb16b9c23689fec026e88a1749bc2c78fba0cf048db0228168f93fa7d2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/uk/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/uk/thunderbird-78.3.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "4bd587d7bfcd2ec6bc7516b48199c92dac1f6feac4c66779cae231a7fd436df3"; + sha256 = "6bd6d8c2b346adf03f0a12a84cdcd68b7e3d7e4c1caa7ebf23f5ecd90b0c0513"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/uz/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/uz/thunderbird-78.3.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "5326d6b4f0dc90925bd26c3300ab5441a0edf706229cbde7121cfadeb6b1457f"; + sha256 = "b227ca8402b6ba1db029a4964ca4e3a28403ce5ade7bcb6cb9157665759426aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/vi/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/vi/thunderbird-78.3.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ea8db723cb46c60182c4fd557fbb72872cd112c707af66fae20b59a50c595d80"; + sha256 = "09962111baf14ad41f6277b3f625a38458ba07fbdbf17673807f29dd347e8eac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/zh-CN/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/zh-CN/thunderbird-78.3.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "f2d5b1463c426dad638480782473442b6208cefe8fdd0eb74a6e01f75fbe6a52"; + sha256 = "b86d0b18a3d87dc3fd018672f3bb8fa8eb5105fc56d1c4161ce324c6babc8286"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/zh-TW/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/zh-TW/thunderbird-78.3.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "3a0bff43f1b6b158ee8f5a80e5457fa17da09ba2270d84089a948b677f228ca7"; + sha256 = "4e09553f18e9955b7072326b2e7f40bbb2e19f13f137742a0d9b29664f570d8a"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 06bfd92f5f..4abedec523 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -70,13 +70,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.2.2"; + version = "78.3.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "2cbpyx9jn23kc289z8ikzx3035g5z6p076izvld50mj3kqc0v4n3igih3rv1lsdwysik8c0ax5w3pa037lnrp6ridgbnix34gxr4nw6"; + "16b05e51776ba16503bc5fba02a6d0b5050a206e264a4707544354ad76af61902fd2dcf5d97b82b432dc69362ccd18543a0acccd80e06648e6c6f470886da450"; }; nativeBuildInputs = [ @@ -147,13 +147,6 @@ stdenv.mkDerivation rec { patches = [ ./no-buildconfig.patch - (fetchpatch { # included in 78.3.0 - name = "empty-UI.patch"; - url = "https://hg.mozilla.org/releases/comm-esr78/raw-rev/f085dbd311bc"; - # paths: {a,b}/foo -> {a,b}/comm/foo - stripLen = 1; extraPrefix = "comm/"; - sha256 = "0x9pw62w93kyd99q9wi2d8llcfzbrqib7fp5kcrjidvhnkxpr6j7"; - }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/mumble/overlay.nix b/third_party/nixpkgs/pkgs/applications/networking/mumble/overlay.nix index babb3812bb..d3af518a3c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mumble/overlay.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mumble/overlay.nix @@ -12,11 +12,13 @@ in stdenv.mkDerivation { installPhase = '' mkdir -p $out/lib - ln -s ${mumble}/lib/libmumble.so.1.2.* $out/lib/libmumble.so.1 + ln -s ${mumble}/lib/libmumble.so.1 $out/lib/ + ${lib.optionalString (mumble_i686 != null) '' mkdir -p $out/lib32 - ln -s ${mumble_i686}/lib/libmumble.so.1.2.* $out/lib32/libmumble.so.1 + ln -s ${mumble_i686}/lib/libmumble.so.1 $out/lib32/ ''} + install -Dm755 scripts/mumble-overlay $out/bin/mumble-overlay sed -i "s,/usr/lib,$out/lib,g" $out/bin/mumble-overlay sed -i '2iPATH="${binPath}:$PATH"' $out/bin/mumble-overlay diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix index bc678cd164..ed670be08a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -12,18 +12,20 @@ , qtkeychain , qttools , qtwebengine +, qtquickcontrols2 +, qtgraphicaleffects , sqlite }: mkDerivation rec { pname = "nextcloud-client"; - version = "2.6.5"; + version = "3.0.2"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "0r2n9l383drnnzbyywnbqljh9kxm3kz4g0mv7bnrp6b10b2ma3pg"; + sha256 = "ROzaiRa9Odq4lXuHL7nbE0S49d0wxmDgm01qI1WM+WM="; }; patches = [ @@ -44,6 +46,8 @@ mkDerivation rec { qtkeychain qttools qtwebengine + qtquickcontrols2 + qtgraphicaleffects sqlite ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/openbazaar/client.nix b/third_party/nixpkgs/pkgs/applications/networking/openbazaar/client.nix index f011f9aef4..c890329771 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/openbazaar/client.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/openbazaar/client.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "openbazaar-client"; - version = "2.4.7"; + version = "2.4.8"; src = fetchurl { url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb"; - sha256 = "04wwljaiqm8rsdrzngqrzrjzfrjsrfsaa60c904zhbhmsqc7y4f1"; + sha256 = "0c8ar0rd4yydy4rd4hqafljrhi40v3cwhc9v7fjbrfhcx1ikmf64"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/git.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/git.nix deleted file mode 100644 index b3d455599b..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/git.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ stdenv, fetchgit, libextractor, libmicrohttpd, libgcrypt -, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig -, libxml2, ncurses, gettext, libunistring, libidn -, makeWrapper, autoconf, automake, texinfo, which -, withVerbose ? false }: - -let - rev = "ce2864cfaa27e55096b480bf35db5f8cee2a5e7e"; -in -stdenv.mkDerivation { - name = "gnunet-git-${rev}"; - - src = fetchgit { - url = "https://gnunet.org/git/gnunet.git"; - inherit rev; - sha256 = "0gbw920m9v4b3425c0d1h7drgl2m1fni1bwjn4fwqnyz7kdqzsgl"; - }; - - buildInputs = [ - libextractor libmicrohttpd libgcrypt gmp curl libtool - zlib adns sqlite libxml2 ncurses libidn - pkgconfig gettext libunistring makeWrapper - autoconf automake texinfo which - ]; - - configureFlags = stdenv.lib.optional withVerbose "--enable-logging=verbose "; - - preConfigure = '' - # Brute force: since nix-worker chroots don't provide - # /etc/{resolv.conf,hosts}, replace all references to `localhost' - # by their IPv4 equivalent. - for i in $(find . \( -name \*.c -or -name \*.conf \) \ - -exec grep -l '\' {} \;) - do - echo "$i: substituting \`127.0.0.1' to \`localhost'..." - sed -i "$i" -e's/\/127.0.0.1/g' - done - - # Make sure the tests don't rely on `/tmp', for the sake of chroot - # builds. - for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \ - -exec grep -l /tmp {} \;) - do - echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..." - substituteInPlace "$i" --replace "/tmp" "$TMPDIR" - done - - # Ensure NSS installation works fine - configureFlags="$configureFlags --with-nssdir=$out/lib" - - sh contrib/pogen.sh - sh bootstrap - ''; - - doCheck = false; - - /* FIXME: Tests must be run this way, but there are still a couple of - failures. - - postInstall = - '' export GNUNET_PREFIX="$out" - export PATH="$out/bin:$PATH" - make -k check - ''; - */ - - meta = with stdenv.lib; { - description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework"; - - longDescription = '' - GNUnet is a framework for secure peer-to-peer networking that - does not use any centralized or otherwise trusted services. A - first service implemented on top of the networking layer - allows anonymous censorship-resistant file-sharing. Anonymity - is provided by making messages originating from a peer - indistinguishable from messages that the peer is routing. All - peers act as routers and use link-encrypted connections with - stable bandwidth utilization to communicate with each other. - GNUnet uses a simple, excess-based economic model to allocate - resources. Peers in GNUnet monitor each others behavior with - respect to resource usage; peers that contribute to the - network are rewarded with better service. - ''; - - homepage = "https://gnunet.org/"; - - license = licenses.agpl3Plus; - - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = platforms.gnu ++ platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix index ed1129b238..5cab23ecd7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgs, python3Packages, makeWrapper -, enablePlayer ? true, vlc ? null, qt5, lib }: +, enablePlayer ? true, libvlc ? null, qt5, lib }: stdenv.mkDerivation rec { pname = "tribler"; @@ -50,9 +50,9 @@ stdenv.mkDerivation rec { postPatch = '' ${stdenv.lib.optionalString enablePlayer '' - substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${vlc}/lib/libvlc.so')" + substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${libvlc}/lib/libvlc.so')" substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "if vlc and vlc.plugin_path" "if vlc" - substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${vlc}/lib/vlc/plugins'" + substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${libvlc}/lib/vlc/plugins'" ''} ''; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { --run 'cd $_TRIBLERPATH' \ --add-flags "-O $out/run_tribler.py" \ ${stdenv.lib.optionalString enablePlayer '' - --prefix LD_LIBRARY_PATH : ${vlc}/lib + --prefix LD_LIBRARY_PATH : ${libvlc}/lib ''} mkdir -p $out/share/applications $out/share/icons $out/share/man/man1 diff --git a/third_party/nixpkgs/pkgs/applications/networking/pyload/default.nix b/third_party/nixpkgs/pkgs/applications/networking/pyload/default.nix index f173e56abb..e81b8dc37c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/pyload/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/pyload/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey }: +{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey_38 }: let beautifulsoup = pythonPackages.callPackage ./beautifulsoup.nix { @@ -30,7 +30,7 @@ in pythonPackages.buildPythonApplication rec { in [ configParserPatch setupPyPatch ]; buildInputs = [ - unrar rhino spidermonkey gocr pythonPackages.paver + unrar rhino spidermonkey_38 gocr pythonPackages.paver ]; propagatedBuildInputs = with pythonPackages; [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix index 32373e22b7..e8fbec0d91 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, meson, pkg-config, ninja +{ stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc , pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml }: stdenv.mkDerivation rec { pname = "wayvnc"; - version = "0.2.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "1ddcf8hrxhx4rcwvbjwa5j3ygiwca2dpw26wl37pb0q0jr81wylv"; + sha256 = "1vlrk6zdkv0kl1ckxv65nay9vm6yjrs4kadsdvp42nryiifrdhad"; }; - nativeBuildInputs = [ meson pkg-config ninja wayland ]; + nativeBuildInputs = [ meson pkg-config ninja scdoc wayland ]; buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix index 8d4a6d7312..e9f676eae5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with stdenv.lib; let - version = "3.2.5"; + version = "3.2.7"; variant = if withQt then "qt" else "cli"; pcap = libpcap.override { withBluez = stdenv.isLinux; }; @@ -21,7 +21,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "0h69m9maq6w5gik4gamv4kfqrr37hmi4kpwh225y1k36awm0b2dx"; + sha256 = "1nkhglzxj05hwhgzrgan4glv0z67rmasf9djx1dmqicwdnw2z0xy"; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix index 4045c1f0fc..41a2d1e0db 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, perl, libiconv, zlib, popt -, enableACLs ? !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD), acl ? null -, enableCopyDevicesPatch ? false -}: +, enableACLs ? !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD) +, acl ? null, enableCopyDevicesPatch ? false, nixosTests }: assert enableACLs -> acl != null; @@ -23,6 +22,8 @@ stdenv.mkDerivation rec { configureFlags = ["--with-nobody-group=nogroup"]; + passthru.tests = { inherit (nixosTests) rsyncd; }; + meta = base.meta // { description = "A fast incremental file transfer utility"; maintainers = with stdenv.lib.maintainers; [ peti ehmry kampfschlaefer ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix b/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix index 9ce2f1fcfd..09b9bfa571 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "6.1.1"; + version = "6.4.1"; src = fetchurl { url = "https://deb.termius.com/pool/main/t/termius-app/termius-app_${version}_amd64.deb"; - sha256 = "1z3ry9jjiyqn41h38hyrx27c2cz8j39qa6i6f0f79p6pqfv93p70"; + sha256 = "0vc4nz5yndg11zhs92xj496jqzlhy9g0vqlfqrmg8zpf9ciygbqz"; }; desktopItem = makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/applications/networking/znc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/znc/default.nix index 13803556a4..3487c72d40 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/znc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/znc/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "znc"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { url = "https://znc.in/releases/archive/${pname}-${version}.tar.gz"; - sha256 = "0hb1v167aa6gv5bcwz352l6b8gnd74ymjw92y4x882l099hzg59i"; + sha256 = "03fyi0j44zcanj1rsdx93hkdskwfvhbywjiwd17f9q1a7yp8l8zz"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/znc/modules.nix b/third_party/nixpkgs/pkgs/applications/networking/znc/modules.nix index 3fd447b8b0..c045598fc3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/znc/modules.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/znc/modules.nix @@ -39,21 +39,21 @@ in { clientbuffer = zncDerivation rec { name = "znc-clientbuffer-${version}"; - version = "git-2015-08-27"; + version = "git-2020-04-24"; module_name = "clientbuffer"; src = fetchFromGitHub { - owner = "jpnurmi"; + owner = "CyberShadow"; repo = "znc-clientbuffer"; - rev = "fe0f368e1fcab2b89d5c94209822d9b616cea840"; - sha256 = "1s8bqqlwy9kmcpmavil558rd2b0wigjlzp2lpqpcqrd1cg25g4a7"; + rev = "2e32d508aa975c0a307d09575a0198f8c56c11fa"; + sha256 = "1jaspnrbv3pzsnbysqygc8s8g3q07zx5nlrdpgwv9j8aryg0pcnh"; }; meta = with stdenv.lib; { description = "ZNC module for client specific buffers"; - homepage = "https://github.com/jpnurmi/znc-clientbuffer"; + homepage = "https://github.com/CyberShadow/znc-clientbuffer"; license = licenses.asl20; - maintainers = with maintainers; [ hrdinka ]; + maintainers = with maintainers; [ hrdinka szlend ]; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/office/espanso/default.nix b/third_party/nixpkgs/pkgs/applications/office/espanso/default.nix index 86a2c96119..942a0543d3 100644 --- a/third_party/nixpkgs/pkgs/applications/office/espanso/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/espanso/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "espanso"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "federico-terzi"; repo = pname; rev = "v${version}"; - sha256 = "1yspycgmg7vwf4d86r6n24lvgn14aq73fl8sn00shxndramp46ib"; + sha256 = "11b02i254dn5nwk8m2g21ixz22qcqgcf90vwll0n3yny78p40hn0"; }; - cargoSha256 = "0g0xf8j4yjayl7a5sqxm3piiif1hc7ws3i7q8vi7dk8nk609pbxr"; + cargoSha256 = "1cnz6rbqbb08j67bw485qi22pi31b3l3yzgr6w1qx780ldf1zd54"; nativeBuildInputs = [ extra-cmake-modules diff --git a/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix index e34c548f60..cc8412e1ac 100644 --- a/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix @@ -12,7 +12,7 @@ , cups , dbus , expat -, ffmpeg +, ffmpeg_3 , fontconfig , freetype , gdk-pixbuf @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { cairo dbus.lib expat - ffmpeg + ffmpeg_3 fontconfig freetype gdk-pixbuf diff --git a/third_party/nixpkgs/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix b/third_party/nixpkgs/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix index ce9e4b5d88..f4d1b27478 100644 --- a/third_party/nixpkgs/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix @@ -1,20 +1,25 @@ -{ stdenv, fetchFromGitHub, xen_4_10 }: +{ stdenv +, fetchFromGitHub +, xen_4_10 +}: stdenv.mkDerivation rec { pname = "qubes-core-vchan-xen"; - version = "4.1.2"; + version = "4.1.4"; src = fetchFromGitHub { owner = "QubesOS"; repo = pname; rev = "v${version}"; - sha256 = "1wj4vv8nkzzig52r2nzkd4jy0cwznfkyddx379hfsdl4pzsp55mj"; + sha256 = "sha256:02l1vs5c2jfw22gxvl2fb66m0d99n8ya1i7rphsb5cxsljvxary0"; }; buildInputs = [ xen_4_10 ]; + buildPhase = '' - make all PREFIX=/ + make all PREFIX=/ LIBDIR="$out/lib" INCLUDEDIR="$out/include" ''; + installPhase = '' make install DESTDIR=$out PREFIX=/ ''; @@ -26,4 +31,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ _0x4A6F ]; platforms = platforms.linux; }; + } diff --git a/third_party/nixpkgs/pkgs/applications/radio/hackrf/default.nix b/third_party/nixpkgs/pkgs/applications/radio/hackrf/default.nix index dfd7fabcc6..b0aaddcdc6 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/hackrf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/hackrf/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source SDR platform"; - homepage = "http://greatscottgadgets.com/hackrf/"; + homepage = "https://greatscottgadgets.com/hackrf/"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ sjmackenzie ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix index 78a7f74217..4c773208d5 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub +{ stdenv, lib, mkDerivation, fetchFromGitHub , cmake, freetype, libpng, libGLU, libGL, openssl, perl, libiconv , qtscript, qtserialport, qttools , qtmultimedia, qtlocation, qtbase, wrapQtAppsHook @@ -6,13 +6,13 @@ mkDerivation rec { pname = "stellarium"; - version = "0.20.2"; + version = "0.20.3"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "0bpxv781chx5acjh9ni5l9dlnvn6jgkqylq09885g6j4gi3q56br"; + sha256 = "08abrshrzhdfcg3b2vzfmnq8fhzrasadg1ajs81kcw96yjc59vak"; }; nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; @@ -22,12 +22,21 @@ mkDerivation rec { qtmultimedia qtlocation qtbase ]; + preConfigure = lib.optionalString stdenv.isDarwin '' + substituteInPlace CMakeLists.txt \ + --replace 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \ + 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Stellarium.app/Contents")' + ''; + + postFixup = lib.optionalString stdenv.isDarwin '' + wrapQtApp "$out"/Stellarium.app/Contents/MacOS/stellarium + ''; + meta = with lib; { description = "Free open-source planetarium"; homepage = "http://stellarium.org/"; license = licenses.gpl2; - - platforms = platforms.linux; # should be mesaPlatforms, but we don't have qt on darwin + platforms = platforms.unix; maintainers = with maintainers; [ peti ma27 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/EZminc/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/EZminc/default.nix index 7502a4ffd2..a9661ee2db 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/EZminc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/EZminc/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "EZminc"; - name = "${pname}-unstable-2019-03-12"; + version = "unstable-2019-03-12"; src = fetchFromGitHub { owner = "BIC-MNI"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ itk4 libminc bicpl fftwFloat gsl ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" "-DEZMINC_BUILD_TOOLS=TRUE" "-DEZMINC_BUILD_MRFSEG=TRUE" "-DEZMINC_BUILD_DD=TRUE" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/N3/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/N3/default.nix index d2dbcf1853..13ffc305d3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/N3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/N3/default.nix @@ -4,20 +4,20 @@ stdenv.mkDerivation rec { pname = "N3"; - name = "${pname}-2017-09-18"; + version = "unstable-2018-08-09"; src = fetchFromGitHub { owner = "BIC-MNI"; repo = pname; - rev = "2fdd939f0f2b24a4039bc6a8ade4a190a1d8e75d"; - sha256 = "13z21c4r09hna3q1csvcn4i7ws5ixbdaja6ch421xv6nydjh2w5g"; + rev = "010fc2ac58ce1d67b8e6a863fac0809d3203cb9b"; + sha256 = "06hci7gzhy8p34ggvx7gah2k9yxpwhgmq1cgw8pcd1r82g4rg6kd"; }; nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ libminc EBTKS ]; propagatedBuildInputs = with perlPackages; [ perl MNI-Perllib GetoptTabular ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DEBTKS_DIR=${EBTKS}/lib/" ]; + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" "-DEBTKS_DIR=${EBTKS}/lib/" ]; postFixup = '' for p in $out/bin/*; do @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://github.com/BIC-MNI/${pname}"; + homepage = "https://github.com/BIC-MNI/N3"; description = "MRI non-uniformity correction for MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/aragorn/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/aragorn/default.nix index 956e4d8845..168bd5c6aa 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/aragorn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/aragorn/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildPhase = '' - gcc -O3 -ffast-math -finline-functions -o aragorn aragorn${version}.c + $CC -O3 -ffast-math -finline-functions -o aragorn aragorn${version}.c ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix index b847fd8b5f..d1b033dc4e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bcftools"; - version = "1.10.2"; + version = "1.11"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0b2f6lqhxdlrvfjqxv7a4nzqj68c1j4avn16iqxwwm80kn302wzm"; + sha256 = "0r508mp15pqzf8r1269kb4v5naw9zsvbwd3cz8s1yj7carsf9viw"; }; buildInputs = [ htslib zlib bzip2 lzma curl perl python ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/conglomerate/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/conglomerate/default.nix index 971e2f2305..8fb8e17eef 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/conglomerate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/conglomerate/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "conglomerate"; - name = "${pname}-2017-09-10"; + version = "unstable-2017-09-10"; src = fetchFromGitHub { owner = "BIC-MNI"; @@ -16,7 +16,10 @@ stdenv.mkDerivation rec { buildInputs = [ libminc zlib bicpl ]; propagatedBuildInputs = [ coreutils minc_tools ] ++ (with perlPackages; [ perl GetoptTabular MNI-Perllib ]); - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBICPL_DIR=${bicpl}/lib/" ]; + cmakeFlags = [ + "-DLIBMINC_DIR=${libminc}/lib/cmake" + "-DBICPL_DIR=${bicpl}/lib" + ]; postFixup = '' for p in $out/bin/*; do diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/inormalize/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/inormalize/default.nix index 9e63b92b24..e6293bb90e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/inormalize/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/inormalize/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ libminc EBTKS ]; propagatedBuildInputs = with perlPackages; [ perl GetoptTabular MNI-Perllib ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DEBTKS_DIR=${EBTKS}/lib/" ]; + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" "-DEBTKS_DIR=${EBTKS}/lib/" ]; postFixup = '' for p in $out/bin/*; do diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/kent/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/kent/default.nix new file mode 100644 index 0000000000..2ca5ad191d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/biology/kent/default.nix @@ -0,0 +1,75 @@ +{ stdenv +, libpng +, libuuid +, zlib +, bzip2 +, lzma +, openssl +, curl +, libmysqlclient +, bash +, fetchFromGitHub +, which +}: +stdenv.mkDerivation rec { + pname = "kent"; + version = "404"; + + src = fetchFromGitHub { + owner = "ucscGenomeBrowser"; + repo = pname; + rev = "v${version}_base"; + sha256 = "0l5lmqqc6sqkf4hyk3z4825ly0vdlj5xdfad6zd0708cb1v81nbx"; + }; + + buildInputs = [ libpng libuuid zlib bzip2 lzma openssl curl libmysqlclient ]; + + patchPhase = '' + substituteInPlace ./src/checkUmask.sh \ + --replace "/bin/bash" "${bash}/bin/bash" + + substituteInPlace ./src/hg/sqlEnvTest.sh \ + --replace "which mysql_config" "${which}/bin/which ${libmysqlclient}/bin/mysql_config" + ''; + + buildPhase = '' + export MACHTYPE=$(uname -m) + export CFLAGS="-fPIC" + export MYSQLINC=$(mysql_config --include | sed -e 's/^-I//g') + export MYSQLLIBS=$(mysql_config --libs) + export DESTBINDIR=$NIX_BUILD_TOP/bin + export HOME=$NIX_BUILD_TOP + + cd ./src + chmod +x ./checkUmask.sh + ./checkUmask.sh + + mkdir -p $NIX_BUILD_TOP/lib + mkdir -p $NIX_BUILD_TOP/bin/x86_64 + + make libs + cd jkOwnLib + make + + cp ../lib/x86_64/jkOwnLib.a $NIX_BUILD_TOP/lib + cp ../lib/x86_64/jkweb.a $NIX_BUILD_TOP/lib + + cd ../utils + make + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/lib + cp $NIX_BUILD_TOP/lib/jkOwnLib.a $out/lib + cp $NIX_BUILD_TOP/lib/jkweb.a $out/lib + cp $NIX_BUILD_TOP/bin/x86_64/* $out/bin + ''; + + meta = with stdenv.lib; { + description = "UCSC Genome Bioinformatics Group's suite of biological analysis tools, i.e. the kent utilities"; + license = licenses.unfree; + maintainers = with maintainers; [ scalavision ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/minc-tools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/minc-tools/default.nix index b2029842bb..c594897f4b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/minc-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/minc-tools/default.nix @@ -3,28 +3,20 @@ stdenv.mkDerivation rec { pname = "minc-tools"; - version = "unstable-2019-12-04"; + version = "unstable-2020-07-25"; src = fetchFromGitHub { owner = "BIC-MNI"; repo = pname; - rev = "d4dddfdb4e4fa0cea389b8fdce51cfc076565d94"; - sha256 = "1wwdss59qq4hz1jp35qylfswzzv0d37if23al0srnxkkgc5f8zng"; + rev = "fb0a68a07d281e4e099c5d54df29925240de14c1"; + sha256 = "0zcv2sdj3k6k0xjqdq8j5bxq8smm48dzai90vwsmz8znmbbm6kvw"; }; - patches = [ ./fix-netcdf-header.patch ]; - - # add missing CMake module to build NIFTI support - # (the maintainers normally build libminc and minc-tools in a meta-project) - postPatch = '' - cp ${libminc.src}/cmake-modules/FindNIFTI.cmake cmake-modules - ''; - nativeBuildInputs = [ cmake flex bison makeWrapper ]; buildInputs = [ libminc libjpeg nifticlib zlib ]; propagatedBuildInputs = [ perl TextFormat ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" "-DZNZ_INCLUDE_DIR=${nifticlib}/include/nifti" "-DNIFTI_INCLUDE_DIR=${nifticlib}/include/nifti" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch b/third_party/nixpkgs/pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch deleted file mode 100644 index 89c7564f8b..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/progs/mincdump/mincdump.h b/progs/mincdump/mincdump.h -index 14c95cd..117ab26 100644 ---- a/progs/mincdump/mincdump.h -+++ b/progs/mincdump/mincdump.h -@@ -3,6 +3,7 @@ - * See netcdf/COPYRIGHT file for copying and redistribution conditions. - * $Header: /private-cvsroot/minc/progs/mincdump/mincdump.h,v 1.1 2004-04-27 15:35:15 bert Exp $ - *********************************************************************/ -+#include - - - /* error checking macro */ diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/mni_autoreg/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/mni_autoreg/default.nix index 254d874f9d..40ec9e0de6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/mni_autoreg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/mni_autoreg/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "mni_autoreg"; - name = "${pname}-2017-09-22"; + version = "unstable-2017-09-22"; src = fetchFromGitHub { owner = "BIC-MNI"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libminc ]; propagatedBuildInputs = with perlPackages; [ perl GetoptTabular MNI-Perllib ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ]; + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ]; # testing broken: './minc_wrapper: Permission denied' from Testing/ellipse0.mnc postFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/mrtrix/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/mrtrix/default.nix index 528277e05e..e0b122778d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/mrtrix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/mrtrix/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "mrtrix"; - version = "3.0.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "MRtrix3"; repo = "mrtrix3"; rev = version; - sha256 = "1vvmmbw3m0bdfwp4szr62ygzsvkj0ss91cx5zlkspsr1rff05f9b"; + sha256 = "0p4d1230j6664rnb9l65cpyfj9ncbcm39yv1r9y77br9rkkv1za3"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix index 275100ac7f..15f4ed2699 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix @@ -38,7 +38,7 @@ mkDerivation rec { meta = { description = "An open source prototyping tool for Arduino-based projects"; - homepage = "http://fritzing.org/"; + homepage = "https://fritzing.org/"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.robberer ]; platforms = stdenv.lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/openems/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/openems/default.nix new file mode 100644 index 0000000000..f7c8dd7467 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/openems/default.nix @@ -0,0 +1,76 @@ +{ stdenv +, lib +, fetchFromGitHub +, csxcad +, fparser +, tinyxml +, hdf5 +, vtk +, boost +, zlib +, cmake +, octave +, gl2ps +, withQcsxcad ? true +, withMPI ? false +, withHyp2mat ? true +, qcsxcad ? null +, openmpi ? null +, hyp2mat ? null +}: + +assert withQcsxcad -> qcsxcad != null; +assert withMPI -> openmpi != null; +assert withHyp2mat -> hyp2mat != null; + +stdenv.mkDerivation { + pname = "openems"; + version = "unstable-2020-02-15"; + + src = fetchFromGitHub { + owner = "thliebig"; + repo = "openEMS"; + rev = "ba793ac84e2f78f254d6d690bb5a4c626326bbfd"; + sha256 = "1dca6b6ccy771irxzsj075zvpa3dlzv4mjb8xyg9d889dqlgyl45"; + }; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = lib.optionals withMPI [ "-DWITH_MPI=ON" ]; + + buildInputs = [ + fparser + tinyxml + hdf5 + vtk + boost + zlib + csxcad + (octave.override { inherit hdf5; }) ] + ++ lib.optionals withQcsxcad [ qcsxcad ] + ++ lib.optionals withMPI [ openmpi ] + ++ lib.optionals withHyp2mat [ hyp2mat ]; + + postFixup = '' + substituteInPlace $out/share/openEMS/matlab/setup.m \ + --replace /usr/lib ${hdf5}/lib \ + --replace /usr/include ${hdf5}/include + + ${octave}/bin/mkoctfile -L${hdf5}/lib -I${hdf5}/include \ + -lhdf5 $out/share/openEMS/matlab/h5readatt_octave.cc \ + -o $out/share/openEMS/matlab/h5readatt_octave.oct + ''; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Open Source Electromagnetic Field Solver"; + homepage = "http://openems.de/index.php/Main_Page.html"; + license = licenses.gpl3; + maintainers = with maintainers; [ matthuszagh ]; + platforms = platforms.linux; + badPlatforms = platforms.aarch64; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix index 082d44ddc6..df1ce7b723 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchFromGitHub, autoconf, gperf, flex, bison, readline, ncurses , bzip2, zlib +# Test inputs +, perl }: +let + iverilog-test = fetchFromGitHub { + owner = "steveicarus"; + repo = "ivtest"; + rev = "6882cb8ec08926c4e356c6092f0c5f8c23328d5c"; + sha256 = "04sj5nqzwls1y760kgnd9c2whkcrr8kvj9lisd5rvk0w580kjb2x"; + }; +in stdenv.mkDerivation rec { pname = "iverilog"; version = "unstable-2020-08-24"; @@ -15,11 +25,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - prePatch = '' - substituteInPlace configure.in \ - --replace "AC_CHECK_LIB(termcap, tputs)" "AC_CHECK_LIB(termcap, tputs)" - ''; - preConfigure = '' chmod +x $PWD/autoconf.sh $PWD/autoconf.sh @@ -29,11 +34,32 @@ stdenv.mkDerivation rec { buildInputs = [ readline ncurses bzip2 zlib ]; + # tests from .travis.yml + doCheck = true; # runs ``make check`` + # most tests pass, but some that rely on exact text of floating-point numbers fail on aarch64. + doInstallCheck = !stdenv.isAarch64; + installCheckInputs = [ perl ]; + + installCheckPhase = '' + # copy tests to allow writing results + export TESTDIR=$(mktemp -d) + cp -r ${iverilog-test}/* $TESTDIR + + pushd $TESTDIR + + # Run & check tests + PATH=$out/bin:$PATH perl vvp_reg.pl + # Check the tests, will error if unexpected tests fail. Some failures MIGHT be normal. + diff regression_report-devel.txt regression_report.txt + PATH=$out/bin:$PATH perl vpi_reg.pl + + popd + ''; + meta = with stdenv.lib; { description = "Icarus Verilog compiler"; - repositories.git = "https://github.com/steveicarus/iverilog.git"; homepage = "http://iverilog.icarus.com/"; - license = licenses.lgpl21; + license = with licenses; [ gpl2Plus lgpl21Plus] ; maintainers = with maintainers; [ winden ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix index 84c1544071..88aafcdae2 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix @@ -1,10 +1,13 @@ { stdenv, fetchFromGitHub, python, fixDarwinDylibNames , javaBindings ? false +, ocamlBindings ? false , pythonBindings ? true , jdk ? null +, ocaml ? null, findlib ? null, zarith ? null }: assert javaBindings -> jdk != null; +assert ocamlBindings -> ocaml != null && findlib != null && zarith != null; with stdenv.lib; @@ -19,13 +22,22 @@ stdenv.mkDerivation rec { sha256 = "1hnbzq10d23drd7ksm3c1n2611c3kd0q0yxgz8y78zaafwczvwxx"; }; - buildInputs = [ python fixDarwinDylibNames ] ++ optional javaBindings jdk; + buildInputs = [ python fixDarwinDylibNames ] + ++ optional javaBindings jdk + ++ optionals ocamlBindings [ ocaml findlib zarith ] + ; propagatedBuildInputs = [ python.pkgs.setuptools ]; enableParallelBuilding = true; + postPatch = optionalString ocamlBindings '' + export OCAMLFIND_DESTDIR=$ocaml/lib/ocaml/${ocaml.version}/site-lib + mkdir -p $OCAMLFIND_DESTDIR/stublibs + ''; + configurePhase = concatStringsSep " " ( [ "${python.interpreter} scripts/mk_make.py --prefix=$out" ] ++ optional javaBindings "--java" + ++ optional ocamlBindings "--ml" ++ optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}" ) + "\n" + "cd build"; @@ -39,7 +51,9 @@ stdenv.mkDerivation rec { ln -sf $lib/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary} $python/${python.sitePackages}/z3/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary} ''; - outputs = [ "out" "lib" "dev" "python" ]; + outputs = [ "out" "lib" "dev" "python" ] + ++ optional ocamlBindings "ocaml" + ; meta = { description = "A high-performance theorem prover and SMT solver"; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix index df622e7303..133df7c75a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,27 +2,15 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.12.1"; + version = "3.13.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "0ylsxj9rn3dc1grn9w6jisci3ak0hxgbwzqp54azs3aj5cmvkfgg"; + sha256 = "0yrzvsii84r9d2i2hrs4f65wzv3yj24l9d9yqfv3j85881h8wkm2"; }; - patchPhase = '' - # The gnome-search-provider2.c file generated by gdbus-codegen depends - # on gio-unix-2.0, which is a Requires.private of gtk+-3.0, - # and private dependencies are dropped in our default patched pkg-config. - # https://github.com/Qalculate/qalculate-gtk/pull/178 - # https://github.com/NixOS/nixpkgs/issues/292 - substituteInPlace configure.ac --replace 'libxml-2.0' 'libxml-2.0 gio-unix-2.0' - - # https://github.com/Qalculate/qalculate-gtk/pull/179 - echo searchprovider.o: gnome-search-provider2.c >>src/Makefile.am - ''; - hardeningDisable = [ "format" ]; nativeBuildInputs = [ intltool pkgconfig autoreconfHook wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix index 0db007f543..12cdeb453d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cytoscape"; - version = "3.8.0"; + version = "3.8.1"; src = fetchurl { url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-unix-${version}.tar.gz"; - sha256 = "0kksx12m83cjprdygmcc286990byf25yqfx5s7c07cizc21aavyg"; + sha256 = "006g0w29sccg5h0zlrxdp3lx4vx1bfdhx2cms6aah85r5b82wgkf"; }; patches = [ 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 74a53902ee..bf7145113f 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.6.9"; + version = "7.6.13"; 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"; - sha256 = "1v4yijjjdq9qx1fp60flp9ya6ywl9qdsgkzwmzjzp8sd5gfvhyr6"; + sha256 = "1j2cnsyassvifp6ymwd9kxwqw09hks24834gf7nljfncyy9g4g0i"; }; nativeBuildInputs = [ 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 2946f7cd50..130ace63b4 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 @@ -132,6 +132,8 @@ let utillinux = if stdenv.isLinux then utillinuxMinimal else utillinux; }; + git-remote-codecommit = python3Packages.callPackage ./git-remote-codecommit { }; + git-remote-gcrypt = callPackage ./git-remote-gcrypt { }; git-remote-hg = callPackage ./git-remote-hg { }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix index 13fe6cf4ef..e59ca6ac89 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "10ixjrb56ddqxla7mfxqnf74zissjx66akcyvgl9xfmww0bvg64x"; + sha256 = "1jf1y6135p30dlr42fnl0w7782fczizq8yya4bsd6xf66bcq0zzn"; }; - vendorSha256 = "079zbm57xfcskwhsfj1x0c0lg6ip6c6dbk8hfwrzkpy8gfs2ysmr"; + vendorSha256 = "12ka5x5m4h8dfpcdhfjc5lz6bm8pzfqkbhs9j3a8w08xsi93dvdz"; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index 00f279942d..1870340313 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "tummychow"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "0kvb9nzjlxhnrd2ir3zjd99v7zcq4bch1i9nqsn3505j5m0wv0hh"; + sha256 = "01hf9hbrigqn4qcz6jmprp7by9nh55k1r2d11g7sil5fpw6m2j9k"; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; - cargoSha256 = "0bppb1ng77ynhlxnhgz9qx4x5j0lyzcxw3zshfpgjc03fxcwl6cz"; + cargoSha256 = "04dkfjb6pxqaalw2y6yli9q58g8x8ppfmibivpvqifk8r8dhkdqp"; postInstall = '' installManPage Documentation/git-absorb.1 diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index b656deaa71..1edd48f92f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec { description = "Native cross platform full feature terminal based sequence editor for git interactive rebase"; changelog = "https://github.com/MitMaro/git-interactive-rebase-tool/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ masaeedu ]; + maintainers = with maintainers; [ masaeedu zowoq ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix new file mode 100644 index 0000000000..e5e41ac723 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonApplication, fetchFromGitHub, isPy3k, botocore, pytest, mock +, flake8, tox, awscli }: + +buildPythonApplication rec { + pname = "git-remote-codecommit"; + version = "1.15.1"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "aws"; + repo = pname; + rev = version; + sha256 = "1vvp7i8ghmq72v57f6smh441h35xnr5ar628q2mr40bzvcifwymw"; + }; + + propagatedBuildInputs = [ botocore ]; + + checkInputs = [ pytest mock flake8 tox awscli ]; + + checkPhase = '' + pytest + ''; + + meta = { + description = + "Git remote prefix to simplify pushing to and pulling from CodeCommit"; + maintainers = [ lib.maintainers.zaninime ]; + homepage = "https://github.com/awslabs/git-remote-codecommit"; + license = lib.licenses.asl20; + }; +} 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 cb41ae6705..5b7dbc521f 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 @@ -13,11 +13,13 @@ stdenv.mkDerivation rec { buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; patchPhase = '' + sed -i '1i GITSTATUS_AUTO_INSTALL=''${GITSTATUS_AUTO_INSTALL-0}' gitstatus.plugin.sh sed -i '1i GITSTATUS_AUTO_INSTALL=''${GITSTATUS_AUTO_INSTALL-0}' gitstatus.plugin.zsh sed -i "1a GITSTATUS_DAEMON=$out/bin/gitstatusd" install ''; installPhase = '' install -Dm755 usrbin/gitstatusd $out/bin/gitstatusd + install -Dm444 gitstatus.plugin.sh $out install -Dm444 gitstatus.plugin.zsh $out install -Dm555 install $out install -Dm444 build.info $out @@ -26,6 +28,7 @@ stdenv.mkDerivation rec { # should not need to worry about. pathsToLink = [ "/bin/gitstatusd" + "/gitstatus.plugin.sh" "/gitstatus.plugin.zsh" ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix index 5005b9137a..7c86318aba 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.12.4"; + version = "1.12.5"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "0zz3mwf1yhncvi6pl52lcwbl7k4kkrqyw8q3476akwszjn79n83c"; + sha256 = "03p4nn7xklqr43h4d98qvv2xc14ly7mbb90njnxljj64yh7svw4n"; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/dvdbackup/default.nix b/third_party/nixpkgs/pkgs/applications/video/dvdbackup/default.nix index e129031fd4..633eea3d28 100644 --- a/third_party/nixpkgs/pkgs/applications/video/dvdbackup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/dvdbackup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libdvdread, libdvdcss, dvdauthor }: +{ stdenv, fetchurl, fetchpatch, libdvdread, libdvdcss, dvdauthor }: stdenv.mkDerivation rec { version = "0.4.2"; @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { buildInputs = [ libdvdread libdvdcss dvdauthor ]; + # see https://bugs.launchpad.net/dvdbackup/+bug/1869226 + patchFlags = [ "-p0" ]; + patches = [ (fetchpatch { + url = "https://git.slackbuilds.org/slackbuilds/plain/multimedia/dvdbackup/patches/dvdbackup-dvdread-6.1.patch"; + sha256 = "1v3xl01bwq1592i5x5dyh95r0mmm1zvvwf92fgjc0smr0k3davfz"; + })]; + meta = { description = "A tool to rip video DVDs from the command line"; homepage = "http://dvdbackup.sourceforge.net/"; diff --git a/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix b/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix index b56c26dff7..1e4b83da81 100644 --- a/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix @@ -1,6 +1,6 @@ -# Upstream distributes HandBrake with bundle of according versions of libraries and patches to them. -# -# Derivation patches HandBrake to use Nix closure dependencies. +# Upstream distributes HandBrake with bundle of according versions of libraries +# and patches to them. This derivation patches HandBrake to use Nix closure +# dependencies. # # NOTE: 2019-07-19: This derivation does not currently support the native macOS # GUI--it produces the "HandbrakeCLI" CLI version only. In the future it would @@ -44,11 +44,6 @@ useFdk ? false, fdk_aac ? null }: -assert stdenv.isDarwin -> AudioToolbox != null - && Foundation != null - && libobjc != null - && VideoToolbox != null; - stdenv.mkDerivation rec { pname = "handbrake"; version = "1.3.3"; @@ -76,15 +71,26 @@ _EOF patchShebangs scripts - substituteInPlace libhb/module.defs \ - --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 - # Force using nixpkgs dependencies sed -i '/MODULES += contrib/d' make/include/main.defs sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \ -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \ -i make/configure.py - ''; + '' + (lib.optionalString stdenv.isDarwin '' + # Use the Nix-provided libxml2 instead of the patched version available on + # the Handbrake website. + substituteInPlace libhb/module.defs \ + --replace '$(CONTRIB.build/)include/libxml2' ${libxml2.dev}/include/libxml2 + + # Prevent the configure script from failing if xcodebuild isn't available, + # which it isn't in the Nix context. (The actual build goes fine without + # xcodebuild.) + sed -e '/xcodebuild = ToolProbe/s/abort=.\+)/abort=False)/' -i make/configure.py + '') + (lib.optionalString stdenv.isLinux '' + # Use the Nix-provided libxml2 instead of the system-provided one. + substituteInPlace libhb/module.defs \ + --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 + ''); nativeBuildInputs = [ pkgconfig autoconf automake libtool m4 python3 @@ -94,8 +100,9 @@ _EOF ffmpeg-full libogg libtheora x264 x265 libvpx dav1d libopus lame libvorbis a52dec speex libsamplerate libiconv fribidi fontconfig freetype libass jansson libxml2 harfbuzz - libdvdread libdvdnav libdvdcss libbluray lzma numactl - ] ++ lib.optionals useGtk [ + libdvdread libdvdnav libdvdcss libbluray lzma + ] ++ lib.optional (!stdenv.isDarwin) numactl + ++ lib.optionals useGtk [ glib gtk3 libappindicator-gtk3 libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev libgudev hicolor-icon-theme diff --git a/third_party/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix b/third_party/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix index a147de52da..91feb178ca 100644 --- a/third_party/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libhdhomerun, vlc, gcc, gnumake, pkg-config, gtk2 }: +{ stdenv, fetchurl, libhdhomerun, gcc, gnumake, pkg-config, gtk2 }: stdenv.mkDerivation rec { pname = "hdhomerun-config-gui"; diff --git a/third_party/nixpkgs/pkgs/applications/video/jftui/default.nix b/third_party/nixpkgs/pkgs/applications/video/jftui/default.nix index eb572bac4e..04ed4c16e2 100644 --- a/third_party/nixpkgs/pkgs/applications/video/jftui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/jftui/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "jftui"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "Aanok"; repo = pname; rev = "v${version}"; - sha256 = "1az737q5i24ylvkx4g3xlq8k48ni91nz5hhbif97g4nlhwl5cqb6"; + sha256 = "0riwqfh5lyjg7as75kyx7jw6zq4gikbglhv8s05y7pzgsc9xy75j"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix index 8a2cd17282..c8d70c72fb 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix @@ -20,7 +20,7 @@ , xorg , makeWrapper , pkgconfig -, vlc +, libvlc , mbedtls , scriptingSupport ? true @@ -39,13 +39,13 @@ let in mkDerivation rec { pname = "obs-studio"; - version = "25.0.8"; + version = "26.0.0"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "0j2k65q3wfyfxhvkl6icz4qy0s3kfqhksizy2i3ah7yml266axbj"; + sha256 = "09y57b3c88szl3wyx3cxq8jrm3pfnyg2n25hxl1ynkq3rgaavdq2"; }; nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ]; @@ -65,7 +65,7 @@ in mkDerivation rec { qtsvg speex x264 - vlc + libvlc makeWrapper mbedtls ] @@ -84,7 +84,7 @@ in mkDerivation rec { postInstall = '' wrapProgram $out/bin/obs \ - --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${vlc}/lib" + --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${libvlc}/lib" ''; postFixup = stdenv.lib.optionalString stdenv.isLinux '' diff --git a/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix b/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix index f907179bd0..f1d77fb7d1 100644 --- a/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix @@ -1,20 +1,21 @@ { stdenv, fetchFromGitHub, fetchpatch, mkDerivation, SDL2, frei0r, gettext, mlt , jack1, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets -, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools +, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools, genericUpdater +, common-updater-scripts }: -assert stdenv.lib.versionAtLeast libmlt.version "6.20.0"; -assert stdenv.lib.versionAtLeast mlt.version "6.20.0"; +assert stdenv.lib.versionAtLeast libmlt.version "6.22.1"; +assert stdenv.lib.versionAtLeast mlt.version "6.22.1"; mkDerivation rec { pname = "shotcut"; - version = "20.07.11"; + version = "20.09.13"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "0ajg0bpdckhvmmsliy1xky9p4mdypnaw3z3cvfsdrm0zcihbgazv"; + sha256 = "1q7ba6j3b2yzn3y5z9s5ldh15wrvhi6vymhwm910nqa5379dcc21"; }; enableParallelBuilding = true; @@ -47,6 +48,12 @@ mkDerivation rec { cp -r src/qml $out/share/shotcut/ ''; + passthru.updateScript = genericUpdater { + inherit pname version; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; + rev-prefix = "v"; + }; + meta = with stdenv.lib; { description = "A free, open source, cross-platform video editor"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix index 365eb8cd99..58df85332e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix @@ -24,11 +24,11 @@ with stdenv.lib; assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wrapQtAppsHook != null); stdenv.mkDerivation rec { - pname = "vlc"; + pname = "${optionalString onlyLibVLC "lib"}vlc"; version = "3.0.11.1"; src = fetchurl { - url = "http://get.videolan.org/vlc/${version}/${pname}-${version}.tar.xz"; + url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz"; sha256 = "1f46h0hv7fk35zg4iczlp7ib7h2jmh8m4r5klw3g2558ib9134qq"; }; @@ -99,6 +99,6 @@ stdenv.mkDerivation rec { homepage = "http://www.videolan.org/vlc/"; license = licenses.lgpl21Plus; platforms = platforms.linux; - broken = versionAtLeast qtbase.version "5.15"; + broken = if qtbase != null then versionAtLeast qtbase.version "5.15" else false; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix index 54663f9c5e..a7e8260765 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "0.18"; + version = "0.19"; pname = "charliecloud"; src = fetchFromGitHub { owner = "hpc"; repo = "charliecloud"; rev = "v${version}"; - sha256 = "0x2kvp95ld0yii93z9i0k9sknfx7jkgy4rkw9l369fl7f73ghsiq"; + sha256 = "1rmvm0s1jdpzfg32b3hwsbdkzws7gsy4xq227hmzv3n2dv64svm6"; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index e6595a207b..eded437a62 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "containerd"; - version = "1.4.0"; + version = "1.4.1"; # git commit for the above version's tag commit = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "1ajns679ck5yp6vmf39pyshzf8jijw5fcg5biixkj54jhj3bv1sq"; + sha256 = "1k6dqaidnldf7kpxdszf0wn6xb8m6vaizm2aza81fri1q0051213"; }; goPackagePath = "github.com/containerd/containerd"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix index cf11b69329..766c81d6be 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix @@ -8,12 +8,12 @@ }: buildPythonApplication rec { - version = "1.26.2"; + version = "1.27.4"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "0c3v30z7jlbxm9nxs42vv3nbja0zsppkcd6fnd0mjcm1s60hyssp"; + sha256 = "5a5690f24c27d4b43dcbe6b3fae91ba680713208e99ee863352b3bae37bcaa83"; }; # lots of networking and other fails diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix index e1e7d2c277..b05149fd15 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "podman"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "033pdkrmdsk33n1mglpcpl3g9i62raw47wpab752qhbmpy1c49lr"; + sha256 = "0cy842wlyasxlxnwxkwhwgj148s30kfxnhgxa6ar26fly432aa68"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix index 7fb4f8b59d..c320eca0bb 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix @@ -23,7 +23,8 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - version = "6.1.10"; + version = "6.1.14"; + tarballVersion = "${version}a"; iasl' = iasl.overrideAttrs (old: rec { inherit (old) pname; @@ -39,8 +40,8 @@ in stdenv.mkDerivation { inherit version; src = fetchurl { - url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "37d8b30c0be82a50c858f3fc70cde967882239b6212bb32e138d3615b423c477"; + url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${tarballVersion}.tar.bz2"; + sha256 = "16f3cb83ab3c4dacf2a9d3cc638cbd18db23767828bba6b8ba1c1b57abeb6aef"; }; outputs = [ "out" "modsrc" ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix index 90eed1ff72..03b3be7e96 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -12,7 +12,7 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "03067f27f4da07c5d0fdafc56d27e3ea23a60682b333b2a1010fb74ef9a40c28"; + let value = "b224e796e886b19bce69f0aaedf6ca82bad0ca29c61fb0ed86166efb84356942"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extra_symbols.patch b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extra_symbols.patch index 174bb8d9e7..44d3d972cf 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extra_symbols.patch +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extra_symbols.patch @@ -1,21 +1,25 @@ diff --git a/src/VBox/HostDrivers/linux/Makefile b/src/VBox/HostDrivers/linux/Makefile -index 6e44129b..e68ce128 100644 +index 8ba33952..3b8abe60 100644 --- a/src/VBox/HostDrivers/linux/Makefile +++ b/src/VBox/HostDrivers/linux/Makefile -@@ -95,13 +95,13 @@ vboxpci: vboxdrv - install: - @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxdrv install - @if [ -d vboxnetflt ]; then \ +@@ -99,17 +99,17 @@ install-vboxdrv: + + install-vboxnetflt: + +@if [ -d vboxnetflt ]; then \ - $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetflt install; \ -+ $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxnetflt/Module.symvers) -C vboxnetflt install; \ ++ $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxnetflt/Module.symvers) -C vboxnetflt install; \ fi - @if [ -d vboxnetadp ]; then \ + + install-vboxnetadp: + +@if [ -d vboxnetadp ]; then \ - $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetadp install; \ + $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxnetadp/Module.symvers) -C vboxnetadp install; \ fi - @if [ -d vboxpci ]; then \ + + install-vboxpci: + +@if [ -d vboxpci ]; then \ - $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxpci install; \ + $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxpci/Module.symvers) -C vboxpci install; \ fi - else + install: install-vboxdrv install-vboxnetflt install-vboxnetadp install-vboxpci diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 4482e9a053..3937d70e86 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "62a0c6715bee164817a6f58858dec1d60f01fd0ae00a377a75bbf885ddbd0a61"; + sha256 = "dd9f176abb89043c01cea7ec7e20130e76db71bd83beafeb2dc5858d4c9c86cd"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/fbpanel/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/fbpanel/default.nix index cf45dfa864..c44bf5f0bd 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/fbpanel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/fbpanel/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, libX11, libXmu, libXpm, gtk2, libpng, libjpeg, libtiff, librsvg +, libX11, libXmu, libXpm, gtk2, libpng, libjpeg, libtiff, librsvg, gdk-pixbuf, gdk-pixbuf-xlib }: stdenv.mkDerivation rec { @@ -10,10 +10,15 @@ stdenv.mkDerivation rec { sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965"; }; buildInputs = - [ pkgconfig libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg ]; + [ pkgconfig libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg gdk-pixbuf gdk-pixbuf-xlib.dev ]; preConfigure = "patchShebangs ."; + postConfigure = '' + substituteInPlace config.mk \ + --replace "CFLAGSX =" "CFLAGSX = -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0" + ''; + NIX_LDFLAGS="-lX11"; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix index 57f4a764c9..8043134f8c 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix @@ -9,13 +9,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "icewm"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "bbidulock"; repo = "icewm"; rev = version; - sha256 = "0x6axhwfwxxgnljf3201hvrwa90yacf3ln24lsywrk1bxq9am74b"; + sha256 = "0qd3cakhhjc7h6xr9q3ia9f8wln6q23dlqvw19khia26c0dgyd7b"; }; nativeBuildInputs = [ cmake pkgconfig perl asciidoc ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/jwm/0001-Fix-Gettext-Requirement.patch b/third_party/nixpkgs/pkgs/applications/window-managers/jwm/0001-Fix-Gettext-Requirement.patch new file mode 100644 index 0000000000..f7b6a4cb9f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/jwm/0001-Fix-Gettext-Requirement.patch @@ -0,0 +1,14 @@ +diff --git a/configure.ac b/configure.ac +index 347d325..dce95a0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -489,7 +489,8 @@ fi + ############################################################################ + AM_ICONV + AM_GNU_GETTEXT([external]) +-AM_GNU_GETTEXT_VERSION([0.19]) ++AM_GNU_GETTEXT_VERSION([0.19.6]) ++AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6]) + LDFLAGS="$LDFLAGS $LIBINTL $LIBICONV" + + ############################################################################ diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/jwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/jwm/default.nix index 601cf3cded..61ea1b2827 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/jwm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/jwm/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchFromGitHub, pkgconfig, automake, autoconf, libtool, - gettext, which, xorg, libX11, libXext, libXinerama, libXpm, libXft, - libXau, libXdmcp, libXmu, libpng, libjpeg, expat, xorgproto, - librsvg, freetype, fontconfig }: +{ stdenv, fetchFromGitHub, pkgconfig, automake, autoconf, libtool, gettext +, which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp +, libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig }: stdenv.mkDerivation rec { pname = "jwm"; version = "1685"; - + src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; @@ -14,11 +13,28 @@ stdenv.mkDerivation rec { sha256 = "1kyvy022sij898g2hm5spy5vq0kw6aqd7fsnawl2xyh06gwh29wg"; }; + patches = [ ./0001-Fix-Gettext-Requirement.patch ]; + nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ]; - buildInputs = [ libX11 libXext libXinerama libXpm libXft xorg.libXrender - libXau libXdmcp libXmu libpng libjpeg expat xorgproto - librsvg freetype fontconfig ]; + buildInputs = [ + libX11 + libXext + libXinerama + libXpm + libXft + xorg.libXrender + libXau + libXdmcp + libXmu + libpng + libjpeg + expat + xorgproto + librsvg + freetype + fontconfig + ]; enableParallelBuilding = true; @@ -28,7 +44,7 @@ stdenv.mkDerivation rec { homepage = "http://joewing.net/projects/jwm/"; description = "Joe's Window Manager is a light-weight X11 window manager"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/picom/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/picom/default.nix index 8ea724aa69..9a00b3a2ef 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/picom/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/picom/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "picom"; - version = "8"; + version = "8.1"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${version}"; - sha256 = "04svbv7v73q8yn9la69451rda6l2pgxcphv2zlkdqaxxdbp69195"; + sha256 = "0iwixf3gaichmpvhczxdg5srkb72yh61i5wh7m3fab657h3r7di6"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sawfish/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sawfish/default.nix index 18c3d22f94..f163715456 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sawfish/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sawfish/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , pkgconfig, which, autoreconfHook -, rep-gtk, pango, gdk-pixbuf +, rep-gtk, pango, gdk-pixbuf-xlib , imlib, gettext, texinfo , libXinerama, libXrandr, libXtst, libICE, libSM , makeWrapper @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ which - rep-gtk pango gdk-pixbuf imlib gettext texinfo + rep-gtk pango gdk-pixbuf-xlib imlib gettext texinfo libXinerama libXrandr libXtst libICE libSM makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/build-support/docker/default.nix b/third_party/nixpkgs/pkgs/build-support/docker/default.nix index b2c132afd7..35382662cf 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/docker/default.nix @@ -819,7 +819,13 @@ rec { ''; result = runCommand "stream-${name}" { inherit (conf) imageName; - passthru = { inherit (conf) imageTag; }; + passthru = { + inherit (conf) imageTag; + + # Distinguish tarballs and exes at the Nix level so functions that + # take images can know in advance how the image is supposed to be used. + isExe = true; + }; buildInputs = [ makeWrapper ]; } '' makeWrapper ${streamScript} $out --add-flags ${conf} diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix index d559aba161..0e06f5f89a 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix @@ -4,7 +4,8 @@ # This can be useful for deploying packages with NixOps, and to share # binary dependencies between projects. -{ lib, stdenv, defaultCrateOverrides, fetchCrate, rustc, rust, cargo, jq }: +{ lib, stdenv, defaultCrateOverrides, fetchCrate, pkgsBuildBuild, rustc, rust +, cargo, jq }: let # This doesn't appear to be officially documented anywhere yet. @@ -83,6 +84,8 @@ in # A list of rust/cargo features to enable while building the crate. # Example: [ "std" "async" ] , features + # Additional native build inputs for building this crate. + , nativeBuildInputs # Additional build inputs for building this crate. # # Example: [ pkgs.openssl ] @@ -188,12 +191,13 @@ let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverr dependencies_ = dependencies; buildDependencies_ = buildDependencies; processedAttrs = [ - "src" "buildInputs" "crateBin" "crateLib" "libName" "libPath" + "src" "nativeBuildInputs" "buildInputs" "crateBin" "crateLib" "libName" "libPath" "buildDependencies" "dependencies" "features" "crateRenames" "crateName" "version" "build" "authors" "colors" "edition" "buildTests" ]; extraDerivationAttrs = builtins.removeAttrs crate processedAttrs; + nativeBuildInputs_ = nativeBuildInputs; buildInputs_ = buildInputs; extraRustcOpts_ = extraRustcOpts; buildTests_ = buildTests; @@ -225,7 +229,8 @@ stdenv.mkDerivation (rec { src = crate.src or (fetchCrate { inherit (crate) crateName version sha256; }); name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}"; version = crate.version; - depsBuildBuild = [ rust stdenv.cc cargo jq ]; + depsBuildBuild = [ pkgsBuildBuild.stdenv.cc ]; + nativeBuildInputs = [ rust stdenv.cc cargo jq ] ++ (crate.nativeBuildInputs or []) ++ nativeBuildInputs_; buildInputs = (crate.buildInputs or []) ++ buildInputs_; dependencies = map lib.getLib dependencies_; buildDependencies = map lib.getLib buildDependencies_; @@ -301,6 +306,7 @@ stdenv.mkDerivation (rec { verbose = crate_.verbose or true; extraRustcOpts = []; features = []; + nativeBuildInputs = []; buildInputs = []; crateOverrides = defaultCrateOverrides; preUnpack = crate_.preUnpack or ""; diff --git a/third_party/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix b/third_party/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix index 1c4fe9daea..d0e69ad698 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix @@ -16,18 +16,21 @@ in }; libz-sys = attrs: { - buildInputs = [ pkgconfig zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib ]; extraLinkFlags = ["-L${zlib.out}/lib"]; }; curl-sys = attrs: { - buildInputs = [ pkgconfig zlib curl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib curl ]; propagatedBuildInputs = [ curl zlib ]; extraLinkFlags = ["-L${zlib.out}/lib"]; }; dbus = attrs: { - buildInputs = [ pkgconfig dbus ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus ]; }; foundationdb-sys = attrs: { @@ -62,19 +65,23 @@ in libgit2-sys = attrs: { LIBGIT2_SYS_USE_PKG_CONFIG = true; - buildInputs = [ pkgconfig openssl zlib libgit2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl zlib libgit2 ]; }; libsqlite3-sys = attrs: { - buildInputs = [ pkgconfig sqlite ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ sqlite ]; }; libssh2-sys = attrs: { - buildInputs = [ pkgconfig openssl zlib libssh2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl zlib libssh2 ]; }; libdbus-sys = attrs: { - buildInputs = [ pkgconfig dbus ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus ]; }; openssl = attrs: { @@ -82,11 +89,13 @@ in }; openssl-sys = attrs: { - buildInputs = [ pkgconfig openssl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ]; }; pq-sys = attr: { - buildInputs = [ pkgconfig postgresql ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ postgresql ]; }; rink = attrs: { @@ -103,7 +112,8 @@ in }; thrussh-libsodium = attrs: { - buildInputs = [ pkgconfig libsodium ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsodium ]; }; xcb = attrs: { diff --git a/third_party/nixpkgs/pkgs/common-updater/scripts/update-source-version b/third_party/nixpkgs/pkgs/common-updater/scripts/update-source-version index 6a66f94597..ba628fd2a4 100755 --- a/third_party/nixpkgs/pkgs/common-updater/scripts/update-source-version +++ b/third_party/nixpkgs/pkgs/common-updater/scripts/update-source-version @@ -11,7 +11,7 @@ die() { usage() { echo "Usage: $scriptName [] []" echo " [--version-key=] [--system=] [--file=]" - echo " [--ignore-same-hash]" + echo " [--ignore-same-hash] [--print-changes]" } args=() @@ -33,6 +33,9 @@ for arg in "$@"; do --ignore-same-hash) ignoreSameHash="true" ;; + --print-changes) + printChanges="true" + ;; --help) usage exit 0 @@ -102,6 +105,9 @@ fi if [[ "$oldVersion" = "$newVersion" ]]; then echo "$scriptName: New version same as old version, nothing to do." >&2 + if [ -n "$printChanges" ]; then + printf '[]\n' + fi exit 0 fi @@ -197,3 +203,7 @@ fi rm -f "$nixFile.bak" rm -f "$attr.fetchlog" + +if [ -n "$printChanges" ]; then + printf '[{"attrPath":"%s","oldVersion":"%s","newVersion":"%s","files":["%s"]}]\n' "$attr" "$oldVersion" "$newVersion" "$nixFile" +fi diff --git a/third_party/nixpkgs/pkgs/data/documentation/man-pages/default.nix b/third_party/nixpkgs/pkgs/data/documentation/man-pages/default.nix index 58aaf8c47c..6d0cbc50ae 100644 --- a/third_party/nixpkgs/pkgs/data/documentation/man-pages/default.nix +++ b/third_party/nixpkgs/pkgs/data/documentation/man-pages/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { # conflict with shadow-utils rm $out/share/man/man5/passwd.5 \ $out/share/man/man3/getspnam.3 + + # The manpath executable looks up manpages from PATH. And this package won't + # appear in PATH unless it has a /bin folder + mkdir -p $out/bin ''; outputDocdev = "out"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/lato/default.nix b/third_party/nixpkgs/pkgs/data/fonts/lato/default.nix index 2b9f6c1114..76effcf97c 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/lato/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/lato/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "lato-2.0"; - url = "http://www.latofonts.com/download/Lato2OFL.zip"; + url = "https://www.latofonts.com/download/Lato2OFL.zip"; postFetch = '' mkdir -p $out/share/fonts @@ -13,7 +13,7 @@ fetchzip { sha256 = "1amwn6vcaggxrd2s4zw21s2pr47zmzdf2xfy4x9lxa2cd9bkhvg5"; meta = with lib; { - homepage = "http://www.latofonts.com/"; + homepage = "https://www.latofonts.com/"; description = '' Sans-serif typeface family designed in Summer 2010 by Łukasz Dziedzic diff --git a/third_party/nixpkgs/pkgs/data/fonts/monoid/default.nix b/third_party/nixpkgs/pkgs/data/fonts/monoid/default.nix index f62f4961fc..48dc121af4 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/monoid/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/monoid/default.nix @@ -1,19 +1,25 @@ -{ stdenv, fetchFromGitHub, python2 }: -# Python 3 support requires https://github.com/larsenwork/monoid/pull/233 to be merged +{ stdenv, fetchFromGitHub, fetchpatch, python3 }: stdenv.mkDerivation { pname = "monoid"; - version = "2016-07-21"; + version = "2018-06-03"; src = fetchFromGitHub { owner = "larsenwork"; repo = "monoid"; - rev = "e9d77ec18c337dc78ceae787a673328615f0b120"; - sha256 = "07h5q6cn6jjpmxp9vyag1bxx481waz344sr2kfs7d37bba8yjydj"; + rev = "a331c7c5f402c449f623e0d0895bd2fd8dc30ccf"; + sha256 = "sha256-RV6lxv5CjywTMcuPMj6rdjLKrap7zLJ7niaNeF//U1Y="; }; + patches = [ + (fetchpatch { + url = "https://github.com/larsenwork/monoid/pull/233/commits/f84f2ed61301ee84dadd16351314394f22ebed2f.patch"; + sha256 = "sha256-CxfFHlR7TB64pvrfzVfUDkPwuRO2UdGOhXwW98c+oQU="; + }) + ]; + nativeBuildInputs = [ - (python2.withPackages (pp: with pp; [ + (python3.withPackages (pp: with pp; [ fontforge ])) ]; diff --git a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix index 79f8cb8b33..1c1d773038 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix @@ -141,6 +141,10 @@ in # remove check for virtualenv, since we handle # python requirements using python.withPackages sed -i '/ifndef VIRTUAL_ENV/,+2d' Makefile + + # Make the build verbose so it won't get culled by Hydra thinking that + # it somehow got stuck doing nothing. + sed -i 's;\t@;\t;' Makefile ''; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/data/fonts/sudo/default.nix b/third_party/nixpkgs/pkgs/data/fonts/sudo/default.nix index 48ca0fea1e..fab252af45 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/sudo/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/sudo/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip }: let - version = "0.50"; + version = "0.51"; in fetchzip { name = "sudo-font-${version}"; - url = "https://github.com/jenskutilek/sudo-font/raw/v${version}/dist/sudo.zip"; - sha256 = "1mk81r9p7ks6av3rj06c6n9vx2qv2hwx6zfbc2mk1filxjirk1ll"; + url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; + sha256 = "19m132183w5hrc5qvlb6cj38hir2302cqiljlfc72qdlb8al6fwi"; postFetch = '' mkdir -p $out/share/fonts/ @@ -21,4 +21,3 @@ in fetchzip { platforms = platforms.all; }; } - 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 0fd9bf85d8..df7cac08b0 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 @@ -28,17 +28,17 @@ symlinkParentIconThemes() { theme_name="${theme%/*}" theme_name="${theme_name##*/}" echo " theme: $theme_name" - inheritance=$(sed -rne 's,^Inherits=(.*)$,\1,p' $theme) + 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)" + 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") + parent_path="$(realpath "$parent_dir/icons/$parent_theme")" ln -s "$parent_path" "$out/share/icons/" break fi 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 619fd0205b..4c6b84479a 100644 --- a/third_party/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iconpack-jade"; - version = "1.23"; + version = "1.24"; src = fetchFromGitHub { owner = "madmaxms"; repo = pname; rev = "v${version}"; - sha256 = "1q29ikfssn1vmwws3dry4ssq6b44afd9sb7dwv3rdqg0frabpj1m"; + sha256 = "1bns1f3vv7d7ps08plnhl3432cy2l2mhv85h7n4fifjqqi8bll9x"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix b/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix index b1b8d6ce90..d390445f31 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/edb0920a8dbbd592d67a781d0b905728515ab623.tar.gz"; - sha256 = "08yvpwzw7c3xw3w970ysykj44vglqfiq057kx0axk81s68v83rcy"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/cc32e957fbe01d248c9a0e99253fadb37fd3adfa.tar.gz"; + sha256 = "121n26r3sm55ycwh6m71n4823c5af3hfpc497g4prf1j2n4yh2dl"; } diff --git a/third_party/nixpkgs/pkgs/data/themes/jade1/default.nix b/third_party/nixpkgs/pkgs/data/themes/jade1/default.nix index 47bb7242db..c9a549462c 100644 --- a/third_party/nixpkgs/pkgs/data/themes/jade1/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/jade1/default.nix @@ -1,27 +1,29 @@ -{ stdenv, fetchFromGitHub, gtk-engine-murrine }: +{ stdenv, fetchurl, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.8"; + version = "1.9"; - src = fetchFromGitHub { - owner = "madmaxms"; - repo = "theme-jade-1"; - rev = "v${version}"; - sha256 = "1nvn2ghkdhilrsjpvl7r92aldvbs0nx0xc82jwrfaahi87dgfs8x"; + src = fetchurl { + url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz"; + sha256 = "11fzd44ysy76iwyiwkshpf0vf6m3i3hcxyyihl0lg68nb3cv0g9y"; }; + sourceRoot = "."; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; installPhase = '' + runHook preInstall mkdir -p $out/share/themes cp -a Jade* $out/share/themes + runHook postInstall ''; meta = with stdenv.lib; { description = "Based on Linux Mint theme with dark menus and more intensive green"; homepage = "https://github.com/madmaxms/theme-jade-1"; - license = with licenses; [ gpl3 ]; + license = with licenses; [ gpl3Only ]; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/data/themes/marwaita-manjaro/default.nix b/third_party/nixpkgs/pkgs/data/themes/marwaita-manjaro/default.nix index 539d1a937b..6750c01199 100644 --- a/third_party/nixpkgs/pkgs/data/themes/marwaita-manjaro/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/marwaita-manjaro/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita-manjaro"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0gd6dk7bfhnzmdsmdafc6f0kspnvzpvcmlb8h6q36ifvv0yg3jw4"; + sha256 = "133b9ri1yhvwrm9fm648mq0xnbr9mccy6yar7d390n4659j09v3s"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix b/third_party/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix index 1822c36f07..3b92b143c7 100644 --- a/third_party/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita-peppermint"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0g1n84px69wjjxclw76d59v8ccs4bkml71kzkvh12s9jcjw4zkc6"; + sha256 = "16jrkdkkg8vrzzdv23zbpwk4gi740gn6gj92m0yqv7d6whrbkcvp"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix b/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix index 291f437c3e..b50eb855a9 100644 --- a/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "7.6.1"; + version = "7.7"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "1n7flwrngwh6gmh72j40apf8qk52162m93hsfhgxzrivkhg37zi0"; + sha256 = "09r9ggngskazddhcm9c2n0cjc4qs9215vyri4i02cbp1jl82kwvg"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix index 69b1908b81..be8bc3426e 100644 --- a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2020-07-27"; + version = "2020-09-28"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "09kzxd92zqissk0bk3aw06hsa05riq88xvwhlxfw2agig13cfrhw"; + sha256 = "06ylja07snxcbz1cwaip1z3kqw7m7fdphmrkb4r1rdvan1i2widi"; }; buildInputs = [ gdk-pixbuf librsvg ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/materia-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/materia-theme/default.nix index a93c242d2d..b5c13960be 100644 --- a/third_party/nixpkgs/pkgs/data/themes/materia-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/materia-theme/default.nix @@ -1,37 +1,55 @@ -{ stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: +{ stdenv +, fetchFromGitHub +, meson +, ninja +, sassc +, gnome3 +, gtk-engine-murrine +, gdk-pixbuf +, librsvg +}: stdenv.mkDerivation rec { pname = "materia-theme"; - version = "20190912"; + version = "20200916"; src = fetchFromGitHub { owner = "nana-4"; repo = pname; rev = "v${version}"; - sha256 = "07vbql1y9jfd0m34lw1674cfr6217dzg3irk0450kny8sjrrj6dx"; + sha256 = "0qaxxafsn5zd2ysgr0jyv5j73360mfdmxyd55askswlsfphssn74"; }; - nativeBuildInputs = [ glib libxml2 bc ]; + nativeBuildInputs = [ + meson + ninja + sassc + ]; - buildInputs = [ gnome3.gnome-themes-extra gdk-pixbuf librsvg ]; + buildInputs = [ + gnome3.gnome-themes-extra + gdk-pixbuf + librsvg + ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; dontBuild = true; - installPhase = '' - patchShebangs install.sh - sed -i install.sh \ - -e "s|if .*which gnome-shell.*;|if true;|" \ - -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}|" - ./install.sh --dest $out/share/themes + mesonFlags = [ + "-Dgnome_shell_version=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}" + ]; + + postInstall = '' rm $out/share/themes/*/COPYING ''; meta = with stdenv.lib; { description = "Material Design theme for GNOME/GTK based desktop environments"; homepage = "https://github.com/nana-4/materia-theme"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.all; maintainers = [ maintainers.mounium ]; }; diff --git a/third_party/nixpkgs/pkgs/data/themes/obsidian2/default.nix b/third_party/nixpkgs/pkgs/data/themes/obsidian2/default.nix index cb6cd686ac..cb2660ed05 100644 --- a/third_party/nixpkgs/pkgs/data/themes/obsidian2/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/obsidian2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.14"; + version = "2.15"; src = fetchurl { url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz"; - sha256 = "0q713s6fwdvbiirzkm91y9xdpc7x7ay432km0fx90vn4s24p718y"; + sha256 = "1d6h8jsg8r1jbv2izshhpvlwsrwpi2f2dm461kr1zpwcw5glf9jx"; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 35ca865bc1..496f0bb3d3 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -64,6 +64,10 @@ stdenv.mkDerivation rec { url = "https://github.com/linuxmint/cinnamon/commit/ce99760fa15c3de2e095b9a5372eeaca646fbed1.patch"; sha256 = "0p2sbdi5w7sgblqbgisb6f8lcj1syzq5vlk0ilvwaqayxjylg8gz"; }) + (fetchpatch { + url = "https://leigh123linux.fedorapeople.org/pub/patches/new_cjs.patch"; + sha256 = "07biv3vkbn3jzijbdrxcw73p8xz2djbsax014mlkvmryrmys0rg4"; + }) ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix index cdbcfa9683..a810bdcc03 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix @@ -1,6 +1,4 @@ -{ autoconf-archive -, autoreconfHook -, dbus-glib +{ dbus-glib , fetchFromGitHub , gobject-introspection , pkgconfig @@ -17,26 +15,51 @@ , libffi , gtk3 , readline +, spidermonkey_78 +, meson +, sysprof +, dbus +, xvfb_run +, ninja +, makeWrapper +, which +, libxml2 }: -let - - # https://github.com/linuxmint/cjs/issues/80 - spidermonkey_52 = callPackage ./spidermonkey_52.nix {}; - -in - stdenv.mkDerivation rec { pname = "cjs"; - version = "4.6.0"; + version = "4.6.0-gjs-1.66.0"; src = fetchFromGitHub { - owner = "linuxmint"; + owner = "leigh123linux"; repo = pname; - rev = version; - sha256 = "1caa43cplb40dm1bwnwca7z4yafvnrncm96k7mih6kg3m87fxqi5"; + rev = "gjs-1.66.0"; + sha256 = "1pccz7h8mwljziflhn04gmfnbl99pvcj1byz1c6zn947v5gqskj1"; }; + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + meson # ADDING cmake breaks the build, ignore meson warning + ninja + pkgconfig + makeWrapper + which # for locale detection + libxml2 # for xml-stripblanks + ]; + + buildInputs = [ + gobject-introspection + cairo + readline + spidermonkey_78 + dbus # for dbus-run-session + ]; + + checkInputs = [ + xvfb_run + ]; + propagatedBuildInputs = [ glib @@ -47,25 +70,8 @@ stdenv.mkDerivation rec { xapps ]; - nativeBuildInputs = [ - autoconf-archive - autoreconfHook - wrapGAppsHook - pkgconfig - ]; - - buildInputs = [ - # from .pc - gobject-introspection - libffi - spidermonkey_52 # mozjs-52 - cairo # +cairo-gobject - gtk3 - - # other - - dbus-glib - readline + mesonFlags = [ + "-Dprofiler=disabled" ]; meta = with stdenv.lib; { @@ -77,11 +83,12 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ - gpl2Plus - lgpl2Plus - mit - mpl11 - ]; + gpl2Plus + lgpl2Plus + mit + mpl11 + ]; + platforms = platforms.linux; maintainers = teams.cinnamon.members; }; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/fix-werror.patch b/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/fix-werror.patch deleted file mode 100644 index 0218eba3b4..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/fix-werror.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1b802175914418f5675047c34f1ab1593dd35b18 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= -Date: Wed, 8 Jan 2020 11:04:27 +0100 -Subject: [PATCH] fix werror - ---- - js/src/moz.build | 2 +- - js/src/shell/moz.build | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/js/src/moz.build b/js/src/moz.build -index 1162cb70c..595ea9842 100644 ---- a/js/src/moz.build -+++ b/js/src/moz.build -@@ -785,7 +785,7 @@ if CONFIG['JS_HAS_CTYPES']: - DEFINES['FFI_BUILDING'] = True - - if CONFIG['GNU_CXX']: -- CXXFLAGS += ['-Wno-shadow', '-Werror=format'] -+ CXXFLAGS += ['-Wno-shadow'] - - # Suppress warnings in third-party code. - if CONFIG['CLANG_CXX']: -diff --git a/js/src/shell/moz.build b/js/src/shell/moz.build -index 72ea8145c..77475b241 100644 ---- a/js/src/shell/moz.build -+++ b/js/src/shell/moz.build -@@ -51,7 +51,7 @@ shellmoduleloader.inputs = [ - ] - - if CONFIG['GNU_CXX']: -- CXXFLAGS += ['-Wno-shadow', '-Werror=format'] -+ CXXFLAGS += ['-Wno-shadow'] - - # This is intended as a temporary workaround to enable VS2015. - if CONFIG['_MSC_VER']: --- -2.17.1 - diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/spidermonkey_52.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/spidermonkey_52.nix deleted file mode 100644 index 7fb983d613..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/spidermonkey_52.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, zip, which, readline, icu, zlib, nspr, buildPackages }: - -let - version = "52.9.0"; -in stdenv.mkDerivation { - pname = "spidermonkey"; - inherit version; - - src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "1mlx34fgh1kaqamrkl5isf0npch3mm6s4lz3jsjb7hakiijhj7f0"; - }; - - outputs = [ "out" "dev" ]; - setOutputFlags = false; # Configure script only understands --includedir - - buildInputs = [ readline icu zlib nspr ]; - nativeBuildInputs = [ autoconf213 pkgconfig perl which buildPackages.python2 zip ]; - - # Apparently this package fails to build correctly with modern compilers, which at least - # on ARMv6 causes polkit testsuite to break with an assertion failure in spidermonkey. - # These flags were stolen from: - # https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/js52 - NIX_CFLAGS_COMPILE = "-fno-delete-null-pointer-checks -fno-strict-aliasing -fno-tree-vrp"; - - patches = [ - # needed to build gnome3.gjs - (fetchpatch { - name = "mozjs52-disable-mozglue.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/mozjs52-disable-mozglue.patch?h=packages/js52&id=4279d2e18d9a44f6375f584911f63d13de7704be"; - sha256 = "18wkss0agdyff107p5lfflk72qiz350xqw2yqc353alkx4fsfpz0"; - }) - (fetchpatch { - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/no-error.diff?h=packages/js52"; - sha256 = "1vsw6558lxiy0r1mg6y49cgddan1mfqvqlkyv734bgxyg6n3pb9i"; - }) - ./fix-werror.patch - ]; - - configurePlatforms = [ ]; - - preConfigure = '' - export CXXFLAGS="-fpermissive" - export LIBXUL_DIST=$out - export PYTHON="${buildPackages.python2.interpreter}" - configureFlagsArray+=("--includedir=$dev/include") - - cd js/src - - autoconf - ''; - - configureFlags = [ - "--with-nspr-prefix=${nspr}" - "--with-system-zlib" - "--with-system-icu" - "--with-intl-api" - "--enable-readline" - "--enable-shared-js" - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-jemalloc" - ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--host=${stdenv.buildPlatform.config}" - "--target=${stdenv.hostPlatform.config}" - ]; - - makeFlags = [ - "HOST_CC=${buildPackages.stdenv.cc}/bin/cc" - ]; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - enableParallelBuilding = true; - - postInstall = '' - moveToOutput bin/js52-config "$dev" - # Nuke a static lib. - rm $out/lib/libjs_static.ajs - ''; - - meta = with stdenv.lib; { - description = "Mozilla's JavaScript engine written in C/C++"; - homepage = "https://developer.mozilla.org/en/SpiderMonkey"; - license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. - maintainers = [ maintainers.abbradar ]; - platforms = platforms.linux; - - # Commented out so hydra builds the package - # (I know what you're thinking now, but cjs won't be pulling anything from the network - # and modules are allowed to execute commands anyways, so an RCE is basically irrelevant) - # - # knownVulnerabilities = [ - # "The runtime was extracted from Firefox 52, which EOL’d on September 5, 2018." - # ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/efl/default.nix b/third_party/nixpkgs/pkgs/desktops/enlightenment/efl/default.nix index 9ce0306b54..6c981e9c93 100644 --- a/third_party/nixpkgs/pkgs/desktops/enlightenment/efl/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/efl/default.nix @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { pname = "efl"; - version = "1.24.3"; + version = "1.25.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "de95c6e673c170c1e21382918b122417c091c643e7dcaced89aa785529625c2a"; + sha256 = "0vlmf0rp2qxdl06pdmrd1xdfa10sdz30vnxzc98inpdg1n8iz52k"; }; nativeBuildInputs = [ @@ -142,16 +142,17 @@ stdenv.mkDerivation rec { "--buildtype=release" "-D build-tests=false" # disable build tests, which are not working "-D drm=true" - "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disalbed by default, scim is not availabe in nixpkgs + "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disabled by default, scim is not availabe in nixpkgs "-D embedded-lz4=false" "-D fb=true" "-D network-backend=connman" "-D sdl=true" + "-D elua=true" + "-D bindings=lua,cxx" ]; patches = [ ./efl-elua.patch - ./0002-efreet-more-stat-info-changes.patch ]; postPatch = '' @@ -174,11 +175,10 @@ stdenv.mkDerivation rec { source "$setupHook" ''; - NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 - postInstall = '' # fix use of $out variable substituteInPlace "$out/share/elua/core/util.lua" --replace '$out' "$out" + rm "$out/share/elua/core/util.lua.orig" # add all module include dirs to the Cflags field in efl.pc modules=$(for i in "$out/include/"*/; do printf ' -I''${includedir}/'`basename $i`; done) diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/material-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/material-shell/default.nix new file mode 100644 index 0000000000..36de0e0a66 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/material-shell/default.nix @@ -0,0 +1,44 @@ +{ stdenv, lib, fetchFromGitHub, gnome3, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-material-shell"; + version = "7"; + + src = fetchFromGitHub { + owner = "material-shell"; + repo = "material-shell"; + rev = version; + sha256 = "076cv1l5qr5x71przjwvbzx0m91n4z0byc2gc3r48l8vsr2d0hwf"; + }; + + patches = [ + # Fix for https://github.com/material-shell/material-shell/issues/284 + # (Remove this patch when updating to version >= 8) + (fetchpatch { + url = "https://github.com/material-shell/material-shell/commit/fc27489a1ec503a4a5c7cb2f4e1eefa84a7ea2f1.patch"; + sha256 = "0x2skg955c4jqgwbkfhk7plm8bh1qnk66cdds796bzkp3hb5syw8"; + }) + ]; + + # This package has a Makefile, but it's used for building a zip for + # publication to extensions.gnome.org. Disable the build phase so + # installing doesn't build an unnecessary release. + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp -r * $out/share/gnome-shell/extensions/${uuid}/ + runHook postInstall + ''; + + uuid = "material-shell@papyelgringo"; + + meta = with stdenv.lib; { + description = "A modern desktop interface for Linux"; + license = licenses.mit; + maintainers = with maintainers; [ benley ]; + homepage = "https://github.com/material-shell/material-shell"; + platforms = gnome3.gnome-shell.meta.platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix b/third_party/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix index 0124e91a9b..8cf47d1fb7 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix @@ -21,6 +21,5 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ ashalkhakov matthewbauer ]; platforms = platforms.unix; - badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix index 89191dc302..d71d72ce18 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "caja-extensions"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "175v5c05nrdliya23rbqma49alldq67dklmvpq18nq71sfry4pp6"; + sha256 = "13jkynanqj8snys0if8lv6yx1y0jrm778s2152n4x65hsghc6cw5"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/engrampa/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/engrampa/default.nix index 1f1be3e285..fce62f9f01 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/engrampa/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/engrampa/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "engrampa"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13cak3qgrzqj74x9jq1sf155793v2bqqz4mk4i04g9f9xn3g85fl"; + sha256 = "0akjnz85qkpiqgj1ccn41rzbfid4l3r3nsm4s9s779ilzd7f097y"; }; nativeBuildInputs = [ @@ -19,12 +19,16 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 gtk3 + file #libmagic mate.caja hicolor-icon-theme mate.mate-desktop ]; - configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ]; + configureFlags = [ + "--with-cajadir=$$out/lib/caja/extensions-2.0" + "--enable-magic" + ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/eom/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/eom/default.nix index d7c5460408..2824fba2df 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/eom/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/eom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "eom"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0zzximp2534bky0vac219alafblw6m0lis0gncq92017s6c1mb77"; + sha256 = "0dralsc0dvs0l38cysdhx6kiaiqlb8qi6g9xz2cm6mjqyq3d3f9f"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix index 4c70c25280..f0e178ea9e 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmatekbd"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1sq7gwr9q3hq4q0vx32qqa68qcqf5by9mqyxnq6lwgaq8ydq16ab"; + sha256 = "17mcxfkvl14p04id3n5kbhpjwjq00c8wmbyciyy2hm7kwdln6zx8"; }; nativeBuildInputs = [ pkgconfig gettext ]; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix index 6bc9fe54ec..8b1e68e8b3 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libmatemixer"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08vkdp2kzy27xwscwp2jj5nz0yblrka2482l6cx3wl4dnk0rpznm"; + sha256 = "1n6rq7k66zvfd6sb7h92xihh021w9hysfa4yd1mzjcbb7c62ybqx"; }; nativeBuildInputs = [ pkgconfig gettext ]; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix index 4774339db8..3bfdfea06f 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmateweather"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "094mnlczxq9crjj8z7dzs1zmwscdkbp54l3qjaf4a4bhd8lihv8d"; + sha256 = "02d7c59pami1fzxg73mp6risa9hvsdpgs68f62wkg09nrppzsk4v"; }; nativeBuildInputs = [ pkgconfig gettext ]; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix index 7f77a56680..2a97bc851d 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-applets"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0nm3amb3v458mxv1mbz9y8f4230gldmydmkkm7vqxsrxbccynkxq"; + sha256 = "0h70i4x3bk017pgv4zn280682wm58vwdjm7kni91ni8rmblnnvyp"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix index e1f19ca8d6..8e2aa6933f 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-backgrounds"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0b9yx68p9l867bqsl9z2g4wrs8p396ls673jgaliys5snmk8n8dn"; + sha256 = "1ixb2vlm3dr52ibp4ggrbkf38m3q6i5lxjg4ix82gxbb6h6a3gp5"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix index 2de156d02d..48c9f37c03 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-calc"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0f7hc1gg41kcwcyvsqqg79qylrp0qqymris8qizk2x3cfvvg7261"; + sha256 = "0imdimq5d5rjq8mkjcrsd683a2bn9acmhc0lmvyw71y0040inbaw"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-common/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-common/default.nix index f8896ae0c2..a491798147 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-common/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-common/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-common"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1dgp6k2l6dz7x2lnqk4y5xfkld376726hda3mrc777f821kk99nr"; + sha256 = "0srb2ly5pjq1g0cs8m39nbfv33dvsc2j4g2gw081xis3awzh3lki"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix index c8119a923d..4c26961ba1 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mate-control-center"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "192plsh83m2qz7jgakns2yvhqbj53v7i54iwb0z26i2awy0j9rcd"; + sha256 = "08bai47fsmbxlw2lhig9n6c8sxr24ixkd1spq3j0635yzcqighb0"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix index 6a5f8b13bf..2e298d1416 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-desktop"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0l4bbj6nz315s5ndq5sw1jcgi3s1whk59bj12c4mbpsvmlb33adg"; + sha256 = "1nd1dn8mm1z6x4r68a25q4vzys1a6fmbzc94ss1z1n1872pczs6i"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-media/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-media/default.nix index c02201c855..458e4638ad 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-media/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-media/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-media"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1d5dx79yfqghjaxrdrdh053nfnvkbx8p3ma7j87s7rsvy5irs963"; + sha256 = "118i4w2i2g3hfgbfn3hjzjkfq8vjj6049r7my3vna9js23b7ab92"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix index 7d418c90b4..73f8be24cc 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-menus"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1vv4j38h7mrbfrsj99k25z6y7b5dg30fzd2qnhk7pl8ca8s1jhrd"; + sha256 = "17zc9fn14jykhn30z8iwlw0qwk32ivj6gxgww3xrqvqk0da5yaas"; }; nativeBuildInputs = [ pkgconfig gettext gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix index 32d0cc9ed8..0a797f4def 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mate-notification-daemon"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0y362b51lb8nq2cw254qc39x8hpficn5rxddzp0fxqxakrh7vcif"; + sha256 = "1ybzr8mni5pgrspf8hqnisd0r0hwdlgk7n5mzsh7xisbkgivpw2b"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix index dce6567518..4b021bcc09 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-panel"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1hrh10pqk8mva1ix2nmsp3cbbn81cgqy0b9lqhsl0b5p0s40i7in"; + sha256 = "0xblqrhfazd01h0jdmx4hvavkb7f9anbd4rjsk5r6wxhp027l64l"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix index 30f1c48fa5..c6872cc5be 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-power-manager"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13ar40x5hs4d4h81q8qsy0agbx5wnarry3mbhws54zydcxd7j20a"; + sha256 = "0fni41p3kraxwjnx9l5mdspng0zib1gfdxwlaiyq31mh4g79yjyj"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix index 1c80b19aa5..f05d8a736d 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-screensaver"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0gpw6x9d0b77f14vjl7ghq5dya1mwcnvmgigg00manfwlksr5zby"; + sha256 = "0imb1z2yvz1h95dzq396c569kkxys9mb2dyc6qxxxcnc5w02a2dw"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix index c7b7d5ba19..babdbcb4da 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-sensors-applet"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1izjgzj3xb93arim8w891x8as85phdmlhdnr2yc8ixg7xpblsq2s"; + sha256 = "1nb4fy3mcymv7pmnc0czpxgp1sqvs533jwnqv1b5cqby415ljb16"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix index 09973e04bc..b8b6132457 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mate-session-manager"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "01scj5d1xlri9b2id8gm9kfni9nzhdjdf7rag7fvcxwqp7baz3h3"; + sha256 = "1zwq8symyp3ijs28pyrknsdi9byf4dpp9wp93ndwdhi0vaip5i51"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix index 30db743c27..e023238586 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mate-settings-daemon"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1hc5a36wqpjv9i2lgrn1h12s8y910xab3phx5vzbzq47kj6m3gw9"; + sha256 = "0n1ywr3ir5p536s7azdbw2mh40ylqlpx3a74mjrivbms1rpjxyab"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix index 480cf8de1d..38c6a041e4 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-system-monitor"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1cb36lrsn4fhsryl2kl4yq0qhp1p4r7k21w3fc2ywjga8fdxx6y5"; + sha256 = "1i2r4lw6xsk972yp15g5hm8p8xx9pp6jmcvvzbdq80xyx3x898qz"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix index fc030152bc..c187aba897 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-terminal"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0nc23nmbkya2fgf7j65z85dcibwi5akkr8nscqrvk039ckirhk97"; + sha256 = "0qmyhxmarwkxad8k1m9q1iwx70zhfp6zc2mh74nv26nj4gr3h3am"; }; buildInputs = [ @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { vte gtk3 dconf + pcre2 ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/pluma/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/pluma/default.nix index 5a12ffc378..94a87f5d5f 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/pluma/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/pluma/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pluma"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1vmndhlhy3qkf3xs5kkv0xhbv5ar25pqz0kp17hc4qhgjzycfr0r"; + sha256 = "1sgc5f480icr2ans6gd3akvcax58mr4jp3zjk3xn7bx1mw9i299f"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/compcert/default.nix b/third_party/nixpkgs/pkgs/development/compilers/compcert/default.nix index 1665061125..8c8a56d8e2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/compcert/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/compcert/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper +{ stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper , coq, ocamlPackages, coq2html , tools ? stdenv.cc }: @@ -21,11 +21,22 @@ stdenv.mkDerivation rec { sha256 = "1h4zhk9rrqki193nxs9vjvya7nl9yxjcf07hfqb6g77riy1vd2jr"; }; + patches = [ + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/0a2db0269809539ccc66f8ec73637c37fbd23580.patch"; + sha256 = "0n8qrba70x8f422jdvq9ddgsx6avf2dkg892g4ldh3jiiidyhspy"; + }) + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/5e29f8b5ba9582ecf2a1d0baeaef195873640607.patch"; + sha256 = "184nfdgxrkci880lkaj5pgnify3plka7xfgqrgv16275sqppc5hc"; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = ocaml-pkgs ++ [ coq coq2html ]; enableParallelBuilding = true; - patchPhase = '' + postPatch = '' substituteInPlace ./configure \ --replace '{toolprefix}gcc' '{toolprefix}cc' ''; @@ -33,6 +44,7 @@ stdenv.mkDerivation rec { configurePhase = '' ./configure -clightgen \ -prefix $out \ + -coqdevdir $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ \ -toolprefix ${tools}/bin/ \ ${ccomp-platform} ''; @@ -47,12 +59,6 @@ stdenv.mkDerivation rec { mkdir -p $doc/share/doc/compcert mv doc/html $doc/share/doc/compcert/ - # install compcert lib files; remove copy from $out, too - mkdir -p $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ - mv backend cfrontend common cparser driver flocq x86 x86_64 lib \ - $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ - rm -rf $out/lib/compcert/coq - # wrap ccomp to undefine _FORTIFY_SOURCE; ccomp invokes cc1 which sets # _FORTIFY_SOURCE=2 by default, but undefines __GNUC__ (as it should), # which causes a warning in libc. this suppresses it. diff --git a/third_party/nixpkgs/pkgs/development/compilers/dasm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dasm/default.nix index 1eb233b90b..6ab729cd31 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dasm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dasm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dasm"; - version = "2.20.13"; + version = "2.20.14"; src = fetchFromGitHub { owner = "dasm-assembler"; repo = "dasm"; rev = version; - sha256 = "1nr4kvw42vyc6i4p1c06jlih11rhbjjxc27dc7cx5qj635xf4jcf"; + sha256 = "09hzw228j43a78624bmq9cam7y1fjs48d3hpjqh2gn8iwnyk0pnp"; }; configurePhase = false; diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix index 7a296af466..a284ef470b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix @@ -4,13 +4,13 @@ let sources = { - "@babel/cli-7.8.4" = { + "@babel/cli-7.11.6" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.8.4"; + version = "7.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.8.4.tgz"; - sha512 = "XXLgAm6LBbaNxaGhMAznXXaxtCWfuv6PIDJ9Alsy9JYTOh+j2jJz+L/162kkfU1j/pTSxK1xGmlwI4pdIMkoag=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.11.6.tgz"; + sha512 = "+w7BZCvkewSmaRM6H4L2QM3RL90teqEIHDIFXAmrW33+0jhlymnDAEdqVeCZATvxhQuio1ifoGVlJJbIiH9Ffg=="; }; }; "@babel/code-frame-7.0.0" = { @@ -40,22 +40,22 @@ let sha512 = "TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ=="; }; }; - "@babel/core-7.9.6" = { + "@babel/core-7.11.6" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.9.6"; + version = "7.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz"; - sha512 = "nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz"; + sha512 = "Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg=="; }; }; - "@babel/generator-7.11.4" = { + "@babel/generator-7.11.6" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.11.4"; + version = "7.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.4.tgz"; - sha512 = "Rn26vueFx0eOoz7iifCN2UHT6rGtnkSGWSoDRIy8jZN3B91PzeSULbswfLoOWuTuAcNwpG/mxy+uCTDnZ9Mp1g=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz"; + sha512 = "DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA=="; }; }; "@babel/helper-annotate-as-pure-7.10.4" = { @@ -85,6 +85,15 @@ let sha512 = "a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ=="; }; }; + "@babel/helper-create-class-features-plugin-7.10.5" = { + name = "_at_babel_slash_helper-create-class-features-plugin"; + packageName = "@babel/helper-create-class-features-plugin"; + version = "7.10.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz"; + sha512 = "0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A=="; + }; + }; "@babel/helper-create-regexp-features-plugin-7.10.4" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; @@ -274,13 +283,13 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.11.4" = { + "@babel/parser-7.11.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.11.4"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.4.tgz"; - sha512 = "MggwidiH+E9j5Sh8pbrX5sJvMcsqS5o+7iB42M9/k0CD63MjYbdP4nhSh7uB5wnv2/RVzTZFTxzF/kIa5mrCqA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz"; + sha512 = "X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="; }; }; "@babel/plugin-proposal-async-generator-functions-7.10.5" = { @@ -292,6 +301,15 @@ let sha512 = "cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg=="; }; }; + "@babel/plugin-proposal-class-properties-7.10.4" = { + name = "_at_babel_slash_plugin-proposal-class-properties"; + packageName = "@babel/plugin-proposal-class-properties"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz"; + sha512 = "vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg=="; + }; + }; "@babel/plugin-proposal-dynamic-import-7.10.4" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; @@ -301,6 +319,15 @@ let sha512 = "up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ=="; }; }; + "@babel/plugin-proposal-export-namespace-from-7.10.4" = { + name = "_at_babel_slash_plugin-proposal-export-namespace-from"; + packageName = "@babel/plugin-proposal-export-namespace-from"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz"; + sha512 = "aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg=="; + }; + }; "@babel/plugin-proposal-json-strings-7.10.4" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; @@ -310,6 +337,15 @@ let sha512 = "fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw=="; }; }; + "@babel/plugin-proposal-logical-assignment-operators-7.11.0" = { + name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; + packageName = "@babel/plugin-proposal-logical-assignment-operators"; + version = "7.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz"; + sha512 = "/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q=="; + }; + }; "@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; @@ -355,6 +391,15 @@ let sha512 = "v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA=="; }; }; + "@babel/plugin-proposal-private-methods-7.10.4" = { + name = "_at_babel_slash_plugin-proposal-private-methods"; + packageName = "@babel/plugin-proposal-private-methods"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz"; + sha512 = "wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw=="; + }; + }; "@babel/plugin-proposal-unicode-property-regex-7.10.4" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; @@ -373,6 +418,15 @@ let sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; }; }; + "@babel/plugin-syntax-class-properties-7.10.4" = { + name = "_at_babel_slash_plugin-syntax-class-properties"; + packageName = "@babel/plugin-syntax-class-properties"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz"; + sha512 = "GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA=="; + }; + }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { name = "_at_babel_slash_plugin-syntax-dynamic-import"; packageName = "@babel/plugin-syntax-dynamic-import"; @@ -382,6 +436,15 @@ let sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; }; }; + "@babel/plugin-syntax-export-namespace-from-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-export-namespace-from"; + packageName = "@babel/plugin-syntax-export-namespace-from"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; + sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; + }; + }; "@babel/plugin-syntax-json-strings-7.8.3" = { name = "_at_babel_slash_plugin-syntax-json-strings"; packageName = "@babel/plugin-syntax-json-strings"; @@ -391,6 +454,15 @@ let sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; }; }; + "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { + name = "_at_babel_slash_plugin-syntax-logical-assignment-operators"; + packageName = "@babel/plugin-syntax-logical-assignment-operators"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; + sha512 = "d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig=="; + }; + }; "@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" = { name = "_at_babel_slash_plugin-syntax-nullish-coalescing-operator"; packageName = "@babel/plugin-syntax-nullish-coalescing-operator"; @@ -670,13 +742,13 @@ let sha512 = "hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ=="; }; }; - "@babel/plugin-transform-runtime-7.9.6" = { + "@babel/plugin-transform-runtime-7.11.5" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.9.6"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz"; - sha512 = "qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.5.tgz"; + sha512 = "9aIoee+EhjySZ6vY5hnLjigHzunBlscx9ANKutkeWTJTx6m5Rbq6Ic01tLvO54lSusR+BxV7u4UDdCmXv5aagg=="; }; }; "@babel/plugin-transform-shorthand-properties-7.10.4" = { @@ -724,6 +796,15 @@ let sha512 = "QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA=="; }; }; + "@babel/plugin-transform-unicode-escapes-7.10.4" = { + name = "_at_babel_slash_plugin-transform-unicode-escapes"; + packageName = "@babel/plugin-transform-unicode-escapes"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz"; + sha512 = "y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg=="; + }; + }; "@babel/plugin-transform-unicode-regex-7.10.4" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; @@ -733,13 +814,13 @@ let sha512 = "wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A=="; }; }; - "@babel/preset-env-7.9.6" = { + "@babel/preset-env-7.11.5" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.9.6"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz"; - sha512 = "0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.5.tgz"; + sha512 = "kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA=="; }; }; "@babel/preset-modules-0.1.4" = { @@ -751,13 +832,13 @@ let sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg=="; }; }; - "@babel/runtime-7.9.6" = { + "@babel/runtime-7.11.2" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.9.6"; + version = "7.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz"; - sha512 = "64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz"; + sha512 = "TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw=="; }; }; "@babel/template-7.10.4" = { @@ -769,22 +850,22 @@ let sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; }; }; - "@babel/traverse-7.11.0" = { + "@babel/traverse-7.11.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.11.0"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz"; - sha512 = "ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz"; + sha512 = "EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ=="; }; }; - "@babel/types-7.11.0" = { + "@babel/types-7.11.5" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.11.0"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz"; - sha512 = "O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz"; + sha512 = "bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q=="; }; }; "@hapi/address-2.1.4" = { @@ -841,13 +922,13 @@ let sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw=="; }; }; - "@jest/types-26.3.0" = { + "@jest/types-26.5.0" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; - version = "26.3.0"; + version = "26.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz"; - sha512 = "BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ=="; + url = "https://registry.npmjs.org/@jest/types/-/types-26.5.0.tgz"; + sha512 = "nH9DFLqaIhB+RVgjivemvMiFSWw/BKwbZGxBAMv8CCTvUyFoK8RwHhAlmlXIvMBrf5Z3YQ4p9cq3Qh9EDctGvA=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -949,15 +1030,6 @@ let sha512 = "ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ=="; }; }; - "@types/color-name-1.1.1" = { - name = "_at_types_slash_color-name"; - packageName = "@types/color-name"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz"; - sha512 = "rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="; - }; - }; "@types/glob-7.1.3" = { name = "_at_types_slash_glob"; packageName = "@types/glob"; @@ -967,13 +1039,13 @@ let sha512 = "SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w=="; }; }; - "@types/html-minifier-terser-5.1.0" = { + "@types/html-minifier-terser-5.1.1" = { name = "_at_types_slash_html-minifier-terser"; packageName = "@types/html-minifier-terser"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz"; - sha512 = "iYCgjm1dGPRuo12+BStjd1HiVQqhlRhWDOQigNxn023HcjnhsiFz9pc6CzJj4HwDCSQca9bxTL4PxJDbkdm3PA=="; + url = "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; + sha512 = "giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA=="; }; }; "@types/http-cache-semantics-4.0.0" = { @@ -1030,22 +1102,22 @@ let sha512 = "nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA=="; }; }; - "@types/jest-26.0.10" = { + "@types/jest-26.0.14" = { name = "_at_types_slash_jest"; packageName = "@types/jest"; - version = "26.0.10"; + version = "26.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.10.tgz"; - sha512 = "i2m0oyh8w/Lum7wWK/YOZJakYF8Mx08UaKA1CtbmFeDquVhAEdA7znacsVSf2hJ1OQ/OfVMGN90pw/AtzF8s/Q=="; + url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.14.tgz"; + sha512 = "Hz5q8Vu0D288x3iWXePSn53W7hAjP0H7EQ6QvDO9c7t46mR0lNOLlfuwQ+JkVxuhygHzlzPX+0jKdA3ZgSh+Vg=="; }; }; - "@types/json-schema-7.0.5" = { + "@types/json-schema-7.0.6" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.5"; + version = "7.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz"; - sha512 = "7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz"; + sha512 = "3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw=="; }; }; "@types/keyv-3.1.1" = { @@ -1066,13 +1138,22 @@ let sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; - "@types/node-14.6.2" = { + "@types/node-14.11.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.6.2"; + version = "14.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.6.2.tgz"; - sha512 = "onlIwbaeqvZyniGPfdw/TEhKIh79pz66L1q06WUQqJLnAb6wbjvOtepLYTGHTqzdXgBYIE3ZdmqHDGsRsbBz7A=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.11.3.tgz"; + sha512 = "tPQAF6b1wak7rBO49tL2N5nNVknyHBAzJVylF5rIYkfXbFkrNpbBLFMFUjxHzuuBiR7Si7T/X4eh6IRhZxO1tQ=="; + }; + }; + "@types/parse-json-4.0.0" = { + name = "_at_types_slash_parse-json"; + packageName = "@types/parse-json"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"; + sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; }; }; "@types/q-1.5.4" = { @@ -1111,40 +1192,40 @@ let sha512 = "W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA=="; }; }; - "@types/uglify-js-3.9.3" = { + "@types/uglify-js-3.11.0" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.9.3"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.9.3.tgz"; - sha512 = "KswB5C7Kwduwjj04Ykz+AjvPcfgv/37Za24O2EDzYNbwyzOo8+ydtvzUfZ5UMguiVu29Gx44l1A6VsPPcmYu9w=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.0.tgz"; + sha512 = "I0Yd8TUELTbgRHq2K65j8rnDPAzAP+DiaF/syLem7yXwYLsHZhPd+AM2iXsWmf9P2F2NlFCgl5erZPQx9IbM9Q=="; }; }; - "@types/webpack-4.41.21" = { + "@types/webpack-4.41.22" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.21"; + version = "4.41.22"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.21.tgz"; - sha512 = "2j9WVnNrr/8PLAB5csW44xzQSJwS26aOnICsP3pSGCEdsu6KYtfQ6QJsVUKHWRnm1bL7HziJsfh5fHqth87yKA=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.22.tgz"; + sha512 = "JQDJK6pj8OMV9gWOnN1dcLCyU9Hzs6lux0wBO4lr1+gyEhIBR9U3FMrz12t2GPkg110XAxEAw2WHF6g7nZIbRQ=="; }; }; - "@types/webpack-sources-1.4.2" = { + "@types/webpack-sources-2.0.0" = { name = "_at_types_slash_webpack-sources"; packageName = "@types/webpack-sources"; - version = "1.4.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-1.4.2.tgz"; - sha512 = "77T++JyKow4BQB/m9O96n9d/UUHWLQHlcqXb9Vsf4F1+wKNrrlWNFPDLKNT92RJnCSL6CieTc+NDXtCVZswdTw=="; + url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.0.0.tgz"; + sha512 = "a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg=="; }; }; - "@types/yargs-15.0.5" = { + "@types/yargs-15.0.7" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "15.0.5"; + version = "15.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz"; - sha512 = "Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.7.tgz"; + sha512 = "Gf4u3EjaPNcC9cTu4/j2oN14nSVhr8PQ+BvBcBQHAhDZfl0bVIiLgvnRXv/dn58XhTm9UXvBpvJpDlwV65QxOA=="; }; }; "@types/yargs-parser-15.0.0" = { @@ -1354,13 +1435,13 @@ let sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; - "acorn-6.4.1" = { + "acorn-6.4.2" = { name = "acorn"; packageName = "acorn"; - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz"; - sha512 = "ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="; + url = "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz"; + sha512 = "XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="; }; }; "address-1.0.3" = { @@ -1372,13 +1453,13 @@ let sha512 = "z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg=="; }; }; - "ajv-6.12.4" = { + "ajv-6.12.5" = { name = "ajv"; packageName = "ajv"; - version = "6.12.4"; + version = "6.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz"; - sha512 = "eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz"; + sha512 = "lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag=="; }; }; "ajv-errors-1.0.1" = { @@ -1489,13 +1570,13 @@ let sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; - "ansi-styles-4.2.1" = { + "ansi-styles-4.3.0" = { name = "ansi-styles"; packageName = "ansi-styles"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz"; - sha512 = "9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA=="; + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; }; "anymatch-2.0.0" = { @@ -1777,13 +1858,13 @@ let sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; }; }; - "autoprefixer-8.6.5" = { + "autoprefixer-10.0.1" = { name = "autoprefixer"; packageName = "autoprefixer"; - version = "8.6.5"; + version = "10.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-8.6.5.tgz"; - sha512 = "PLWJN3Xo/rycNkx+mp8iBDMTm3FeWe4VmYaZDSqL5QQB9sLsQkG5k8n+LNDFnhh9kdq2K+egL/icpctOmDHwig=="; + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.0.1.tgz"; + sha512 = "aQo2BDIsoOdemXUAOBpFv4ZQa2DrOtEufarYhtFsK1088Ca0TUwu/aQWf0M3mrILXZ3mTIVn1lR3hPW8acacsw=="; }; }; "aws-sign2-0.7.0" = { @@ -2137,15 +2218,6 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-3.2.8" = { - name = "browserslist"; - packageName = "browserslist"; - version = "3.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz"; - sha512 = "WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ=="; - }; - }; "browserslist-4.1.1" = { name = "browserslist"; packageName = "browserslist"; @@ -2155,13 +2227,13 @@ let sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q=="; }; }; - "browserslist-4.14.0" = { + "browserslist-4.14.5" = { name = "browserslist"; packageName = "browserslist"; - version = "4.14.0"; + version = "4.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.0.tgz"; - sha512 = "pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz"; + sha512 = "Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA=="; }; }; "bs-logger-0.2.6" = { @@ -2335,6 +2407,15 @@ let sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; }; }; + "callsites-3.1.0" = { + name = "callsites"; + packageName = "callsites"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; + }; + }; "camel-case-4.1.1" = { name = "camel-case"; packageName = "camel-case"; @@ -2362,6 +2443,15 @@ let sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; + "camelcase-6.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz"; + sha512 = "8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w=="; + }; + }; "caniuse-api-3.0.0" = { name = "caniuse-api"; packageName = "caniuse-api"; @@ -2371,13 +2461,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001119" = { + "caniuse-lite-1.0.30001143" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001119"; + version = "1.0.30001143"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001119.tgz"; - sha512 = "Hpwa4obv7EGP+TjkCh/wVvbtNJewxmtg4yVJBLFnxo35vbPapBr138bUWENkb5j5L9JZJ9RXLn4OrXRG/cecPQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001143.tgz"; + sha512 = "p/PO5YbwmCpBJPxjOiKBvAlUPgF8dExhfEpnsH+ys4N/791WHrYrGg0cyHiAURl5hSbx5vIcjKmQAP6sHDYH3w=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -2506,15 +2596,6 @@ let sha512 = "/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w=="; }; }; - "chokidar-3.3.0" = { - name = "chokidar"; - packageName = "chokidar"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz"; - sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; - }; - }; "chokidar-3.4.2" = { name = "chokidar"; packageName = "chokidar"; @@ -2722,6 +2803,15 @@ let sha512 = "dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw=="; }; }; + "colorette-1.2.1" = { + name = "colorette"; + packageName = "colorette"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz"; + sha512 = "puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw=="; + }; + }; "colors-1.0.3" = { name = "colors"; packageName = "colors"; @@ -3001,13 +3091,13 @@ let sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; }; }; - "copy-webpack-plugin-5.1.1" = { + "copy-webpack-plugin-5.1.2" = { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz"; - sha512 = "P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz"; + sha512 = "Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ=="; }; }; "core-js-2.6.11" = { @@ -3046,6 +3136,15 @@ let sha512 = "H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA=="; }; }; + "cosmiconfig-7.0.0" = { + name = "cosmiconfig"; + packageName = "cosmiconfig"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz"; + sha512 = "pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA=="; + }; + }; "create-ecdh-4.0.4" = { name = "create-ecdh"; packageName = "create-ecdh"; @@ -3118,15 +3217,6 @@ let sha512 = "6U/8SMK2FBNnB21oQ4+6Nsodxanw1gTkntYA2zBdkFYFu3ZDx65P2ONEXGSvob/QS6REjVHQ9zxzdOafwFdstw=="; }; }; - "cross-spawn-7.0.1" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz"; - sha512 = "u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg=="; - }; - }; "cross-spawn-7.0.3" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -3172,13 +3262,13 @@ let sha512 = "BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA=="; }; }; - "css-loader-3.6.0" = { + "css-loader-4.3.0" = { name = "css-loader"; packageName = "css-loader"; - version = "3.6.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz"; - sha512 = "M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ=="; + url = "https://registry.npmjs.org/css-loader/-/css-loader-4.3.0.tgz"; + sha512 = "rdezjCjScIrsL8BSYszgT4s476IcNKt6yX69t0pHjJVnPUTDpn4WfIpDQTN3wCJvUvfsz/mFjuGOekf3PY3NUg=="; }; }; "css-select-1.2.0" = { @@ -3235,13 +3325,13 @@ let sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg=="; }; }; - "css-what-3.3.0" = { + "css-what-3.4.1" = { name = "css-what"; packageName = "css-what"; - version = "3.3.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-3.3.0.tgz"; - sha512 = "pv9JPyatiPaQ6pf4OvD/dbfm0o5LviWmwxNWzblYf/1u9QZd0ihV+PMwy5jdQWQ3349kZmKEx9WXuSka2dM4cg=="; + url = "https://registry.npmjs.org/css-what/-/css-what-3.4.1.tgz"; + sha512 = "wHOppVDKl4vTAOWzJt5Ek37Sgd9qq1Bmj/T1OjvicWbU5W7ru7Pqbn0Jdqii3Drx/h+dixHKXNhZYx7blthL7g=="; }; }; "cssesc-3.0.0" = { @@ -3361,13 +3451,13 @@ let sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; }; }; - "debug-4.2.0" = { + "debug-4.3.0" = { name = "debug"; packageName = "debug"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz"; - sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.0.tgz"; + sha512 = "jjO6JD2rKfiZQnBoRzhRTbXjHLGLfH+UtGkWLc/UXAh/rzZMyjbgn0NcfFpqT8nd1kTtFnDiJcrIFkq4UKeJVg=="; }; }; "decamelize-1.2.0" = { @@ -3667,13 +3757,13 @@ let sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; }; }; - "domelementtype-2.0.1" = { + "domelementtype-2.0.2" = { name = "domelementtype"; packageName = "domelementtype"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz"; - sha512 = "5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ=="; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz"; + sha512 = "wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA=="; }; }; "domhandler-2.4.2" = { @@ -3712,13 +3802,13 @@ let sha512 = "7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA=="; }; }; - "dot-prop-5.2.0" = { + "dot-prop-5.3.0" = { name = "dot-prop"; packageName = "dot-prop"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz"; - sha512 = "uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A=="; + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz"; + sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; }; }; "dotenv-8.2.0" = { @@ -3775,13 +3865,13 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.3.555" = { + "electron-to-chromium-1.3.576" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.555"; + version = "1.3.576"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.555.tgz"; - sha512 = "/55x3nF2feXFZ5tdGUOr00TxnUjUgdxhrn+eCJ1FAcoAt+cKQTjQkUC5XF4frMWE1R5sjHk+JueuBalimfe5Pg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.576.tgz"; + sha512 = "uSEI0XZ//5ic+0NdOqlxp0liCD44ck20OAGyLMSymIWTEAtHKVJi6JM18acOnRgUgX7Q65QqnI+sNncNvIy8ew=="; }; }; "elliptic-6.5.3" = { @@ -3848,13 +3938,13 @@ let sha512 = "HSMlAr6INTV82wkpPNG0zsHoJXo/04GwG7bnhFX8s4zyIbbzuJAovsdo27FAT6/NKx5IVTXGI+IFcK9Z7oN1Tw=="; }; }; - "elm-hot-webpack-loader-1.1.6" = { + "elm-hot-webpack-loader-1.1.7" = { name = "elm-hot-webpack-loader"; packageName = "elm-hot-webpack-loader"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/elm-hot-webpack-loader/-/elm-hot-webpack-loader-1.1.6.tgz"; - sha512 = "fY+36uG8/h/PvlO2HZSXBa6qGNkVCwn+QjoL/5WWHOocf7EfYAYFgJlWQqsgNQi/eYO4/dt/OglRuSsFfkFvtA=="; + url = "https://registry.npmjs.org/elm-hot-webpack-loader/-/elm-hot-webpack-loader-1.1.7.tgz"; + sha512 = "FcRN8UlTl52EigvGjTaG9rnfdUJYh88eWRrruUmZLNVb/71maM92l3HNDAcyztOj4pEYGhoo9DEHEquZm6B08A=="; }; }; "elm-test-0.19.1" = { @@ -3866,13 +3956,13 @@ let sha512 = "SyZgZ/hxq62budS3k0M1Qj1E8fIRvldSxFSm4XfzE6qRRuHAT2a82fxprZRZl1yG2GwnImGmhuKH5hSyjPpzjA=="; }; }; - "elm-test-0.19.1-revision2" = { + "elm-test-0.19.1-revision4" = { name = "elm-test"; packageName = "elm-test"; - version = "0.19.1-revision2"; + version = "0.19.1-revision4"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision2.tgz"; - sha512 = "zVs2mVeyIE+K9y7/8b333h5xRMDWAoqbBDm7ThLDhyTi7ICxeL3t5uOS4KZCrRk9+4sP6+voSbcBlgr46Q+GiQ=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision4.tgz"; + sha512 = "DUzKPNzJb/2ZsPbtHttT5JIKGY1KtT7d9cexSNQI7DppvoEHxZ4nCd5EObv5kjskmC0JkQ5PHmCkIruQsbOdkQ=="; }; }; "elm-webpack-loader-6.0.1" = { @@ -4001,13 +4091,22 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "es-abstract-1.17.6" = { + "es-abstract-1.17.7" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.17.6"; + version = "1.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz"; - sha512 = "Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz"; + sha512 = "VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g=="; + }; + }; + "es-abstract-1.18.0-next.1" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.18.0-next.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz"; + sha512 = "I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA=="; }; }; "es-to-primitive-1.2.1" = { @@ -4028,13 +4127,13 @@ let sha512 = "HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg=="; }; }; - "escalade-3.0.2" = { + "escalade-3.1.0" = { name = "escalade"; packageName = "escalade"; - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz"; - sha512 = "gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ=="; + url = "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz"; + sha512 = "mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig=="; }; }; "escape-html-1.0.3" = { @@ -4091,13 +4190,13 @@ let sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; - "esrecurse-4.2.1" = { + "esrecurse-4.3.0" = { name = "esrecurse"; packageName = "esrecurse"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz"; - sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ=="; + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"; + sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; }; }; "estraverse-4.3.0" = { @@ -4109,6 +4208,15 @@ let sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; }; + "estraverse-5.2.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz"; + sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="; + }; + }; "esutils-2.0.3" = { name = "esutils"; packageName = "esutils"; @@ -4406,13 +4514,13 @@ let sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; }; }; - "file-loader-1.1.11" = { + "file-loader-6.1.0" = { name = "file-loader"; packageName = "file-loader"; - version = "1.1.11"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz"; - sha512 = "TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg=="; + url = "https://registry.npmjs.org/file-loader/-/file-loader-6.1.0.tgz"; + sha512 = "26qPdHyTsArQ6gU4P1HJbAbnFTyT2r0pG7czh1GFAd9TZbj0n94wWbupgixZH/ET/meqi2/5+F7DhW4OAXD+Lg=="; }; }; "file-uri-to-path-1.0.0" = { @@ -5261,13 +5369,13 @@ let sha512 = "ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg=="; }; }; - "html-webpack-plugin-4.3.0" = { + "html-webpack-plugin-4.5.0" = { name = "html-webpack-plugin"; packageName = "html-webpack-plugin"; - version = "4.3.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.3.0.tgz"; - sha512 = "C0fzKN8yQoVLTelcJxZfJCE+aAvQiY2VUf3UuKrR4a9k5UMWYOtpDLsaXwATbcVCnI05hUS7L9ULQHWLZhyi3w=="; + url = "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.5.0.tgz"; + sha512 = "MouoXEYSjTzCrjIxWwg8gxL5fE2X2WZJLmBYXlaJhQUH5K/b5OrqmV7T4dB7iu0xkmJ6JlUuV6fFVtnqbPopZw=="; }; }; "htmlparser2-3.10.1" = { @@ -5486,15 +5594,6 @@ let sha512 = "4Urocwu9+XLDJw4Tc6ZCg7APVjjLInCFvO4TwGsAYV5zT6YYSor14dsZR0+0tHlDIN92cFUOq+i7fC00G5vTxA=="; }; }; - "import-cwd-2.1.0" = { - name = "import-cwd"; - packageName = "import-cwd"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz"; - sha1 = "aa6cf36e722761285cb371ec6519f53e2435b0a9"; - }; - }; "import-fresh-2.0.0" = { name = "import-fresh"; packageName = "import-fresh"; @@ -5504,13 +5603,13 @@ let sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; }; }; - "import-from-2.1.0" = { - name = "import-from"; - packageName = "import-from"; - version = "2.1.0"; + "import-fresh-3.2.1" = { + name = "import-fresh"; + packageName = "import-fresh"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz"; - sha1 = "335db7f2a7affd53aaa471d4b8021dee36b7f3b1"; + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz"; + sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="; }; }; "import-local-2.0.0" = { @@ -5747,13 +5846,13 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; - "is-callable-1.2.0" = { + "is-callable-1.2.2" = { name = "is-callable"; packageName = "is-callable"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz"; - sha512 = "pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz"; + sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="; }; }; "is-ci-2.0.0" = { @@ -5909,6 +6008,15 @@ let sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; }; }; + "is-negative-zero-2.0.0" = { + name = "is-negative-zero"; + packageName = "is-negative-zero"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz"; + sha1 = "9553b121b0fac28869da9ed459e20c7543788461"; + }; + }; "is-number-3.0.0" = { name = "is-number"; packageName = "is-number"; @@ -5981,6 +6089,15 @@ let sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg=="; }; }; + "is-plain-obj-1.1.0" = { + name = "is-plain-obj"; + packageName = "is-plain-obj"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; + sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; + }; + }; "is-plain-object-2.0.4" = { name = "is-plain-object"; packageName = "is-plain-object"; @@ -6179,13 +6296,13 @@ let sha512 = "DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig=="; }; }; - "jest-util-26.3.0" = { + "jest-util-26.5.0" = { name = "jest-util"; packageName = "jest-util"; - version = "26.3.0"; + version = "26.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-util/-/jest-util-26.3.0.tgz"; - sha512 = "4zpn6bwV0+AMFN0IYhH/wnzIQzRaYVrz1A8sYnRnj4UXDXbOVtWmlaZkO9mipFqZ13okIfN87aDoJWB7VH6hcw=="; + url = "https://registry.npmjs.org/jest-util/-/jest-util-26.5.0.tgz"; + sha512 = "CSQ0uzE7JdHDCQo3K8jlyWRIF2xNLdpu9nbjo8okGDanaNsF7WonhusFvjOg7QiWn1SThe7wFRh8Jx2ls1Gx4Q=="; }; }; "js-tokens-4.0.0" = { @@ -6260,6 +6377,15 @@ let sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; }; }; + "json-parse-even-better-errors-2.3.1" = { + name = "json-parse-even-better-errors"; + packageName = "json-parse-even-better-errors"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; + }; + }; "json-schema-0.2.3" = { name = "json-schema"; packageName = "json-schema"; @@ -6377,13 +6503,13 @@ let sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.0.1" = { + "keyv-4.0.3" = { name = "keyv"; packageName = "keyv"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.0.1.tgz"; - sha512 = "xz6Jv6oNkbhrFCvCP7HQa8AaII8y8LRpoSm661NOKLr4uHuBwhX4epXrPQgF3+xdJnN4Esm5X0xwY4bOlALOtw=="; + url = "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz"; + sha512 = "zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA=="; }; }; "killable-1.0.1" = { @@ -6440,6 +6566,15 @@ let sha1 = "42b76894701169cc910fd0d19ce677b5fb378af1"; }; }; + "klona-2.0.4" = { + name = "klona"; + packageName = "klona"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz"; + sha512 = "ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA=="; + }; + }; "last-call-webpack-plugin-3.0.0" = { name = "last-call-webpack-plugin"; packageName = "last-call-webpack-plugin"; @@ -6485,6 +6620,24 @@ let sha512 = "mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ=="; }; }; + "line-column-1.0.2" = { + name = "line-column"; + packageName = "line-column"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/line-column/-/line-column-1.0.2.tgz"; + sha1 = "d25af2936b6f4849172b312e4792d1d987bc34a2"; + }; + }; + "lines-and-columns-1.1.6" = { + name = "lines-and-columns"; + packageName = "lines-and-columns"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; + sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + }; + }; "load-json-file-1.1.0" = { name = "load-json-file"; packageName = "load-json-file"; @@ -6521,6 +6674,15 @@ let sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA=="; }; }; + "loader-utils-2.0.0" = { + name = "loader-utils"; + packageName = "loader-utils"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz"; + sha512 = "rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="; + }; + }; "locate-path-2.0.0" = { name = "locate-path"; packageName = "locate-path"; @@ -6935,13 +7097,13 @@ let sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; }; }; - "mini-css-extract-plugin-0.4.5" = { + "mini-css-extract-plugin-0.11.3" = { name = "mini-css-extract-plugin"; packageName = "mini-css-extract-plugin"; - version = "0.4.5"; + version = "0.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.5.tgz"; - sha512 = "dqBanNfktnp2hwL2YguV9Jh91PFX7gu7nRLs4TGsbAfAG6WOtlynFRYzwDwmmeSb5uIwHo9nx1ta0f7vAZVp2w=="; + url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.11.3.tgz"; + sha512 = "n9BA8LonkOkW1/zn+IbLPQmovsL0wMb9yx75fMJQZf2X1Zoec9yTZtyMePcyu19wPkmFbzZZA6fLTotpFhQsOA=="; }; }; "minimalistic-assert-1.0.1" = { @@ -7061,13 +7223,13 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; - "moment-2.27.0" = { + "moment-2.29.0" = { name = "moment"; packageName = "moment"; - version = "2.27.0"; + version = "2.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz"; - sha512 = "al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="; + url = "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz"; + sha512 = "z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA=="; }; }; "move-concurrently-1.0.1" = { @@ -7169,6 +7331,15 @@ let sha512 = "isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="; }; }; + "nanoid-3.1.12" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz"; + sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="; + }; + }; "nanomatch-1.2.13" = { name = "nanomatch"; packageName = "nanomatch"; @@ -7241,13 +7412,13 @@ let sha512 = "vapB+VkmKMY1NRy7jjpGjzwWbKmtiRfzbgVoV/eROz5Kx30QvY0Nd5Ua7iST+9utrn1aG8cVToXC6UWdEO5BKQ=="; }; }; - "node-forge-0.9.0" = { + "node-forge-0.10.0" = { name = "node-forge"; packageName = "node-forge"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz"; - sha512 = "7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ=="; + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz"; + sha512 = "PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="; }; }; "node-libs-browser-2.2.1" = { @@ -7259,13 +7430,13 @@ let sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q=="; }; }; - "node-releases-1.1.60" = { + "node-releases-1.1.61" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.60"; + version = "1.1.61"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz"; - sha512 = "gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz"; + sha512 = "DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g=="; }; }; "node-watch-0.5.5" = { @@ -7322,6 +7493,15 @@ let sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942"; }; }; + "normalize-url-1.9.1" = { + name = "normalize-url"; + packageName = "normalize-url"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz"; + sha1 = "2cc0d66b31ea23036458436e3620d85954c66c3c"; + }; + }; "normalize-url-3.3.0" = { name = "normalize-url"; packageName = "normalize-url"; @@ -7430,13 +7610,13 @@ let sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="; }; }; - "object-is-1.1.2" = { + "object-is-1.1.3" = { name = "object-is"; packageName = "object-is"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz"; - sha512 = "5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ=="; + url = "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz"; + sha512 = "teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg=="; }; }; "object-keys-1.1.1" = { @@ -7457,13 +7637,13 @@ let sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; }; }; - "object.assign-4.1.0" = { + "object.assign-4.1.1" = { name = "object.assign"; packageName = "object.assign"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; - sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz"; + sha512 = "VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA=="; }; }; "object.entries-1.1.2" = { @@ -7565,13 +7745,13 @@ let sha512 = "IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg=="; }; }; - "open-7.2.1" = { + "open-7.3.0" = { name = "open"; packageName = "open"; - version = "7.2.1"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-7.2.1.tgz"; - sha512 = "xbYCJib4spUdmcs0g/2mK1nKo/jO2T7INClWd/beL7PFkXRWgr8B23ssDHX/USPn2M2IjDR5UdpYs6I67SnTSA=="; + url = "https://registry.npmjs.org/open/-/open-7.3.0.tgz"; + sha512 = "mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw=="; }; }; "opn-5.4.0" = { @@ -7826,6 +8006,15 @@ let sha512 = "VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA=="; }; }; + "parent-module-1.0.1" = { + name = "parent-module"; + packageName = "parent-module"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; + }; + }; "parse-asn1-5.1.6" = { name = "parse-asn1"; packageName = "parse-asn1"; @@ -7853,6 +8042,15 @@ let sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; }; }; + "parse-json-5.1.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz"; + sha512 = "+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ=="; + }; + }; "parse-passwd-1.0.0" = { name = "parse-passwd"; packageName = "parse-passwd"; @@ -8168,31 +8366,31 @@ let sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; }; }; - "postcss-6.0.23" = { + "postcss-7.0.35" = { name = "postcss"; packageName = "postcss"; - version = "6.0.23"; + version = "7.0.35"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz"; - sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag=="; + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz"; + sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; }; }; - "postcss-7.0.32" = { + "postcss-8.1.1" = { name = "postcss"; packageName = "postcss"; - version = "7.0.32"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz"; - sha512 = "03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.1.1.tgz"; + sha512 = "9DGLSsjooH3kSNjTZUOt2eIj2ZTW0VI2PZ/3My+8TC7KIbH2OKwUlISfDsf63EP4aiRUt3XkEWMWvyJHvJelEg=="; }; }; - "postcss-calc-7.0.3" = { + "postcss-calc-7.0.5" = { name = "postcss-calc"; packageName = "postcss-calc"; - version = "7.0.3"; + version = "7.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.3.tgz"; - sha512 = "IB/EAEmZhIMEIhG7Ov4x+l47UaXOS1n2f4FBUk/aKllQhtSCxWhTzn0nJgkqN7fo/jcWySvWTSB6Syk9L+31bA=="; + url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz"; + sha512 = "1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg=="; }; }; "postcss-colormin-4.0.3" = { @@ -8258,22 +8456,13 @@ let sha512 = "9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ=="; }; }; - "postcss-load-config-2.1.0" = { - name = "postcss-load-config"; - packageName = "postcss-load-config"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz"; - sha512 = "4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q=="; - }; - }; - "postcss-loader-3.0.0" = { + "postcss-loader-4.0.3" = { name = "postcss-loader"; packageName = "postcss-loader"; - version = "3.0.0"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz"; - sha512 = "cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA=="; + url = "https://registry.npmjs.org/postcss-loader/-/postcss-loader-4.0.3.tgz"; + sha512 = "jHboC/AOnJLPu8/974hODCJ/rNAa2YhhJOclUeuRlAmFpKmEcBY6az8y1ejHyYc2LThzPl8qPRekh2Yz3CiRKA=="; }; }; "postcss-merge-longhand-4.0.11" = { @@ -8474,13 +8663,13 @@ let sha512 = "EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg=="; }; }; - "postcss-safe-parser-4.0.2" = { + "postcss-safe-parser-5.0.2" = { name = "postcss-safe-parser"; packageName = "postcss-safe-parser"; - version = "4.0.2"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz"; - sha512 = "Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g=="; + url = "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-5.0.2.tgz"; + sha512 = "jDUfCPJbKOABhwpUKcqCVbbXiloe/QXMcbJ6Iipf3sDIihEzTqRCeMBfRaOHxhBuTYqtASrI1KJWxzztZU4qUQ=="; }; }; "postcss-selector-parser-3.1.2" = { @@ -8492,13 +8681,13 @@ let sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; }; }; - "postcss-selector-parser-6.0.2" = { + "postcss-selector-parser-6.0.4" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; - version = "6.0.2"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz"; - sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg=="; + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz"; + sha512 = "gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw=="; }; }; "postcss-svgo-4.0.2" = { @@ -8537,6 +8726,15 @@ let sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="; }; }; + "prepend-http-1.0.4" = { + name = "prepend-http"; + packageName = "prepend-http"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"; + sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; + }; + }; "prepend-http-2.0.0" = { name = "prepend-http"; packageName = "prepend-http"; @@ -8546,13 +8744,13 @@ let sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; }; }; - "pretty-bytes-5.3.0" = { + "pretty-bytes-5.4.1" = { name = "pretty-bytes"; packageName = "pretty-bytes"; - version = "5.3.0"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz"; - sha512 = "hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg=="; + url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.4.1.tgz"; + sha512 = "s1Iam6Gwz3JI5Hweaz4GoCD1WUNUIyzePFy5+Js2hjwGVt2Z79wNN+ZKOZ2vB6C+Xs6njyB84Z1IthQg8d9LxA=="; }; }; "pretty-error-2.1.1" = { @@ -8771,6 +8969,15 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; + "query-string-4.3.4" = { + name = "query-string"; + packageName = "query-string"; + version = "4.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz"; + sha1 = "bbb693b9ca915c232515b228b1a02b609043dbeb"; + }; + }; "querystring-0.2.0" = { name = "querystring"; packageName = "querystring"; @@ -8960,15 +9167,6 @@ let sha512 = "ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q=="; }; }; - "readdirp-3.2.0" = { - name = "readdirp"; - packageName = "readdirp"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz"; - sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; - }; - }; "readdirp-3.4.0" = { name = "readdirp"; packageName = "readdirp"; @@ -9068,13 +9266,13 @@ let sha512 = "2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ=="; }; }; - "regexpu-core-4.7.0" = { + "regexpu-core-4.7.1" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "4.7.0"; + version = "4.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz"; - sha512 = "TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz"; + sha512 = "ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ=="; }; }; "registry-auth-token-4.2.0" = { @@ -9266,6 +9464,15 @@ let sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; }; }; + "resolve-from-4.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; + sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; + }; + }; "resolve-url-0.2.1" = { name = "resolve-url"; packageName = "resolve-url"; @@ -9410,13 +9617,13 @@ let sha1 = "e848396f057d223f24386924618e25694161ec47"; }; }; - "rxjs-6.6.2" = { + "rxjs-6.6.3" = { name = "rxjs"; packageName = "rxjs"; - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz"; - sha512 = "BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz"; + sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ=="; }; }; "safe-buffer-5.1.1" = { @@ -9500,13 +9707,13 @@ let sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g=="; }; }; - "schema-utils-2.7.0" = { + "schema-utils-2.7.1" = { name = "schema-utils"; packageName = "schema-utils"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz"; - sha512 = "0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A=="; + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz"; + sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; }; }; "select-hose-2.0.0" = { @@ -9518,13 +9725,13 @@ let sha1 = "625d8658f865af43ec962bfc376a37359a4994ca"; }; }; - "selfsigned-1.10.7" = { + "selfsigned-1.10.8" = { name = "selfsigned"; packageName = "selfsigned"; - version = "1.10.7"; + version = "1.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz"; - sha512 = "8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA=="; + url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz"; + sha512 = "2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w=="; }; }; "semver-5.7.1" = { @@ -9608,15 +9815,6 @@ let sha512 = "0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A=="; }; }; - "serialize-javascript-2.1.2" = { - name = "serialize-javascript"; - packageName = "serialize-javascript"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz"; - sha512 = "rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ=="; - }; - }; "serialize-javascript-4.0.0" = { name = "serialize-javascript"; packageName = "serialize-javascript"; @@ -9869,6 +10067,15 @@ let sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g=="; }; }; + "sort-keys-1.1.2" = { + name = "sort-keys"; + packageName = "sort-keys"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz"; + sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad"; + }; + }; "source-list-map-2.0.1" = { name = "source-list-map"; packageName = "source-list-map"; @@ -9959,13 +10166,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.5" = { + "spdx-license-ids-3.0.6" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; - sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"; + sha512 = "+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw=="; }; }; "spdy-4.0.2" = { @@ -10130,6 +10337,15 @@ let sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; }; }; + "strict-uri-encode-1.1.0" = { + name = "strict-uri-encode"; + packageName = "strict-uri-encode"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; + sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; + }; + }; "string-replace-loader-2.3.0" = { name = "string-replace-loader"; packageName = "string-replace-loader"; @@ -10301,13 +10517,13 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; - "style-loader-0.23.1" = { + "style-loader-1.3.0" = { name = "style-loader"; packageName = "style-loader"; - version = "0.23.1"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz"; - sha512 = "XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg=="; + url = "https://registry.npmjs.org/style-loader/-/style-loader-1.3.0.tgz"; + sha512 = "V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q=="; }; }; "stylehacks-4.0.3" = { @@ -10661,13 +10877,13 @@ let sha1 = "61dbc2d53b69ff6091a12a168fd7d433107e40f1"; }; }; - "ts-jest-26.3.0" = { + "ts-jest-26.4.1" = { name = "ts-jest"; packageName = "ts-jest"; - version = "26.3.0"; + version = "26.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/ts-jest/-/ts-jest-26.3.0.tgz"; - sha512 = "Jq2uKfx6bPd9+JDpZNMBJMdMQUC3sJ08acISj8NXlVgR2d5OqslEHOR2KHMgwymu8h50+lKIm0m0xj/ioYdW2Q=="; + url = "https://registry.npmjs.org/ts-jest/-/ts-jest-26.4.1.tgz"; + sha512 = "F4aFq01aS6mnAAa0DljNmKr/Kk9y4HVZ1m6/rtJ0ED56cuxINGq3Q9eVAh+z5vcYKe5qnTMvv90vE8vUMFxomg=="; }; }; "ts-union-2.2.1" = { @@ -10913,13 +11129,13 @@ let sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; }; }; - "unzip-stream-0.3.0" = { + "unzip-stream-0.3.1" = { name = "unzip-stream"; packageName = "unzip-stream"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/unzip-stream/-/unzip-stream-0.3.0.tgz"; - sha512 = "NG1h/MdGIX3HzyqMjyj1laBCmlPYhcO4xEy7gEqqzGiSLw7XqDQCnY4nYSn5XSaH8mQ6TFkaujrO8d/PIZN85A=="; + url = "https://registry.npmjs.org/unzip-stream/-/unzip-stream-0.3.1.tgz"; + sha512 = "RzaGXLNt+CW+T41h1zl6pGz3EaeVhYlK+rdAap+7DxW5kqsqePO8kRtWPaCiVqdhZc86EctSPVYNix30YOMzmw=="; }; }; "upath-1.2.0" = { @@ -10940,13 +11156,13 @@ let sha1 = "4a50875ec5c715d19379799f0590a0e796958f61"; }; }; - "uri-js-4.2.2" = { + "uri-js-4.4.0" = { name = "uri-js"; packageName = "uri-js"; - version = "4.2.2"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; - sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz"; + sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g=="; }; }; "urix-0.1.0" = { @@ -10967,13 +11183,13 @@ let sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; }; }; - "url-loader-1.1.2" = { + "url-loader-4.1.0" = { name = "url-loader"; packageName = "url-loader"; - version = "1.1.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/url-loader/-/url-loader-1.1.2.tgz"; - sha512 = "dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg=="; + url = "https://registry.npmjs.org/url-loader/-/url-loader-4.1.0.tgz"; + sha512 = "IzgAAIC8wRrg6NYkFIJY09vtktQcsvU8V6HhtQj9PTefbYImzLB1hufqo4m+RyM5N3mLx5BqJKccgxJS+W3kqw=="; }; }; "url-parse-1.4.7" = { @@ -11210,22 +11426,22 @@ let sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; }; }; - "web-tree-sitter-0.16.4" = { + "web-tree-sitter-0.17.1" = { name = "web-tree-sitter"; packageName = "web-tree-sitter"; - version = "0.16.4"; + version = "0.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.16.4.tgz"; - sha512 = "n1CfuJcJ+dynIx/fmavB6haPx37N3GZvY5HIGIselymDiSwNRC+8pAxOzoB4eVwUBJnbP3+aA8vWttrAZbgs7A=="; + url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.17.1.tgz"; + sha512 = "QgaeV+wmlB1Qaw9rS5a0ZDBt8GRcKkF+hGNSVxQ/HLm1lPCow3BKOhoILaXkYm7YozCcL7TjppRADBwFJugbuA=="; }; }; - "webpack-4.43.0" = { + "webpack-4.44.2" = { name = "webpack"; packageName = "webpack"; - version = "4.43.0"; + version = "4.44.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz"; - sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz"; + sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q=="; }; }; "webpack-dev-middleware-3.7.2" = { @@ -11300,13 +11516,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "whatwg-fetch-3.0.0" = { + "whatwg-fetch-3.4.1" = { name = "whatwg-fetch"; packageName = "whatwg-fetch"; - version = "3.0.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz"; - sha512 = "9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="; + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz"; + sha512 = "sofZVzE1wKwO+EYPbWfiwzaKovWiZXf4coEzjGP9b2GBVgQRLQUZ2QcuPpQExGDAW5GItpEm6Tl4OU5mywnAoQ=="; }; }; "which-1.3.1" = { @@ -11615,6 +11831,15 @@ let sha512 = "Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ=="; }; }; + "xmlbuilder-15.1.1" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "15.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz"; + sha512 = "yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="; + }; + }; "xtend-4.0.2" = { name = "xtend"; packageName = "xtend"; @@ -11660,6 +11885,15 @@ let sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; }; }; + "yaml-1.10.0" = { + name = "yaml"; + packageName = "yaml"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz"; + sha512 = "yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg=="; + }; + }; "yargs-13.3.2" = { name = "yargs"; packageName = "yargs"; @@ -11705,6 +11939,15 @@ let sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; }; }; + "yargs-parser-20.2.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "20.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.1.tgz"; + sha512 = "yYsjuSkjbLMBp16eaOt7/siKTjNVjMm3SoJnIg3sEh/JsvqVVDyjRKmaJV4cl+lNIgq6QEco2i3gDebJl7/vLA=="; + }; + }; "yargs-parser-4.2.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -11736,7 +11979,7 @@ in }; dependencies = [ sources."accepts-1.3.7" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."array-flatten-1.1.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -11890,7 +12133,7 @@ in sources."typedarray-0.0.6" sources."ultron-1.0.2" sources."unpipe-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -11921,9 +12164,8 @@ in sha512 = "WHlO9LCu6DLzlIPR28GqcCgtyy6ZjRKBR+c6yYwy7m2o0D0buuLsr3wsZxJBjZYmwregmWRseUOM3DzHmoiIzg=="; }; dependencies = [ - sources."@types/color-name-1.1.1" sources."abbrev-1.1.1" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" @@ -12048,7 +12290,7 @@ in sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mkdirp-0.5.5" - sources."moment-2.27.0" + sources."moment-2.29.0" sources."murmur-hash-js-1.0.0" sources."mustache-3.2.1" sources."nice-try-1.0.5" @@ -12114,9 +12356,9 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."universalify-0.1.2" - sources."unzip-stream-0.3.0" + sources."unzip-stream-0.3.1" sources."upgrade-1.1.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."uuid-3.4.0" sources."verror-1.10.0" sources."which-1.3.1" @@ -12124,7 +12366,7 @@ in (sources."wrap-ansi-6.2.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."emoji-regex-8.0.0" @@ -12169,9 +12411,8 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/color-name-1.1.1" sources."accepts-1.3.7" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" sources."array-flatten-1.1.1" sources."async-limiter-1.0.1" @@ -12262,7 +12503,7 @@ in sources."normalize-url-4.5.0" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."open-7.2.1" + sources."open-7.3.0" sources."p-cancelable-1.1.0" sources."package-json-6.5.0" sources."parseurl-1.3.3" @@ -12329,17 +12570,17 @@ in "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage { name = "_at_elm-tooling_slash_elm-language-server"; packageName = "@elm-tooling/elm-language-server"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.11.0.tgz"; - sha512 = "GYphbimDGTl9icqLf6ObivJIHnIn/5B7Vc4FsAJD7CwwfjRU0LQZ3uSLNOYMVol8NgxbULXBvJOgojMu3QHJ5Q=="; + url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.12.0.tgz"; + sha512 = "x2Yj/lTUyohViOpRzAh/BzWCsInNCYMDERLVGehX7c5g4DhFLwlT6CSqmQ5LU2twIZW7KEKgCvoQTQ1eZ/ZtTQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" sources."accepts-1.3.7" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."array-flatten-1.1.1" sources."array-union-2.1.0" sources."asn1-0.2.4" @@ -12513,7 +12754,7 @@ in sources."typedarray-0.0.6" sources."ultron-1.0.2" sources."unpipe-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -12525,7 +12766,7 @@ in sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.15.1" sources."vscode-uri-2.1.2" - sources."web-tree-sitter-0.16.4" + sources."web-tree-sitter-0.17.1" sources."which-2.0.2" sources."wrappy-1.0.2" (sources."ws-3.3.1" // { @@ -12665,15 +12906,14 @@ in elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; - version = "0.19.1-revision2"; + version = "0.19.1-revision4"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision2.tgz"; - sha512 = "zVs2mVeyIE+K9y7/8b333h5xRMDWAoqbBDm7ThLDhyTi7ICxeL3t5uOS4KZCrRk9+4sP6+voSbcBlgr46Q+GiQ=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision4.tgz"; + sha512 = "DUzKPNzJb/2ZsPbtHttT5JIKGY1KtT7d9cexSNQI7DppvoEHxZ4nCd5EObv5kjskmC0JkQ5PHmCkIruQsbOdkQ=="; }; dependencies = [ - sources."@types/color-name-1.1.1" - sources."ajv-6.12.4" - sources."ansi-styles-4.2.1" + sources."ajv-6.12.5" + sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -12692,14 +12932,14 @@ in sources."caseless-0.12.0" sources."chainsaw-0.1.0" sources."chalk-3.0.0" - sources."chokidar-3.3.0" + sources."chokidar-3.4.2" sources."chownr-1.1.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" - sources."cross-spawn-7.0.1" + sources."cross-spawn-7.0.3" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" @@ -12709,13 +12949,6 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fill-range-7.0.1" - (sources."find-elm-dependencies-2.0.2" // { - dependencies = [ - sources."firstline-1.2.0" - ]; - }) - sources."find-parent-dir-0.3.0" - sources."firstline-2.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs-extra-8.1.0" @@ -12745,7 +12978,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" - sources."lodash-4.17.15" + sources."lodash-4.17.20" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."minimatch-3.0.4" @@ -12755,16 +12988,6 @@ in sources."mkdirp-0.5.5" sources."murmur-hash-js-1.0.0" sources."mustache-3.2.1" - sources."nice-try-1.0.5" - (sources."node-elm-compiler-5.0.4" // { - dependencies = [ - sources."cross-spawn-6.0.5" - sources."path-key-2.0.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" - ]; - }) sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" sources."once-1.4.0" @@ -12775,24 +12998,19 @@ in sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."readdirp-3.2.0" + sources."readdirp-3.4.0" sources."request-2.88.2" sources."request-promise-4.2.6" - (sources."request-promise-core-1.1.4" // { - dependencies = [ - sources."lodash-4.17.20" - ]; - }) + sources."request-promise-core-1.1.4" sources."rimraf-2.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-5.7.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."split-1.0.1" sources."sshpk-1.16.1" sources."stealthy-require-1.1.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."tar-4.4.13" sources."temp-0.9.1" sources."through-2.3.8" @@ -12802,13 +13020,13 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."universalify-0.1.2" - sources."unzip-stream-0.3.0" - sources."uri-js-4.2.2" + sources."unzip-stream-0.3.1" + sources."uri-js-4.4.0" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."which-2.0.1" + sources."which-2.0.2" sources."wrappy-1.0.2" - sources."xmlbuilder-13.0.2" + sources."xmlbuilder-15.1.1" sources."yallist-3.1.1" ]; buildInputs = globalBuildInputs; @@ -12835,7 +13053,7 @@ in sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.6.2" + sources."@types/node-14.11.3" sources."@types/responselike-1.0.0" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.1" @@ -12864,7 +13082,7 @@ in sources."isurl-1.0.0" sources."json-buffer-3.0.1" sources."jsonfile-4.0.0" - sources."keyv-4.0.1" + sources."keyv-4.0.3" sources."lowercase-keys-2.0.0" sources."mimic-response-2.1.0" sources."normalize-url-4.5.0" @@ -12909,7 +13127,7 @@ in sha512 = "dAOv+U9hXZ0IRGx19mkpCAdf5rUwoJWlzFmcR2gvOzE/QjZUSlPh3e0IIDAfGUuEF8DjfE5CTe31fNtIkkd2rQ=="; }; dependencies = [ - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" @@ -13071,8 +13289,8 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."universalify-0.1.2" - sources."unzip-stream-0.3.0" - sources."uri-js-4.2.2" + sources."unzip-stream-0.3.1" + sources."uri-js-4.4.0" sources."uuid-3.4.0" sources."verror-1.10.0" sources."which-2.0.1" @@ -13142,25 +13360,26 @@ in create-elm-app = nodeEnv.buildNodePackage { name = "create-elm-app"; packageName = "create-elm-app"; - version = "4.2.26"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-elm-app/-/create-elm-app-4.2.26.tgz"; - sha512 = "m8+dA/ea43gXODN7nnd8zSXSNTtnhSFLK5O9xNSxRWasaLPI6fqO3TsG0MADSV1sB66rmHRFsn5au12ir058DQ=="; + url = "https://registry.npmjs.org/create-elm-app/-/create-elm-app-5.2.1.tgz"; + sha512 = "gIobIWzQtCcKQH4dcCFzOJebm00j5Yha3s3XiwH0hp5auogbjS9TTLJKFUChF8j6vMlxIHxpCpxTmtPlrcZyvQ=="; }; dependencies = [ - sources."@babel/cli-7.8.4" + sources."@babel/cli-7.11.6" sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.11.0" - (sources."@babel/core-7.9.6" // { + (sources."@babel/core-7.11.6" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) - sources."@babel/generator-7.11.4" + sources."@babel/generator-7.11.6" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-compilation-targets-7.10.4" + sources."@babel/helper-create-class-features-plugin-7.10.5" sources."@babel/helper-create-regexp-features-plugin-7.10.4" sources."@babel/helper-define-map-7.10.5" sources."@babel/helper-explode-assignable-expression-7.11.4" @@ -13182,19 +13401,26 @@ in sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."@babel/plugin-proposal-async-generator-functions-7.10.5" + sources."@babel/plugin-proposal-class-properties-7.10.4" sources."@babel/plugin-proposal-dynamic-import-7.10.4" + sources."@babel/plugin-proposal-export-namespace-from-7.10.4" sources."@babel/plugin-proposal-json-strings-7.10.4" + sources."@babel/plugin-proposal-logical-assignment-operators-7.11.0" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" sources."@babel/plugin-proposal-numeric-separator-7.10.4" sources."@babel/plugin-proposal-object-rest-spread-7.11.0" sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" sources."@babel/plugin-proposal-optional-chaining-7.11.0" + sources."@babel/plugin-proposal-private-methods-7.10.4" sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" sources."@babel/plugin-syntax-async-generators-7.8.4" + sources."@babel/plugin-syntax-class-properties-7.10.4" sources."@babel/plugin-syntax-dynamic-import-7.8.3" + sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" + sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -13226,24 +13452,25 @@ in sources."@babel/plugin-transform-property-literals-7.10.4" sources."@babel/plugin-transform-regenerator-7.10.4" sources."@babel/plugin-transform-reserved-words-7.10.4" - sources."@babel/plugin-transform-runtime-7.9.6" + sources."@babel/plugin-transform-runtime-7.11.5" sources."@babel/plugin-transform-shorthand-properties-7.10.4" sources."@babel/plugin-transform-spread-7.11.0" sources."@babel/plugin-transform-sticky-regex-7.10.4" sources."@babel/plugin-transform-template-literals-7.10.5" sources."@babel/plugin-transform-typeof-symbol-7.10.4" + sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.9.6" + sources."@babel/preset-env-7.11.5" sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.9.6" + sources."@babel/runtime-7.11.2" sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.11.0" // { + (sources."@babel/traverse-7.11.5" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.11.0" + sources."@babel/types-7.11.5" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -13252,27 +13479,27 @@ in sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/anymatch-1.3.1" - sources."@types/color-name-1.1.1" sources."@types/glob-7.1.3" - sources."@types/html-minifier-terser-5.1.0" + sources."@types/html-minifier-terser-5.1.1" sources."@types/http-proxy-1.17.4" - sources."@types/json-schema-7.0.5" + sources."@types/json-schema-7.0.6" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.2" + sources."@types/node-14.11.3" + sources."@types/parse-json-4.0.0" sources."@types/q-1.5.4" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" - (sources."@types/uglify-js-3.9.3" // { + (sources."@types/uglify-js-3.11.0" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.21" // { + (sources."@types/webpack-4.41.22" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-sources-1.4.2" // { + (sources."@types/webpack-sources-2.0.0" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -13298,9 +13525,9 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."accepts-1.3.7" - sources."acorn-6.4.1" + sources."acorn-6.4.2" sources."address-1.0.3" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."alphanum-sort-1.0.2" @@ -13351,11 +13578,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."autoprefixer-8.6.5" // { - dependencies = [ - sources."browserslist-3.2.8" - ]; - }) + sources."autoprefixer-10.0.1" sources."aws-sign2-0.7.0" sources."aws4-1.10.1" sources."babel-extract-comments-1.0.0" @@ -13420,7 +13643,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.14.0" + sources."browserslist-4.14.5" sources."buffer-4.9.2" sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" @@ -13437,7 +13660,7 @@ in sources."camel-case-4.1.1" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001119" + sources."caniuse-lite-1.0.30001143" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" sources."chainsaw-0.1.0" @@ -13488,6 +13711,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.5.3" + sources."colorette-1.2.1" sources."colors-1.0.3" sources."combined-stream-1.0.8" sources."commander-4.1.1" @@ -13508,7 +13732,7 @@ in sources."cookie-signature-1.0.6" sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" - (sources."copy-webpack-plugin-5.1.1" // { + (sources."copy-webpack-plugin-5.1.2" // { dependencies = [ sources."schema-utils-1.0.0" ]; @@ -13531,20 +13755,12 @@ in sources."cross-spawn-7.0.3" sources."crypto-browserify-3.12.0" sources."css-color-names-0.0.4" - (sources."css-declaration-sorter-4.0.1" // { + sources."css-declaration-sorter-4.0.1" + (sources."css-loader-4.3.0" // { dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."css-loader-3.6.0" // { - dependencies = [ - sources."postcss-7.0.32" - sources."postcss-value-parser-4.1.0" - sources."semver-6.3.0" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" + sources."camelcase-6.0.0" + sources."loader-utils-2.0.0" + sources."semver-7.3.2" ]; }) sources."css-select-1.2.0" @@ -13556,29 +13772,11 @@ in }) sources."css-what-2.1.3" sources."cssesc-3.0.0" - (sources."cssnano-4.1.10" // { - dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."cssnano-preset-default-4.0.7" // { - dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" - ]; - }) + sources."cssnano-4.1.10" + sources."cssnano-preset-default-4.0.7" sources."cssnano-util-get-arguments-4.0.0" sources."cssnano-util-get-match-4.0.0" - (sources."cssnano-util-raw-cache-4.0.1" // { - dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" - ]; - }) + sources."cssnano-util-raw-cache-4.0.1" sources."cssnano-util-same-parent-4.0.1" (sources."csso-4.0.3" // { dependencies = [ @@ -13624,7 +13822,7 @@ in sources."dom-converter-0.2.0" (sources."dom-serializer-0.2.2" // { dependencies = [ - sources."domelementtype-2.0.1" + sources."domelementtype-2.0.2" ]; }) sources."domain-browser-1.2.0" @@ -13632,13 +13830,13 @@ in sources."domhandler-2.4.2" sources."domutils-1.5.1" sources."dot-case-3.0.3" - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."dotenv-8.2.0" sources."duplexer-0.1.2" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.555" + sources."electron-to-chromium-1.3.576" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -13647,18 +13845,17 @@ in sources."elm-0.19.1-3" sources."elm-asset-webpack-loader-1.1.2" sources."elm-hot-1.1.5" - sources."elm-hot-webpack-loader-1.1.6" - (sources."elm-test-0.19.1-revision2" // { + sources."elm-hot-webpack-loader-1.1.7" + (sources."elm-test-0.19.1-revision4" // { dependencies = [ - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" sources."binary-extensions-2.1.0" sources."braces-3.0.2" sources."chalk-3.0.0" - sources."chokidar-3.3.0" + sources."chokidar-3.4.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."cross-spawn-7.0.1" sources."fill-range-7.0.1" sources."fs-extra-8.1.0" sources."fsevents-2.1.3" @@ -13666,11 +13863,9 @@ in sources."has-flag-4.0.0" sources."is-binary-path-2.1.0" sources."is-number-7.0.0" - sources."lodash-4.17.15" - sources."readdirp-3.2.0" - sources."supports-color-7.1.0" + sources."readdirp-3.4.0" + sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" - sources."which-2.0.1" ]; }) sources."elm-webpack-loader-6.0.1" @@ -13687,14 +13882,18 @@ in sources."entities-2.0.3" sources."errno-0.1.7" sources."error-ex-1.3.2" - sources."es-abstract-1.17.6" + sources."es-abstract-1.18.0-next.1" sources."es-to-primitive-1.2.1" - sources."escalade-3.0.2" + sources."escalade-3.1.0" sources."escape-html-1.0.3" sources."escape-string-regexp-2.0.0" sources."eslint-scope-4.0.3" sources."esprima-4.0.1" - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."etag-1.8.1" @@ -13759,9 +13958,9 @@ in sources."escape-string-regexp-1.0.5" ]; }) - (sources."file-loader-1.1.11" // { + (sources."file-loader-6.1.0" // { dependencies = [ - sources."schema-utils-0.4.7" + sources."loader-utils-2.0.0" ]; }) sources."file-uri-to-path-1.0.0" @@ -13774,15 +13973,9 @@ in }) sources."finalhandler-1.1.2" sources."find-cache-dir-2.1.0" - (sources."find-elm-dependencies-2.0.2" // { - dependencies = [ - sources."firstline-1.2.0" - sources."lodash-4.17.15" - ]; - }) - sources."find-parent-dir-0.3.0" + sources."find-elm-dependencies-2.0.4" sources."find-up-3.0.0" - sources."firstline-2.0.2" + sources."firstline-1.3.1" sources."flush-write-stream-1.1.1" sources."follow-redirects-1.13.0" sources."for-in-1.0.2" @@ -13861,7 +14054,7 @@ in sources."html-comment-regex-1.1.2" sources."html-entities-1.3.1" sources."html-minifier-terser-5.1.1" - sources."html-webpack-plugin-4.3.0" + sources."html-webpack-plugin-4.5.0" (sources."htmlparser2-3.10.1" // { dependencies = [ sources."entities-1.1.2" @@ -13889,20 +14082,12 @@ in sources."https-browserify-1.0.0" sources."i-0.3.6" sources."iconv-lite-0.4.24" - (sources."icss-utils-4.1.1" // { - dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" - ]; - }) + sources."icss-utils-4.1.1" sources."ieee754-1.1.13" sources."iferr-0.1.5" sources."ignore-3.3.10" sources."immer-1.7.2" - sources."import-cwd-2.1.0" sources."import-fresh-2.0.0" - sources."import-from-2.1.0" sources."import-local-2.0.0" sources."imurmurhash-0.1.4" sources."indexes-of-1.0.1" @@ -13931,7 +14116,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.0" + sources."is-callable-1.2.2" sources."is-color-stop-1.1.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" @@ -13941,6 +14126,7 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" + sources."is-negative-zero-2.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -13950,6 +14136,7 @@ in sources."is-path-cwd-2.2.0" sources."is-path-in-cwd-2.1.0" sources."is-path-inside-2.1.0" + sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" sources."is-regex-1.1.1" sources."is-regexp-1.0.0" @@ -13971,6 +14158,7 @@ in sources."jsbn-0.1.1" sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-1.0.1" @@ -13982,10 +14170,17 @@ in sources."jsprim-1.4.1" sources."killable-1.0.1" sources."kind-of-6.0.3" + sources."klona-2.0.4" sources."last-call-webpack-plugin-3.0.0" sources."lcid-1.0.0" sources."leven-3.1.0" sources."levenary-1.1.1" + (sources."line-column-1.0.2" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."lines-and-columns-1.1.6" (sources."load-json-file-1.1.0" // { dependencies = [ sources."parse-json-2.2.0" @@ -14025,11 +14220,11 @@ in sources."bn.js-4.11.9" ]; }) - sources."mime-2.4.6" + sources."mime-1.6.0" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" - (sources."mini-css-extract-plugin-0.4.5" // { + (sources."mini-css-extract-plugin-0.11.3" // { dependencies = [ sources."schema-utils-1.0.0" ]; @@ -14051,33 +14246,33 @@ in sources."mustache-3.2.1" sources."mute-stream-0.0.8" sources."nan-2.14.1" + sources."nanoid-3.1.12" sources."nanomatch-1.2.13" sources."ncp-1.0.1" sources."negotiator-0.6.2" sources."neo-async-2.6.2" sources."nice-try-1.0.5" sources."no-case-3.0.3" - (sources."node-elm-compiler-5.0.4" // { + (sources."node-elm-compiler-5.0.5" // { dependencies = [ sources."cross-spawn-6.0.5" - sources."lodash-4.17.15" sources."path-key-2.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."which-1.3.1" ]; }) - sources."node-forge-0.9.0" + sources."node-forge-0.10.0" (sources."node-libs-browser-2.2.1" // { dependencies = [ sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.60" + sources."node-releases-1.1.61" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" - sources."normalize-url-3.3.0" + sources."normalize-url-1.9.1" (sources."npm-run-path-2.0.2" // { dependencies = [ sources."path-key-2.0.1" @@ -14102,14 +14297,26 @@ in ]; }) sources."object-inspect-1.8.0" - sources."object-is-1.1.2" + sources."object-is-1.1.3" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.0" - sources."object.entries-1.1.2" - sources."object.getownpropertydescriptors-2.1.0" + sources."object.assign-4.1.1" + (sources."object.entries-1.1.2" // { + dependencies = [ + sources."es-abstract-1.17.7" + ]; + }) + (sources."object.getownpropertydescriptors-2.1.0" // { + dependencies = [ + sources."es-abstract-1.17.7" + ]; + }) sources."object.pick-1.3.0" - sources."object.values-1.1.1" + (sources."object.values-1.1.1" // { + dependencies = [ + sources."es-abstract-1.17.7" + ]; + }) sources."obuf-1.1.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" @@ -14130,6 +14337,11 @@ in sources."pako-1.0.11" sources."parallel-transform-1.2.0" sources."param-case-3.0.3" + (sources."parent-module-1.0.1" // { + dependencies = [ + sources."callsites-3.1.0" + ]; + }) sources."parse-asn1-5.1.6" sources."parse-json-4.0.0" sources."parse-passwd-1.0.0" @@ -14175,258 +14387,142 @@ in ]; }) sources."posix-character-classes-0.1.1" - (sources."postcss-6.0.23" // { + (sources."postcss-7.0.35" // { dependencies = [ sources."source-map-0.6.1" - ]; - }) - (sources."postcss-calc-7.0.3" // { - dependencies = [ - sources."postcss-7.0.32" - sources."postcss-value-parser-4.1.0" - sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) + sources."postcss-calc-7.0.5" (sources."postcss-colormin-4.0.3" // { dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" + sources."postcss-value-parser-3.3.1" ]; }) (sources."postcss-convert-values-4.0.1" // { dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" + sources."postcss-value-parser-3.3.1" ]; }) - (sources."postcss-discard-comments-4.0.2" // { + sources."postcss-discard-comments-4.0.2" + sources."postcss-discard-duplicates-4.0.2" + sources."postcss-discard-empty-4.0.1" + sources."postcss-discard-overridden-4.0.1" + sources."postcss-flexbugs-fixes-4.2.1" + (sources."postcss-loader-4.0.3" // { dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-discard-duplicates-4.0.2" // { - dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-discard-empty-4.0.1" // { - dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-discard-overridden-4.0.1" // { - dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-flexbugs-fixes-4.2.1" // { - dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" - ]; - }) - sources."postcss-load-config-2.1.0" - (sources."postcss-loader-3.0.0" // { - dependencies = [ - sources."postcss-7.0.32" - sources."schema-utils-1.0.0" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" + sources."cosmiconfig-7.0.0" + sources."import-fresh-3.2.1" + sources."loader-utils-2.0.0" + sources."parse-json-5.1.0" + sources."path-type-4.0.0" + sources."resolve-from-4.0.0" + sources."semver-7.3.2" ]; }) (sources."postcss-merge-longhand-4.0.11" // { dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" + sources."postcss-value-parser-3.3.1" ]; }) (sources."postcss-merge-rules-4.0.3" // { dependencies = [ - sources."postcss-7.0.32" sources."postcss-selector-parser-3.1.2" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" ]; }) (sources."postcss-minify-font-values-4.0.2" // { dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" + sources."postcss-value-parser-3.3.1" ]; }) (sources."postcss-minify-gradients-4.0.2" // { dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" + sources."postcss-value-parser-3.3.1" ]; }) (sources."postcss-minify-params-4.0.2" // { dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" + sources."postcss-value-parser-3.3.1" ]; }) (sources."postcss-minify-selectors-4.0.2" // { dependencies = [ - sources."postcss-7.0.32" sources."postcss-selector-parser-3.1.2" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-modules-extract-imports-2.0.0" // { - dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-modules-local-by-default-3.0.3" // { - dependencies = [ - sources."postcss-7.0.32" - sources."postcss-value-parser-4.1.0" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-modules-scope-2.2.0" // { - dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-modules-values-3.0.0" // { - dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-normalize-charset-4.0.1" // { - dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" ]; }) + sources."postcss-modules-extract-imports-2.0.0" + sources."postcss-modules-local-by-default-3.0.3" + sources."postcss-modules-scope-2.2.0" + sources."postcss-modules-values-3.0.0" + sources."postcss-normalize-charset-4.0.1" (sources."postcss-normalize-display-values-4.0.2" // { dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" + sources."postcss-value-parser-3.3.1" ]; }) (sources."postcss-normalize-positions-4.0.2" // { dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" + sources."postcss-value-parser-3.3.1" ]; }) (sources."postcss-normalize-repeat-style-4.0.2" // { dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" + sources."postcss-value-parser-3.3.1" ]; }) (sources."postcss-normalize-string-4.0.2" // { dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" + sources."postcss-value-parser-3.3.1" ]; }) (sources."postcss-normalize-timing-functions-4.0.2" // { dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" + sources."postcss-value-parser-3.3.1" ]; }) (sources."postcss-normalize-unicode-4.0.1" // { dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" + sources."postcss-value-parser-3.3.1" ]; }) (sources."postcss-normalize-url-4.0.1" // { dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" + sources."normalize-url-3.3.0" + sources."postcss-value-parser-3.3.1" ]; }) (sources."postcss-normalize-whitespace-4.0.2" // { dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" + sources."postcss-value-parser-3.3.1" ]; }) (sources."postcss-ordered-values-4.1.2" // { dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-reduce-initial-4.0.3" // { - dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" + sources."postcss-value-parser-3.3.1" ]; }) + sources."postcss-reduce-initial-4.0.3" (sources."postcss-reduce-transforms-4.0.2" // { dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" + sources."postcss-value-parser-3.3.1" ]; }) - (sources."postcss-safe-parser-4.0.2" // { + (sources."postcss-safe-parser-5.0.2" // { dependencies = [ - sources."postcss-7.0.32" + sources."postcss-8.1.1" sources."source-map-0.6.1" - sources."supports-color-6.1.0" ]; }) - sources."postcss-selector-parser-6.0.2" + sources."postcss-selector-parser-6.0.4" (sources."postcss-svgo-4.0.2" // { dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" + sources."postcss-value-parser-3.3.1" ]; }) - (sources."postcss-unique-selectors-4.0.1" // { - dependencies = [ - sources."postcss-7.0.32" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" - ]; - }) - sources."postcss-value-parser-3.3.1" - sources."pretty-bytes-5.3.0" + sources."postcss-unique-selectors-4.0.1" + sources."postcss-value-parser-4.1.0" + sources."prepend-http-1.0.4" + sources."pretty-bytes-5.4.1" sources."pretty-error-2.1.1" sources."process-0.11.10" sources."process-nextick-args-2.0.1" @@ -14455,6 +14551,7 @@ in sources."punycode-2.1.1" sources."q-1.5.1" sources."qs-6.5.2" + sources."query-string-4.3.4" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."querystringify-2.2.0" @@ -14512,8 +14609,12 @@ in sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.3.0" - sources."regexpu-core-4.7.0" + (sources."regexp.prototype.flags-1.3.0" // { + dependencies = [ + sources."es-abstract-1.17.7" + ]; + }) + sources."regexpu-core-4.7.1" sources."regjsgen-0.5.2" (sources."regjsparser-0.6.4" // { dependencies = [ @@ -14550,22 +14651,21 @@ in sources."ripemd160-2.0.2" sources."run-async-2.4.1" sources."run-queue-1.0.3" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."schema-utils-2.7.0" + sources."schema-utils-2.7.1" sources."select-hose-2.0.0" - sources."selfsigned-1.10.7" + sources."selfsigned-1.10.8" sources."semver-5.7.1" (sources."send-0.17.1" // { dependencies = [ - sources."mime-1.6.0" sources."ms-2.1.1" ]; }) - sources."serialize-javascript-2.1.2" + sources."serialize-javascript-4.0.0" (sources."serve-index-1.9.1" // { dependencies = [ sources."http-errors-1.6.3" @@ -14636,6 +14736,7 @@ in sources."ms-2.1.2" ]; }) + sources."sort-keys-1.1.2" sources."source-list-map-2.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" @@ -14648,16 +14749,16 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" (sources."spdy-4.0.2" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) (sources."spdy-transport-3.0.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" sources."readable-stream-3.6.0" ]; @@ -14692,14 +14793,23 @@ in sources."stream-each-1.2.3" sources."stream-http-2.8.3" sources."stream-shift-1.0.1" + sources."strict-uri-encode-1.1.0" sources."string-replace-loader-2.3.0" (sources."string-width-1.0.2" // { dependencies = [ sources."strip-ansi-3.0.1" ]; }) - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" + (sources."string.prototype.trimend-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.7" + ]; + }) + (sources."string.prototype.trimstart-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.7" + ]; + }) sources."string_decoder-1.1.1" (sources."stringify-object-3.3.0" // { dependencies = [ @@ -14714,24 +14824,21 @@ in sources."strip-bom-2.0.0" sources."strip-comments-1.0.2" sources."strip-eof-1.0.0" - (sources."style-loader-0.23.1" // { + (sources."style-loader-1.3.0" // { dependencies = [ - sources."schema-utils-1.0.0" + sources."loader-utils-2.0.0" ]; }) (sources."stylehacks-4.0.3" // { dependencies = [ - sources."postcss-7.0.32" sources."postcss-selector-parser-3.1.2" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" ]; }) sources."supports-color-5.5.0" (sources."svgo-1.3.2" // { dependencies = [ sources."css-select-2.1.0" - sources."css-what-3.3.0" + sources."css-what-3.4.1" sources."domutils-1.7.0" ]; }) @@ -14751,7 +14858,6 @@ in (sources."terser-webpack-plugin-1.4.5" // { dependencies = [ sources."schema-utils-1.0.0" - sources."serialize-javascript-4.0.0" sources."source-map-0.6.1" ]; }) @@ -14834,18 +14940,18 @@ in sources."has-values-0.1.4" ]; }) - sources."unzip-stream-0.3.0" + sources."unzip-stream-0.3.1" sources."upath-1.2.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" ]; }) - (sources."url-loader-1.1.2" // { + (sources."url-loader-4.1.0" // { dependencies = [ - sources."schema-utils-1.0.0" + sources."loader-utils-2.0.0" ]; }) sources."url-parse-1.4.7" @@ -14883,12 +14989,16 @@ in }) sources."watchpack-chokidar2-2.0.0" sources."wbuf-1.7.3" - (sources."webpack-4.43.0" // { + (sources."webpack-4.44.2" // { dependencies = [ sources."schema-utils-1.0.0" ]; }) - sources."webpack-dev-middleware-3.7.2" + (sources."webpack-dev-middleware-3.7.2" // { + dependencies = [ + sources."mime-2.4.6" + ]; + }) (sources."webpack-dev-server-3.11.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -14897,7 +15007,7 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."debug-4.2.0" + sources."debug-4.3.0" sources."get-caller-file-2.0.5" sources."http-proxy-middleware-0.19.1" sources."is-absolute-url-3.0.3" @@ -14937,7 +15047,7 @@ in }) sources."websocket-driver-0.7.4" sources."websocket-extensions-0.1.4" - sources."whatwg-fetch-3.0.0" + sources."whatwg-fetch-3.4.1" sources."which-2.0.2" sources."which-module-1.0.0" (sources."winston-2.1.1" // { @@ -14974,10 +15084,11 @@ in }) sources."wrappy-1.0.2" sources."ws-6.2.1" - sources."xmlbuilder-13.0.2" + sources."xmlbuilder-15.1.1" sources."xtend-4.0.2" sources."y18n-4.0.0" sources."yallist-3.1.1" + sources."yaml-1.10.0" (sources."yargs-6.6.0" // { dependencies = [ sources."camelcase-3.0.0" @@ -15014,22 +15125,20 @@ in sources."chalk-3.0.0" ]; }) - sources."@types/color-name-1.1.1" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" - sources."@types/jest-26.0.10" - sources."@types/node-14.6.2" - sources."@types/yargs-15.0.5" + sources."@types/jest-26.0.14" + sources."@types/node-14.11.3" + sources."@types/yargs-15.0.7" sources."@types/yargs-parser-15.0.0" sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."bs-logger-0.2.6" sources."buffer-from-1.1.1" - sources."camelcase-5.3.1" sources."chalk-4.1.0" sources."ci-info-2.0.0" sources."color-convert-2.0.1" @@ -15041,7 +15150,6 @@ in sources."semver-5.7.1" ]; }) - sources."decamelize-1.2.0" sources."diff-sequences-25.2.6" sources."fast-json-stable-stringify-2.1.0" sources."fill-range-7.0.1" @@ -15062,9 +15170,9 @@ in ]; }) sources."jest-get-type-25.2.6" - (sources."jest-util-26.3.0" // { + (sources."jest-util-26.5.0" // { dependencies = [ - sources."@jest/types-26.3.0" + sources."@jest/types-26.5.0" sources."@types/istanbul-reports-3.0.0" ]; }) @@ -15091,12 +15199,12 @@ in sources."supports-color-7.2.0" sources."temp-0.9.1" sources."to-regex-range-5.0.1" - sources."ts-jest-26.3.0" + sources."ts-jest-26.4.1" sources."ts-union-2.2.1" sources."typescript-3.9.7" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."yargs-parser-18.1.3" + sources."yargs-parser-20.2.1" ]; buildInputs = globalBuildInputs; meta = { diff --git a/third_party/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix b/third_party/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix index 31a0727da9..9f50ea9abb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix @@ -1,53 +1,107 @@ -{ stdenv, fetchurl, makeWrapper +{ stdenv, lib, fetchurl, makeWrapper, writeText , fpc, gtk2, glib, pango, atk, gdk-pixbuf , libXi, xorgproto, libX11, libXext , gdb, gnumake, binutils +, withQt ? false, qtbase ? null, libqt5pas ? null, wrapQtAppsHook ? null }: + +# TODO: +# 1. the build date is embedded in the binary through `$I %DATE%` - we should dump that + +let + version = "2.0.10-2"; + + # as of 2.0.10 a suffix is being added. That may or may not disappear and then + # come back, so just leave this here. + majorMinorPatch = v: + builtins.concatStringsSep "." (lib.take 3 (lib.splitVersion v)); + + overrides = writeText "revision.inc" (lib.concatStringsSep "\n" (lib.mapAttrsToList (k: v: + "const ${k} = '${v}';") { + # this is technically the SVN revision but as we don't have that replace + # it with the version instead of showing "Unknown" + RevisionStr = version; + })); + +in stdenv.mkDerivation rec { - pname = "lazarus"; - version = "2.0.8"; + pname = "lazarus-${LCL_PLATFORM}"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}.tar.gz"; - sha256 = "1iciqydb0miqdrh89aj59gy7kfcwikkycqssq9djcqsw1ql3gc4h"; + url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${majorMinorPatch version}/lazarus-${version}.tar.gz"; + sha256 = "sha256-ZNViZGjdJKMzKyBfOr0KWBq33hsGCi1X4hhkBmz9Q7c="; }; + postPatch = '' + cp ${overrides} ide/${overrides.name} + ''; + buildInputs = [ + # we need gtk2 unconditionally as that is the default target when building applications with lazarus fpc gtk2 glib libXi xorgproto libX11 libXext pango atk - stdenv.cc makeWrapper gdk-pixbuf - ]; + stdenv.cc gdk-pixbuf + ] + ++ lib.optionals withQt [ libqt5pas qtbase ]; + + nativeBuildInputs = [ + makeWrapper + ] ++ lib.optional withQt wrapQtAppsHook; makeFlags = [ "FPC=fpc" "PP=fpc" + "LAZARUS_INSTALL_DIR=${placeholder "out"}/share/lazarus/" + "INSTALL_PREFIX=${placeholder "out"}/" "REQUIRE_PACKAGES+=tachartlazaruspkg" "bigide" ]; + LCL_PLATFORM = if withQt then "qt5" else "gtk2"; + + NIX_LDFLAGS = lib.concatStringsSep " " ([ + "-L${stdenv.cc.cc.lib}/lib" + "-lX11" + "-lXext" + "-lXi" + "-latk-1.0" + "-lc" + "-lcairo" + "-lgcc_s" + "-lgdk-x11-2.0" + "-lgdk_pixbuf-2.0" + "-lglib-2.0" + "-lgtk-x11-2.0" + "-lpango-1.0" + ] + ++ lib.optionals withQt [ + "-L${lib.getLib libqt5pas}/lib" + "-lQt5Pas" + ]); + preBuild = '' - export makeFlags="$makeFlags LAZARUS_INSTALL_DIR=$out/share/lazarus/ INSTALL_PREFIX=$out/" - export NIX_LDFLAGS="$NIX_LDFLAGS -L${stdenv.cc.cc.lib}/lib -lXi -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lc -lXext -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0 -lcairo -lgcc_s" - export LCL_PLATFORM=gtk2 mkdir -p $out/share "$out/lazarus" tar xf ${fpc.src} --strip-components=1 -C $out/share -m - sed -e 's@/usr/fpcsrc@'"$out/share/fpcsrc@" -i ide/include/unix/lazbaseconf.inc + substituteInPlace ide/include/unix/lazbaseconf.inc \ + --replace '/usr/fpcsrc' "$out/share/fpcsrc" ''; - postInstall = '' - wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' \ - "$(echo "$NIX_LDFLAGS" | sed -re 's/-rpath [^ ]+//g')" \ - --prefix NIX_LDFLAGS_${binutils.suffixSalt} ' ' \ - "$(echo "$NIX_LDFLAGS" | sed -re 's/-rpath [^ ]+//g')" \ + postInstall = let + ldFlags = ''$(echo "$NIX_LDFLAGS" | sed -re 's/-rpath [^ ]+//g')''; + in '' + wrapProgram $out/bin/startlazarus \ + --prefix NIX_LDFLAGS ' ' "${ldFlags}" \ + --prefix NIX_LDFLAGS_${binutils.suffixSalt} ' ' "${ldFlags}" \ --prefix LCL_PLATFORM ' ' "$LCL_PLATFORM" \ - --prefix PATH ':' "${fpc}/bin:${gdb}/bin:${gnumake}/bin:${binutils}/bin" + --prefix PATH ':' "${lib.makeBinPath [ fpc gdb gnumake binutils ]}" ''; meta = with stdenv.lib; { - description = "Lazarus graphical IDE for FreePascal language"; - homepage = "http://www.lazarus.freepascal.org"; + description = "Lazarus graphical IDE for the FreePascal language"; + homepage = "https://www.lazarus.freepascal.org"; license = licenses.gpl2Plus ; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; - maintainers = [ maintainers.raskin ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/fpc/libqt5pas.nix b/third_party/nixpkgs/pkgs/development/compilers/fpc/libqt5pas.nix index 82cdd394e7..f3ddfe9edc 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/fpc/libqt5pas.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/fpc/libqt5pas.nix @@ -1,6 +1,6 @@ -{ stdenv, lazarus, qt5 }: +{ mkDerivation, lib, lazarus, qmake, qtbase, qtx11extras }: -stdenv.mkDerivation { +mkDerivation { pname = "libqt5pas"; inherit (lazarus) version src; @@ -8,14 +8,14 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace Qt5Pas.pro \ - --replace "target.path = \$\$[QT_INSTALL_LIBS]" "target.path = $out/lib" + --replace 'target.path = $$[QT_INSTALL_LIBS]' "target.path = $out/lib" ''; - nativeBuildInputs = with qt5; [ qmake ]; + nativeBuildInputs = [ qmake ]; - buildInputs = with qt5; [ qtbase qtx11extras ]; + buildInputs = [ qtbase qtx11extras ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Free Pascal Qt5 binding library"; homepage = "https://wiki.freepascal.org/Qt5_Interface#libqt5pas"; maintainers = with maintainers; [ sikmir ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix new file mode 100644 index 0000000000..baa1d879b5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -0,0 +1,174 @@ +{ stdenv +, fetchurl, perl, gcc +, ncurses6, gmp, glibc, libiconv, numactl +, llvmPackages +}: + +# Prebuilt only does native +assert stdenv.targetPlatform == stdenv.hostPlatform; + +let + useLLVM = !stdenv.targetPlatform.isx86; + + libPath = stdenv.lib.makeLibraryPath ([ + ncurses6 gmp + ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv + ++ stdenv.lib.optional (stdenv.hostPlatform.isAarch64) numactl); + + libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY" + + "LD_LIBRARY_PATH"; + + glibcDynLinker = assert stdenv.isLinux; + if stdenv.hostPlatform.libc == "glibc" then + # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild. + ''"$(cat $NIX_CC/nix-support/dynamic-linker)"'' + else + "${stdenv.lib.getLib glibc}/lib/ld-linux*"; + +in + +stdenv.mkDerivation rec { + version = "8.10.2"; + + name = "ghc-${version}-binary"; + + # https://downloads.haskell.org/~ghc/8.10.2/ + src = fetchurl ({ + i686-linux = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; + sha256 = "0bvwisl4w0z5z8z0da10m9sv0mhm9na2qm43qxr8zl23mn32mblx"; + }; + x86_64-linux = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz"; + sha256 = "0chnzy9j23b2wa8clx5arwz8wnjfxyjmz9qkj548z14cqf13slcl"; + }; + armv7l-linux = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb10-linux.tar.xz"; + sha256 = "1j41cq5d3rmlgz7hzw8f908fs79gc5mn3q5wz277lk8zdf19g75v"; + }; + aarch64-linux = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz"; + sha256 = "14smwl3741ixnbgi0l51a7kh7xjkiannfqx15b72svky0y4l3wjw"; + }; + x86_64-darwin = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; + sha256 = "1hngyq14l4f950hzhh2d204ca2gfc98pc9xdasxihzqd1jq75dzd"; + }; + }.${stdenv.hostPlatform.system} + or (throw "cannot bootstrap GHC on this platform")); + + nativeBuildInputs = [ perl ]; + propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ]; + + # Cannot patchelf beforehand due to relative RPATHs that anticipate + # the final install location/ + ${libEnvVar} = libPath; + + postUnpack = + # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib + # during linking + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + # not enough room in the object files for the full path to libiconv :( + for exe in $(find . -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + done + '' + + + # Some scripts used during the build need to have their shebangs patched + '' + patchShebangs ghc-${version}/utils/ + patchShebangs ghc-${version}/configure + '' + + + # We have to patch the GMP paths for the integer-gmp package. + '' + find . -name integer-gmp.buildinfo \ + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; + '' + stdenv.lib.optionalString stdenv.isDarwin '' + find . -name base.buildinfo \ + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; + '' + + # Rename needed libraries and binaries, fix interpreter + stdenv.lib.optionalString stdenv.isLinux '' + find . -type f -perm -0100 -exec patchelf \ + --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.6 libncurses.so \ + --interpreter ${glibcDynLinker} {} \; + + sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + '' + + # We're kludging a glibc bindist into working with non-glibc... + # Here we patch up the use of `__strdup` (part of glibc binary ABI) + # to instead use `strdup` since musl doesn't provide __strdup + # (`__strdup` is defined to be an alias of `strdup` anyway[1]). + # [1] http://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/baselib---strdup-1.html + # Use objcopy magic to make the change: + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + find ./ghc-${version}/rts -name "libHSrts*.a" -exec ''${OBJCOPY:-objcopy} --redefine-sym __strdup=strdup {} \; + ''; + + # fix for `configure: error: Your linker is affected by binutils #16177` + preConfigure = stdenv.lib.optionalString + stdenv.targetPlatform.isAarch32 + "LD=ld.gold"; + + configurePlatforms = [ ]; + configureFlags = [ + "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib" + "--with-gmp-includes=${stdenv.lib.getDev gmp}/include" + ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; + + # No building is necessary, but calling make without flags ironically + # calls install-strip ... + dontBuild = true; + + # On Linux, use patchelf to modify the executables so that they can + # find editline/gmp. + postFixup = stdenv.lib.optionalString stdenv.isLinux '' + for p in $(find "$out" -type f -executable); do + if isELF "$p"; then + echo "Patchelfing $p" + patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p + fi + done + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # not enough room in the object files for the full path to libiconv :( + for exe in $(find "$out" -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + done + + for file in $(find "$out" -name setup-config); do + substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" + done + ''; + + doInstallCheck = true; + installCheckPhase = '' + unset ${libEnvVar} + # Sanity check, can ghc create executables? + cd $TMP + mkdir test-ghc; cd test-ghc + cat > main.hs << EOF + {-# LANGUAGE TemplateHaskell #-} + module Main where + main = putStrLn \$([|"yes"|]) + EOF + $out/bin/ghc --make main.hs || exit 1 + echo compilation ok + [ $(./main) == "yes" ] + ''; + + passthru = { + targetPrefix = ""; + enableShared = true; + }; + + meta.license = stdenv.lib.licenses.bsd3; + meta.platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"]; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix new file mode 100644 index 0000000000..23daee56a7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix @@ -0,0 +1,247 @@ +{ stdenv, pkgsBuildTarget, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx +, bash + +, libiconv ? null, ncurses + +, # GHC can be built with system libffi or a bundled one. + libffi ? null + +, useLLVM ? !stdenv.targetPlatform.isx86 +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. + enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + + # aarch64 outputs otherwise exceed 2GB limit +, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64 + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt + +, # Whether to build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # What flavour to build. An empty string indicates no + # specific flavour and falls back to ghc default values. + ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + (if useLLVM then "perf-cross" else "perf-cross-ncg") + +, # Whether to disable the large address space allocator + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 +}: + +assert !enableIntegerSimple -> gmp != null; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + HADDOCK_DOCS = NO + BUILD_SPHINX_HTML = NO + BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString (!enableProfiledLibs) '' + GhcLibWays = "v dyn" + '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses + ++ [libffi] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + + # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; + +in +stdenv.mkDerivation (rec { + version = "9.0.0.20200925"; + name = "${targetPrefix}ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/ghc/9.0.1-alpha1/ghc-${version}-src.tar.xz"; + sha256 = "1c6vgic0bx0c4c6gszq7znvc5gxf0lgh630283mivbs1lyiqj88l"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + postPatch = "patchShebangs ."; + + # GHC is a bit confused on its cross terminology. + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + + echo -n "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + stdenv.lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ stdenv.lib.optionals (libffi != null) [ + "--with-system-libffi" + "--with-ffi-includes=${targetPackages.libffi.dev}/include" + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + "--with-iconv-includes=${libiconv}/include" + "--with-iconv-libraries=${libiconv}/lib" + ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ stdenv.lib.optionals useLdGold [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatibility. + strictDeps = true; + + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 sphinx + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + + depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + done + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + inherit (ghc.meta) license platforms; + }; + +} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix index b467c998c3..9c7d70e63e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, tzdata, iana-etc, runCommand , perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation , mailcap, runtimeShell -, buildPackages, pkgsTargetTarget +, buildPackages +, pkgsBuildTarget , fetchpatch }: @@ -25,8 +26,12 @@ let "armv5tel" = "arm"; "armv6l" = "arm"; "armv7l" = "arm"; + "powerpc64le" = "ppc64le"; }.${platform.parsed.cpu.name} or (throw "Unsupported system"); + # We need a target compiler which is still runnable at build time, + # to handle the cross-building case where build != host == target + targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; in stdenv.mkDerivation rec { @@ -166,11 +171,11 @@ stdenv.mkDerivation rec { # {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" + "${targetCC}/bin/${targetCC.targetPrefix}cc" else null; CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" + "${targetCC}/bin/${targetCC.targetPrefix}c++" else null; diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix index 8dd48e3396..ca08ee190c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, tzdata, iana-etc, runCommand , perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation , mailcap, runtimeShell -, buildPackages, pkgsTargetTarget +, buildPackages +, pkgsBuildTarget , fetchpatch }: @@ -25,8 +26,12 @@ let "armv5tel" = "arm"; "armv6l" = "arm"; "armv7l" = "arm"; + "powerpc64le" = "ppc64le"; }.${platform.parsed.cpu.name} or (throw "Unsupported system"); + # We need a target compiler which is still runnable at build time, + # to handle the cross-building case where build != host == target + targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; in stdenv.mkDerivation rec { @@ -169,11 +174,11 @@ stdenv.mkDerivation rec { # {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" + "${targetCC}/bin/${targetCC.targetPrefix}cc" else null; CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" + "${targetCC}/bin/${targetCC.targetPrefix}c++" else null; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix index 08f9339dc8..53292ef844 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix @@ -8,7 +8,8 @@ let pname = "clang"; inherit version; - src = fetch "clang" "18rv5nxk04fgk4ziix7z4s2cargdpqgvqrk3lnp3wvd6yb5g5p98"; + src = fetch "clang" "1p64l5a3x55118nyms1805qbk3r9w37nz1rb7xvbgc9fmyzaffay"; + inherit clang-tools-extra_src; unpackPhase = '' unpackFile $src diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt.nix index 133db36594..e0cb712fe6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { pname = "compiler-rt"; inherit version; - src = fetch pname "0qfgap6acxffm01hzk38pmzq8ac3isk90531dz0qf7fd5015jvvg"; + src = fetch pname "0cpyi5g0wlwyb7gvy47k5rjiipnlhrr3ks4q4rlrlyax6w9dx98n"; nativeBuildInputs = [ cmake python3 llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix index cbb3df9f68..dc75fe9f96 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix @@ -6,7 +6,7 @@ let release_version = "11.0.0"; - candidate = "rc2"; + candidate = "rc5"; version = "${release_version}${candidate}"; # differentiating these (variables) is important for RCs targetConfig = stdenv.targetPlatform.config; @@ -15,7 +15,7 @@ let inherit sha256; }; - clang-tools-extra_src = fetch "clang-tools-extra" "0bg2a9nmkdbj5qfd0vvqj8bgchcx1yzmylxxgvh8y5hhj4fz13fs"; + clang-tools-extra_src = fetch "clang-tools-extra" "0slqx5430pc699idabqnq34s9n0y2fq6q8z8hn5wakbi93dal71r"; tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix index a2ea7e2991..7a7cf06600 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "libc++"; inherit version; - src = fetch "libcxx" "0aaci7iblfczv1jb22zjrwzxcrcx6x7klvjivmxm2zni0n2x3bd4"; + src = fetch "libcxx" "1rlp8hx0nmqpx0gxq8hh9kqbkkzfpadx9chm47c38d4lahdksr1v"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi.nix index bf7b3fd001..ba3b7fd9d9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "libc++abi"; inherit version; - src = fetch "libcxxabi" "04gqdzs13sw7f7a06h5zm5917d9f1k79l4rcm096grgvf0r7lnqx"; + src = fetch "libcxxabi" "0214sl9m80hb8v0mdkrwl8l4ca3dvapis23mkld85bnxa8zq2c1q"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libunwind.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libunwind.nix index 03b58ca8d1..0fc3fcabb3 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libunwind.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libunwind.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "libunwind"; inherit version; - src = fetch pname "1ch4a2yp821lgzxh9898f7nw2fnkrn3wh25sqg05hlks45znv30y"; + src = fetch pname "1xw8y6agnix7qlwh676gm1kbkzh9c1nz7l3vhxjpazbk70biz9mq"; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lld.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lld.nix index 74d18a444f..364fdb727d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lld.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "lld"; inherit version; - src = fetch pname "0lqz5cfids0rrl02p0qq5s18p8ikaa9r5gwa2yvj3bismdhvmar8"; + src = fetch pname "1ibyahcxxckdfwh95f1dzxgcf1fsd0r9rpanm3dnn6nb99mn0is4"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm libxml2 ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix index c0b7f267f7..b794969214 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { pname = "lldb"; inherit version; - src = fetch pname "0hb582kvhxp3kcckz7imrihs0kszdaz09z22xfymyi4vgmcy62q3"; + src = fetch pname "1v8nvw6rxmi7w3ayjcjan4plb5ryhizc41sras7fza2l7n3cz8iz"; patches = [ ./lldb-procfs.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix index f15a7d12b8..b55ec1f0a1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix @@ -32,8 +32,8 @@ in stdenv.mkDerivation (rec { pname = "llvm"; inherit version; - src = fetch pname "151c7nphn18dcw04yxyp6qdj8w19psb8nigf26djf7rhpi1fn0sh"; - polly_src = fetch "polly" "0caxfpaxhf38nam4gkb9xqlrw20v29cm8jf95ykkbngqw64rmgij"; + src = fetch pname "1k7i2syqdm29l10di3ws64i02snh9jhd1s2jzgh8565b0vg25wlc"; + polly_src = fetch "polly" "0l0n09f6sy30x825w85v8n7pvya0ciq89r0abv66n8ggwmrk3rnw"; unpackPhase = '' unpackFile $src diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/openmp.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/openmp.nix index f4f9bbf229..3cc19ad711 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/openmp.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/openmp.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "openmp"; inherit version; - src = fetch pname "1025dwn68iw664df831zbkxy8bxilvjkbc6mw4nhv6p5ff7dcw7f"; + src = fetch pname "1yq7m0kwnlgq8ni719g9fny0x5wrvm8szp11b3q8zz39rqqyphsz"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix index 5011fd39e2..30b56ecba1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix @@ -85,6 +85,7 @@ let mkdir -p $out/share ln -s $out/lib/openjdk/include $out/include ln -s $out/lib/openjdk/man $out/share/man + ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/linux/*_md.h $out/include/ diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/default.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/default.nix index e51e554026..3dd74f73a7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/default.nix @@ -91,6 +91,7 @@ let mkdir -p $out/share ln -s $out/lib/openjdk/include $out/include ln -s $out/lib/openjdk/man $out/share/man + ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/linux/*_md.h $out/include/ diff --git a/third_party/nixpkgs/pkgs/development/compilers/paco/default.nix b/third_party/nixpkgs/pkgs/development/compilers/paco/default.nix new file mode 100644 index 0000000000..69e7b26287 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/paco/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "paco"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "pacolang"; + repo = "paco"; + rev = "v${version}"; + sha256 = "03x75h40dhjswbf2g1408krj9b1w05y9pjzygzhklldc75r3n9dh"; + }; + + goPackagePath = "github.com/pacolang/paco"; + goDeps = ./deps.nix; + + meta = with lib; { + description = "A simple compiled programming language"; + homepage = "https://github.com/pacolang/paco"; + license = licenses.mit; + maintainers = with maintainers; [ hugolgst ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/paco/deps.nix b/third_party/nixpkgs/pkgs/development/compilers/paco/deps.nix new file mode 100644 index 0000000000..a3ec48b7f1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/paco/deps.nix @@ -0,0 +1,93 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.0"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/gookit/color"; + fetch = { + type = "git"; + url = "https://github.com/gookit/color"; + rev = "v1.1.7"; + sha256 = "02gq82i9srr8bv5yhgkmn5j1r3pn8wspiisvhpbyhykm1fn736mz"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/niemeyer/pretty"; + fetch = { + type = "git"; + url = "https://github.com/niemeyer/pretty"; + rev = "a10e7caefd8e"; + sha256 = "1jmazh4xzaa3v6g46hz60q2z7nmqs9l9cxdzmmscn3kbcs2znq4v"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.0"; + sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.3.0"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "8fa46927fb4f"; + sha256 = "0fx03x0nx9mjwnqphnx852q9p76qg7cazrachvgr1bj357lplrcw"; + }; + } + { + goPackagePath = "gopkg.in/pipe.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/pipe.v2"; + rev = "3c2ca4d52544"; + sha256 = "090wrj4n6a6pzdlakcxy9qnkngc8hp6m49ipbnlszs0hyj2hnngv"; + }; + } +] diff --git a/third_party/nixpkgs/pkgs/development/compilers/picat/default.nix b/third_party/nixpkgs/pkgs/development/compilers/picat/default.nix index 91e29a740c..eba45ed8bb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/picat/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/picat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "picat"; - version = "2.8-2"; + version = "3.0"; src = fetchurl { - url = "http://picat-lang.org/download/picat28_src.tar.gz"; - sha256 = "10hf2fxxbpq28gi39icr8c9wafdiy9ddfkk6l4rx7kkqyrdi7n85"; + url = "http://picat-lang.org/download/picat30_src.tar.gz"; + sha256 = "0ivqp4ifknc019rb975vx5j3rmr69x2f3ig7ybb38wm5zx5mljgg"; }; buildInputs = [ zlib ]; @@ -16,6 +16,7 @@ stdenv.mkDerivation { else throw "Unsupported system"; hardeningDisable = [ "format" ]; + enableParallelBuilding = true; buildPhase = '' cd emu diff --git a/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix index e48e454a0a..566fd7be31 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix @@ -1,64 +1,92 @@ -{ stdenv, fetchFromGitHub, llvm, makeWrapper, pcre2, coreutils, which, libressl, libxml2, +{ stdenv, fetchFromGitHub, fetchurl, makeWrapper, pcre2, coreutils, which, libressl, libxml2, cmake, z3, substituteAll, cc ? stdenv.cc, lto ? !stdenv.isDarwin }: -stdenv.mkDerivation ( rec { +stdenv.mkDerivation (rec { pname = "ponyc"; - version = "0.33.2"; + version = "0.38.1"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "0jcdr1r3g8sm3q9fcc87d6x98fg581n6hb90hz7r08mzn4bwvysw"; + sha256 = "1hk810k9h3bl641pgw91y4x2qw67rvbapx6p2pk9qz5p7nfcn7qh"; + +# Due to a bug in LLVM 9.x, ponyc has to include its own vendored patched +# LLVM. (The submodule is a specific tag in the LLVM source tree). +# +# The pony developers are currently working to get off 9.x as quickly +# as possible so hopefully in a few revisions this package build will +# become a lot simpler. +# +# https://reviews.llvm.org/rG9f4f237e29e7150dfcf04ae78fa287d2dc8d48e2 + + fetchSubmodules = true; }; - buildInputs = [ llvm makeWrapper which libxml2 ]; + ponygbenchmark = fetchurl { + url = https://github.com/google/benchmark/archive/v1.5.0.tar.gz; + sha256 = "06i2cr4rj126m1zfz0x1rbxv1mw1l7a11mzal5kqk56cdrdicsiw"; + name = "v1.5.0.tar.gz"; + }; + + buildInputs = [ makeWrapper which libxml2 cmake z3 ]; propagatedBuildInputs = [ cc ]; - # Disable problematic networking tests - patches = [ ./disable-tests.patch ]; + # Sandbox disallows network access, so disabling problematic networking tests + patches = [ + ./disable-tests.patch + (substituteAll { + src = ./make-safe-for-sandbox.patch; + googletest = fetchurl { + url = https://github.com/google/googletest/archive/release-1.8.1.tar.gz; + sha256 = "17147961i01fl099ygxjx4asvjanwdd446nwbq9v8156h98zxwcv"; + name = "release-1.8.1.tar.gz"; + }; + }) + ]; + + postUnpack = '' + mkdir -p source/build/build_libs/gbenchmark-prefix/src + tar -C source/build/build_libs/gbenchmark-prefix/src -zxvf "$ponygbenchmark" + mv source/build/build_libs/gbenchmark-prefix/src/benchmark-1.5.0 \ + source/build/build_libs/gbenchmark-prefix/src/benchmark + ''; + + dontConfigure = true; + + postPatch = '' + # Patching Vendor LLVM + patchShebangs --host build/build_libs/gbenchmark-prefix/src/benchmark/tools/*.py + patch -d lib/llvm/src/ -p1 < lib/llvm/patches/2020-09-01-is-trivially-copyable.diff + patch -d lib/llvm/src/ -p1 < lib/llvm/patches/2020-01-07-01-c-exports.diff + patch -d lib/llvm/src/ -p1 < lib/llvm/patches/2019-12-23-01-jit-eh-frames.diff - preBuild = '' - # Fix tests - substituteInPlace packages/process/_test.pony \ - --replace '"/bin/' '"${coreutils}/bin/' substituteInPlace packages/process/_test.pony \ + --replace '"/bin/' '"${coreutils}/bin/' \ --replace '=/bin' "${coreutils}/bin" - - # Disabling the stdlib tests - substituteInPlace Makefile-ponyc \ - --replace 'test-ci: all check-version test-core test-stdlib-debug test-stdlib' 'test-ci: all check-version test-core' - - # Remove impure system refs substituteInPlace src/libponyc/pkg/package.c \ --replace "/usr/local/lib" "" \ --replace "/opt/local/lib" "" - - for file in `grep -irl '/usr/local/opt/libressl/lib' ./*`; do - substituteInPlace $file --replace '/usr/local/opt/libressl/lib' "${stdenv.lib.getLib libressl}/lib" - done - - export LLVM_CONFIG=${llvm}/bin/llvm-config - '' + stdenv.lib.optionalString ((!stdenv.isDarwin) && (!cc.isClang) && lto) '' - export LTO_PLUGIN=`find ${cc.cc}/ -name liblto_plugin.so` - '' + stdenv.lib.optionalString ((!stdenv.isDarwin) && (cc.isClang) && lto) '' - export LTO_PLUGIN=`find ${cc.cc}/ -name LLVMgold.so` ''; - makeFlags = [ "config=release" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "bits=64" ] - ++ stdenv.lib.optionals (stdenv.isDarwin && (!lto)) [ "lto=no" ]; + + preBuild = '' + make libs build_flags=-j$NIX_BUILD_CORES + make configure build_flags=-j$NIX_BUILD_CORES + ''; + + makeFlags = [ + "PONYC_VERSION=${version}" + "prefix=${placeholder "out"}" + ] + ++ stdenv.lib.optionals stdenv.isDarwin [ "bits=64" ] + ++ stdenv.lib.optionals (stdenv.isDarwin && (!lto)) [ "lto=no" ]; enableParallelBuilding = true; doCheck = true; - checkTarget = "test-ci"; - - NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-move" ]; - - preCheck = '' - export PONYPATH="$out/lib:${stdenv.lib.makeLibraryPath [ pcre2 libressl ]}" - ''; + NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-move" "-Wno-error=implicit-fallthrough" ]; installPhase = '' make config=release prefix=$out '' @@ -79,7 +107,7 @@ stdenv.mkDerivation ( rec { description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language"; homepage = "https://www.ponylang.org"; license = licenses.bsd2; - maintainers = with maintainers; [ doublec kamilchm patternspandemic ]; + maintainers = with maintainers; [ doublec kamilchm patternspandemic redvers ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch b/third_party/nixpkgs/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch new file mode 100644 index 0000000000..b07763a475 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch @@ -0,0 +1,93 @@ +--- a/lib/CMakeLists.txt 2020-09-27 02:39:12.862940179 +0000 ++++ b/lib/CMakeLists.txt 2020-09-27 02:39:16.451957865 +0000 +@@ -10,12 +10,12 @@ + endif() + + ExternalProject_Add(gbenchmark +- URL https://github.com/google/benchmark/archive/v1.5.0.tar.gz ++ SOURCE_DIR gbenchmark-prefix/src/benchmark + CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DCMAKE_CXX_FLAGS=-fpic --no-warn-unused-cli + ) + + ExternalProject_Add(googletest +- URL https://github.com/google/googletest/archive/release-1.8.1.tar.gz ++ URL @googletest@ + CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_CXX_FLAGS=-fpic -Dgtest_force_shared_crt=ON --no-warn-unused-cli + ) + +@@ -28,75 +28,6 @@ + COMPONENT library + ) + +-find_package(Git) +- +-set(LLVM_DESIRED_HASH "c1a0a213378a458fbea1a5c77b315c7dce08fd05") +-set(PATCHES_DESIRED_HASH "9063f83d727bf042a1232420e168c1ea192bf6a2960d35e57123245b630eb923") +- +-if(GIT_FOUND) +- if(EXISTS "${PROJECT_SOURCE_DIR}/../.git") +- # Update submodules as needed +- option(GIT_SUBMODULE "Check submodules during build" ON) +- if(GIT_SUBMODULE) +- message(STATUS "Updating submodules...") +- execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE git_submod_result) +- #message("git_submod_result ${git_submod_result}") +- if(NOT git_submod_result EQUAL "0") +- message(FATAL_ERROR "git submodule update --init --recursive failed with ${git_submod_result}, please checkout submodules") +- endif() +- +- # we check to make sure the submodule hash matches +- # the reason the submodule hash is in this file is to be able to use this file as a key for caching the libs in CI +- execute_process(COMMAND ${GIT_EXECUTABLE} submodule status +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- OUTPUT_VARIABLE git_submod_output) +- #message("git_submod_output ${git_submod_output}") +- string(FIND "${git_submod_output}" "${LLVM_DESIRED_HASH}" LLVM_SUBMOD_POS) +- if(LLVM_SUBMOD_POS EQUAL "-1") +- message(FATAL_ERROR "Expecting the lib/llvm/src submodule to be at hash '${LLVM_DESIRED_HASH}'; found '${git_submod_output}'; update the LLVM_DESIRED_HASH variable in lib/CMakeLists.txt if you've updated the submodule.") +- endif() +- endif() +- endif() +- +- # Apply patches +- message("Applying patches...") +- file(GLOB PONY_LLVM_PATCHES "${PROJECT_SOURCE_DIR}/llvm/patches/*.diff") +- +- # check to see if the patch hashes match +- set(PATCHES_ACTUAL_HASH "") +- foreach (PATCH ${PONY_LLVM_PATCHES}) +- file(SHA256 ${PATCH} patch_file_hash) +- string(CONCAT PATCHES_ACTUAL_HASH patch_file_hash) +- endforeach() +- string(SHA256 PATCHES_ACTUAL_HASH ${PATCHES_ACTUAL_HASH}) +- if(NOT PATCHES_ACTUAL_HASH EQUAL "${PATCHES_DESIRED_HASH}") +- message(FATAL_ERROR "Patch hash actual ${PATCHES_ACTUAL_HASH} does not match desired ${PATCHES_DESIRED_HASH}") +- endif() +- +- foreach (PATCH ${PONY_LLVM_PATCHES}) +- message(" Checking ${PATCH}") +- execute_process(COMMAND ${GIT_EXECUTABLE} apply --check -p 1 --ignore-whitespace --whitespace=nowarn ${PATCH} +- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/llvm/src" +- ERROR_VARIABLE _err_out +- RESULT_VARIABLE git_apply_check_result) +- if(git_apply_check_result EQUAL "0") +- message(" Applying ${PATCH}") +- execute_process(COMMAND ${GIT_EXECUTABLE} apply -p 1 --ignore-whitespace --whitespace=nowarn ${PATCH} +- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/llvm/src" +- RESULT_VARIABLE git_apply_result) +- if(NOT git_apply_result EQUAL "0") +- message(FATAL_ERROR "Unable to apply ${PATCH}") +- endif() +- else() +- message(" Already applied ${PATCH}") +- endif() +- endforeach() +-else() +- message(FATAL_ERROR "Git not found!") +-endif() +- + if (NOT DEFINED LLVM_TARGETS_TO_BUILD) + set(LLVM_TARGETS_TO_BUILD X86) + endif() diff --git a/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix b/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix new file mode 100644 index 0000000000..7cf3000e9d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, ponyc }: + +stdenv.mkDerivation ( rec { + pname = "corral"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "ponylang"; + repo = pname; + rev = version; + sha256 = "0kydx4psl6k4n46as9xc5xwbwapibm6g7haxds7y9d392807qfqk"; + }; + + buildInputs = [ ponyc ]; + + installFlags = [ "prefix=${placeholder "out"}" "install" ]; + + meta = with stdenv.lib; { + description = "Corral is a dependency management tool for ponylang (ponyc)"; + homepage = "https://www.ponylang.io"; + license = licenses.bsd2; + maintainers = with maintainers; [ redvers ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/scala/2.12.nix b/third_party/nixpkgs/pkgs/development/compilers/scala/2.12.nix index 4c9d57624f..1a7c5677de 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/scala/2.12.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/scala/2.12.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.12.10"; + name = "scala-2.12.12"; src = fetchurl { url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "0sk5n3ir5zkgr8jayq5pn4l87ia5zmjr2zzwchgxkv8g62ivs4iv"; + sha256 = "0avyaa7y8w7494339krcpqhc2p8y5pjk4pz7mqmzdzwy7hgws81m"; }; propagatedBuildInputs = [ jre ] ; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/VST/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/VST/default.nix new file mode 100644 index 0000000000..a625aa54c1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/VST/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, coq, compcert }: + +stdenv.mkDerivation rec { + pname = "coq${coq.coq-version}-VST"; + version = "2.6"; + + src = fetchFromGitHub { + owner = "PrincetonUniversity"; + repo = "VST"; + rev = "v${version}"; + sha256 = "00bf9hl4pvmsqa08lzjs1mrxyfgfxq4k6778pnldmc8ichm90jgk"; + }; + + buildInputs = [ coq ]; + propagatedBuildInputs = [ compcert ]; + + preConfigure = "patchShebangs util"; + + makeFlags = [ + "BITSIZE=64" + "COMPCERT=inst_dir" + "COMPCERT_INST_DIR=${compcert.lib}/lib/coq/${coq.coq-version}/user-contrib/compcert" + "INSTALLDIR=$(out)/lib/coq/${coq.coq-version}/user-contrib/VST" + ]; + + postInstall = '' + for d in msl veric floyd sepcomp progs64 + do + cp -r $d $out/lib/coq/${coq.coq-version}/user-contrib/VST/ + done + ''; + + enableParallelBuilding = true; + + passthru.compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.11" ]; + + meta = { + description = "Verified Software Toolchain"; + homepage = "https://vst.cs.princeton.edu/"; + inherit (compcert.meta) platforms; + }; + +} 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 8d9feffc5e..f3f798d022 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -317,8 +317,8 @@ self: super: { # Needs the latest version of vty and brick. matterhorn = super.matterhorn.overrideScope (self: super: { - brick = self.brick_0_55; - vty = self.vty_5_30; + brick = self.brick_0_57; + vty = self.vty_5_31; }); memcache = dontCheck super.memcache; @@ -1211,7 +1211,7 @@ self: super: { # we need an override because ghcide is tracking haskell-lsp closely. ghcide = dontCheck (super.ghcide.overrideScope (self: super: { hie-bios = dontCheck super.hie-bios_0_7_1; - lsp-test = dontCheck self.lsp-test_0_11_0_5; + lsp-test = dontCheck self.lsp-test_0_11_0_6; })); # hasn‘t bumped upper bounds @@ -1336,7 +1336,7 @@ self: super: { # That's why we need to bump a ton of dependency versions to unbreak them. gi-pango = assert super.gi-pango.version == "1.0.22"; self.gi-pango_1_0_23; haskell-gi-base = assert super.haskell-gi-base.version == "0.23.0"; addBuildDepends (self.haskell-gi-base_0_24_3) [ pkgs.gobject-introspection ]; - haskell-gi = assert super.haskell-gi.version == "0.23.1"; self.haskell-gi_0_24_4; + haskell-gi = assert super.haskell-gi.version == "0.23.1"; self.haskell-gi_0_24_5; gi-cairo = assert super.gi-cairo.version == "1.0.23"; self.gi-cairo_1_0_24; gi-glib = assert super.gi-glib.version == "2.0.23"; self.gi-glib_2_0_24; gi-gobject = assert super.gi-gobject.version == "2.0.22"; self.gi-gobject_2_0_24; @@ -1481,7 +1481,7 @@ self: super: { ghcide = dontCheck hls-ghcide; # we are faster than stack here hie-bios = dontCheck super.hie-bios_0_7_1; - lsp-test = dontCheck super.lsp-test_0_11_0_5; + lsp-test = dontCheck super.lsp-test_0_11_0_6; # fourmolu can‘t compile with an older aeson aeson = dontCheck super.aeson_1_5_2_0; # brittany has an aeson upper bound of 1.5 diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix new file mode 100644 index 0000000000..2a3a0b3bc1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -0,0 +1,46 @@ +{ pkgs, haskellLib }: + +with haskellLib; + +self: super: { + + # This compiler version needs llvm 10.x. + llvmPackages = pkgs.llvmPackages_10; + + # Disable GHC 9.0.x core libraries. + array = null; + base = null; + binary = null; + bytestring = null; + Cabal = null; + containers = null; + deepseq = null; + directory = null; + exceptions = null; + filepath = null; + ghc-bignum = null; + ghc-boot = null; + ghc-boot-th = null; + ghc-compact = null; + ghc-heap = null; + ghc-prim = null; + ghci = null; + haskeline = null; + hpc = null; + integer-gmp = null; + libiserv = null; + mtl = null; + parsec = null; + pretty = null; + process = null; + rts = null; + stm = null; + template-haskell = null; + terminfo = null; + text = null; + time = null; + transformers = null; + unix = null; + xhtml = null; + +} 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 541356d9b3..e951291678 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 16.15 + # LTS Haskell 16.16 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -222,11 +222,11 @@ default-package-overrides: - apecs-gloss ==0.2.4 - apecs-physics ==0.4.4 - api-field-json-th ==0.1.0.2 + - app-settings ==0.2.0.12 - appar ==0.1.8 - appendmap ==0.1.5 - apportionment ==0.0.0.3 - approximate ==0.3.2 - - app-settings ==0.2.0.12 - arbor-lru-cache ==0.1.1.1 - arithmoi ==0.10.0.0 - array-memoize ==0.6.0 @@ -234,12 +234,12 @@ default-package-overrides: - ascii ==1.0.0.2 - ascii-case ==1.0.0.2 - ascii-char ==1.0.0.2 - - asciidiagram ==1.3.3.3 - ascii-group ==1.0.0.2 - ascii-predicates ==1.0.0.2 - ascii-progress ==0.3.3.0 - ascii-superset ==1.0.0.2 - ascii-th ==1.0.0.2 + - asciidiagram ==1.3.3.3 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 - asn1-types ==0.3.4 @@ -266,12 +266,18 @@ default-package-overrides: - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 - - autoexporter ==1.1.19 - auto-update ==0.1.6 + - autoexporter ==1.1.19 - avers ==0.0.17.1 - avro ==0.5.2.0 - aws-cloudfront-signed-cookies ==0.2.0.6 - bank-holidays-england ==0.2.0.5 + - base-compat ==0.11.1 + - base-compat-batteries ==0.11.1 + - base-noprelude ==4.13.0.0 + - base-orphans ==0.8.2 + - base-prelude ==1.3 + - base-unicode-symbols ==0.2.4.2 - base16 ==0.2.1.0 - base16-bytestring ==0.1.1.7 - base16-lens ==0.1.2.0 @@ -284,13 +290,7 @@ default-package-overrides: - base64-bytestring-type ==1.0.1 - base64-lens ==0.3.0 - base64-string ==0.2 - - base-compat ==0.11.1 - - base-compat-batteries ==0.11.1 - basement ==0.0.11 - - base-noprelude ==4.13.0.0 - - base-orphans ==0.8.2 - - base-prelude ==1.3 - - base-unicode-symbols ==0.2.4.2 - basic-prelude ==0.7.0 - bazel-runfiles ==0.12 - bbdb ==0.8 @@ -303,8 +303,8 @@ default-package-overrides: - bibtex ==0.1.0.6 - bifunctors ==5.5.7 - bimap ==0.4.0 - - bimaps ==0.1.0.2 - bimap-server ==0.1.0.1 + - bimaps ==0.1.0.2 - bin ==0.1 - binary-conduit ==1.3.1 - binary-ext ==2.0.4 @@ -323,8 +323,8 @@ default-package-overrides: - bins ==0.1.2.0 - bitarray ==0.0.1.1 - bits ==0.5.2 - - bitset-word8 ==0.1.1.2 - bits-extra ==0.0.2.0 + - bitset-word8 ==0.1.1.2 - bitvec ==1.0.3.0 - blake2 ==0.3.0 - blanks ==0.3.0 @@ -348,8 +348,8 @@ default-package-overrides: - boring ==0.1.3 - both ==0.1.1.1 - bound ==2.0.1 - - BoundedChan ==1.0.3.0 - bounded-queue ==1.0.0 + - BoundedChan ==1.0.3.0 - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.5 @@ -365,10 +365,10 @@ default-package-overrides: - butcher ==1.3.3.2 - bv ==0.5 - bv-little ==1.1.1 - - byteable ==0.1.1 - byte-count-reader ==0.10.1.1 - - bytedump ==1.0 - byte-order ==0.1.2.0 + - byteable ==0.1.1 + - bytedump ==1.0 - byteorder ==1.0.4 - bytes ==0.17 - byteset ==0.1.1.0 @@ -382,6 +382,7 @@ default-package-overrides: - bz2 ==1.0.0.1 - bzlib-conduit ==0.3.0.2 - c2hs ==0.28.6 + - ca-province-codes ==1.0.0.0 - cabal-appimage ==0.3.0.0 - cabal-debian ==5.0.3 - cabal-doctest ==1.0.8 @@ -391,13 +392,12 @@ default-package-overrides: - calendar-recycling ==0.0.0.1 - call-stack ==0.2.0 - can-i-haz ==0.3.1.0 - - ca-province-codes ==1.0.0.0 - cardano-coin-selection ==1.0.1 - carray ==0.1.6.8 - casa-client ==0.0.1 - casa-types ==0.0.1 - - cased ==0.1.0.0 - case-insensitive ==1.2.1.0 + - cased ==0.1.0.0 - cases ==0.1.4 - casing ==0.1.4.1 - cassava ==0.5.2.0 @@ -457,14 +457,14 @@ default-package-overrides: - cmark-gfm ==0.2.2 - cmark-lucid ==0.1.0.0 - cmdargs ==0.10.20 - - codec-beam ==0.2.0 - - codec-rpm ==0.2.2 - - code-page ==0.2 - - coercible-utils ==0.1.0 - co-log ==0.4.0.1 - co-log-concurrent ==0.5.0.0 - co-log-core ==0.2.1.1 - co-log-polysemy ==0.0.1.2 + - code-page ==0.2 + - codec-beam ==0.2.0 + - codec-rpm ==0.2.2 + - coercible-utils ==0.1.0 - Color ==0.1.4 - colorful-monoids ==0.2.1.3 - colorize-haskell ==1.0.1 @@ -500,8 +500,8 @@ default-package-overrides: - conferer-hspec ==0.4.0.1 - conferer-source-json ==0.4.0.1 - conferer-warp ==0.4.0.1 - - ConfigFile ==1.1.4 - config-ini ==0.2.4.0 + - ConfigFile ==1.1.4 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - configurator-pg ==0.2.4 @@ -509,8 +509,8 @@ default-package-overrides: - connection-pool ==0.2.2 - console-style ==0.0.2.1 - constraint ==0.1.4.0 - - constraints ==0.12 - constraint-tuples ==0.1.2 + - constraints ==0.12 - contravariant ==1.5.2 - contravariant-extras ==0.3.5.2 - control-bool ==0.2.1 @@ -533,10 +533,16 @@ default-package-overrides: - criterion ==1.5.6.2 - criterion-measurement ==0.1.2.0 - cron ==0.7.0 + - crypt-sha512 ==0 - crypto-api ==0.13.3 - crypto-cipher-types ==0.0.9 - - cryptocompare ==0.1.1 - crypto-enigma ==0.1.1.6 + - crypto-numbers ==0.2.7 + - crypto-pubkey ==0.2.8 + - crypto-pubkey-types ==0.4.3 + - crypto-random ==0.0.9 + - crypto-random-api ==0.2.0 + - cryptocompare ==0.1.2 - cryptohash ==0.11.9 - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 @@ -546,12 +552,6 @@ default-package-overrides: - cryptonite ==0.26 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 - - crypto-numbers ==0.2.7 - - crypto-pubkey ==0.2.8 - - crypto-pubkey-types ==0.4.3 - - crypto-random ==0.0.9 - - crypto-random-api ==0.2.0 - - crypt-sha512 ==0 - csp ==1.4.0 - css-syntax ==0.1.0.0 - css-text ==0.1.3.0 @@ -588,7 +588,6 @@ default-package-overrides: - data-default-instances-dlist ==0.0.1 - data-default-instances-old-locale ==0.0.1 - data-diverse ==4.7.0.0 - - datadog ==0.2.5.0 - data-dword ==0.3.2 - data-endian ==0.1.1 - data-fix ==0.2.1 @@ -607,6 +606,7 @@ default-package-overrides: - data-serializer ==0.3.4.1 - data-textual ==0.3.0.3 - data-tree-print ==0.1.0.2 + - datadog ==0.2.5.0 - dataurl ==0.1.0.0 - DAV ==1.3.4 - DBFunctor ==0.1.1.1 @@ -635,6 +635,8 @@ default-package-overrides: - dhall-json ==1.6.4 - dhall-lsp-server ==1.0.8 - dhall-yaml ==1.1.0 + - di-core ==1.0.4 + - di-monad ==1.3.1 - diagrams ==1.4 - diagrams-contrib ==1.4.4 - diagrams-core ==1.4.2 @@ -644,13 +646,11 @@ default-package-overrides: - diagrams-solve ==0.1.2 - diagrams-svg ==1.4.3 - dialogflow-fulfillment ==0.1.1.3 - - di-core ==1.0.4 - dictionary-sharing ==0.1.0.0 - Diff ==0.4.0 - digest ==0.0.1.2 - digits ==0.3.1 - dimensional ==1.3 - - di-monad ==1.3.1 - directory-tree ==0.12.1 - discount ==0.1.1 - disk-free-space ==0.1.0.1 @@ -662,6 +662,8 @@ default-package-overrides: - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - dns ==4.0.1 + - do-list ==1.0.1 + - do-notation ==0.1.0.2 - dockerfile ==0.2.0 - doclayout ==0.3 - doctemplates ==0.8.2 @@ -669,8 +671,6 @@ default-package-overrides: - doctest-discover ==0.2.0.0 - doctest-driver-gen ==0.3.0.2 - doldol ==0.4.1.2 - - do-list ==1.0.1 - - do-notation ==0.1.0.2 - dotenv ==0.8.0.7 - dotgen ==0.4.3 - dotnet-timespan ==0.0.1.0 @@ -710,19 +710,19 @@ default-package-overrides: - elerea ==2.9.0 - elf ==0.30 - eliminators ==0.6 - - elm2nix ==0.2 - elm-bridge ==0.6.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 + - elm2nix ==0.2 - emacs-module ==0.1.1 - email-validate ==2.3.2.13 - emojis ==0.1 - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 - entropy ==0.4.1.6 + - enum-subset-generate ==0.1.0.0 - enummapset ==0.6.0.3 - enumset ==0.0.5 - - enum-subset-generate ==0.1.0.0 - envelope ==0.2.2.0 - envy ==2.1.0.0 - epub-metadata ==4.5 @@ -739,23 +739,23 @@ default-package-overrides: - essence-of-live-coding-pulse ==0.1.0.3 - essence-of-live-coding-quickcheck ==0.1.0.3 - etc ==0.4.1.0 + - event-list ==0.1.2 - eventful-core ==0.2.0 - eventful-test-helpers ==0.2.0 - - event-list ==0.1.2 - eventstore ==1.4.1 - every ==0.0.1 - exact-combinatorics ==0.2.0.9 - exact-pi ==0.5.0.1 - exception-hierarchy ==0.1.0.3 - exception-mtl ==0.4.0.1 - - exceptions ==0.10.4 - exception-transformers ==0.4.0.9 + - exceptions ==0.10.4 - executable-path ==0.0.3.1 - exit-codes ==1.0.0 - exomizer ==1.0.0 + - exp-pairs ==0.2.0.0 - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.10 - - exp-pairs ==0.2.0.0 - express ==0.1.3 - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 @@ -778,13 +778,13 @@ default-package-overrides: - FenwickTree ==0.1.2.1 - fft ==0.1.8.6 - fgl ==5.7.0.3 - - filecache ==0.4.1 - file-embed ==0.0.11.2 - file-embed-lzma ==0 - - filelock ==0.1.1.5 - - filemanip ==0.3.6.3 - file-modules ==0.1.2.4 - file-path-th ==0.1.0.0 + - filecache ==0.4.1 + - filelock ==0.1.1.5 + - filemanip ==0.3.6.3 - filepattern ==0.1.2 - fileplow ==0.1.0.0 - filtrable ==0.1.4.0 @@ -813,9 +813,9 @@ default-package-overrides: - fn ==0.3.0.2 - focus ==1.0.1.3 - focuslist ==0.1.0.2 - - foldable1 ==0.1.0.0 - fold-debounce ==0.2.0.9 - fold-debounce-conduit ==0.2.0.5 + - foldable1 ==0.1.0.0 - foldl ==1.4.6 - folds ==0.7.5 - follow-file ==0.0.3 @@ -830,10 +830,10 @@ default-package-overrides: - foundation ==0.0.25 - free ==5.1.3 - free-categories ==0.2.0.0 + - free-vl ==0.1.4 - freenect ==1.2.1 - freer-simple ==1.2.1.1 - freetype2 ==0.2.0 - - free-vl ==0.1.4 - friendly-time ==0.4.1 - from-sum ==0.2.3.0 - frontmatter ==0.1.0.2 @@ -850,8 +850,8 @@ default-package-overrides: - fuzzcheck ==0.1.1 - fuzzy ==0.1.0.0 - fuzzy-dates ==0.1.1.2 - - fuzzyset ==0.2.0 - fuzzy-time ==0.1.0.0 + - fuzzyset ==0.2.0 - gauge ==0.2.5 - gd ==3000.7.3 - gdp ==0.0.3.0 @@ -864,8 +864,8 @@ default-package-overrides: - generic-lens-core ==2.0.0.0 - generic-monoid ==0.1.0.1 - generic-optics ==2.0.0.0 - - GenericPretty ==1.2.2 - generic-random ==1.3.0.1 + - GenericPretty ==1.2.2 - generics-sop ==0.5.1.0 - generics-sop-lens ==0.2.0.1 - genvalidity ==0.11.0.0 @@ -899,9 +899,6 @@ default-package-overrides: - ghc-core ==0.5.6 - ghc-events ==0.13.0 - ghc-exactprint ==0.6.2 - - ghcid ==0.8.7 - - ghci-hexcalc ==0.1.1.0 - - ghcjs-codemirror ==0.0.0.2 - ghc-lib ==8.10.2.20200916 - ghc-lib-parser ==8.10.2.20200916 - ghc-lib-parser-ex ==8.10.0.16 @@ -915,6 +912,9 @@ default-package-overrides: - ghc-typelits-knownnat ==0.7.3 - ghc-typelits-natnormalise ==0.7.2 - ghc-typelits-presburger ==0.3.0.1 + - ghci-hexcalc ==0.1.1.0 + - ghcid ==0.8.7 + - ghcjs-codemirror ==0.0.0.2 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.21 - gi-cairo ==1.0.23 @@ -931,16 +931,16 @@ default-package-overrides: - gi-graphene ==1.0.1 - gi-gtk ==3.0.33 - gi-gtk-hs ==0.3.8.1 + - gi-pango ==1.0.22 + - gi-xlib ==2.0.8 - ginger ==0.10.1.0 - gingersnap ==0.3.1.0 - - gi-pango ==1.0.22 - giphy-api ==0.7.0.0 - githash ==0.1.4.0 - github-rest ==1.0.3 - github-types ==0.2.1 - gitlab-haskell ==0.1.8 - gitrev ==1.3.1 - - gi-xlib ==2.0.8 - gl ==0.9 - glabrous ==2.0.2 - GLFW-b ==3.3.0.0 @@ -955,10 +955,10 @@ default-package-overrides: - gothic ==0.1.5 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 + - graph-wrapper ==0.2.6.0 - graphite ==0.10.0.1 - graphs ==0.7.1 - graphviz ==2999.20.1.0 - - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 - greskell ==1.1.0.3 - greskell-core ==0.1.3.5 @@ -1037,9 +1037,9 @@ default-package-overrides: - hexstring ==0.11.1 - hformat ==0.3.3.1 - hfsevents ==0.1.6 + - hi-file-parser ==0.1.0.0 - hidapi ==0.1.5 - hie-bios ==0.5.1 - - hi-file-parser ==0.1.0.0 - higher-leveldb ==0.5.0.2 - highlighting-kate ==0.6.4 - hinfo ==0.0.3.0 @@ -1075,14 +1075,15 @@ default-package-overrides: - hreader-lens ==0.1.3.0 - hruby ==0.3.8 - hs-bibutils ==6.10.0.0 + - hs-functors ==0.1.7.1 + - hs-GeoIP ==0.3 + - hs-php-session ==0.0.9.3 - hsc2hs ==0.68.7 - hscolour ==1.24.4 - hsdns ==1.8 - hsebaysdk ==0.4.1.0 - hsemail ==2.2.0 - hset ==2.2.0 - - hs-functors ==0.1.7.1 - - hs-GeoIP ==0.3 - hsini ==0.5.1.2 - hsinstall ==2.6 - HSlippyMap ==3.0.1 @@ -1115,7 +1116,6 @@ default-package-overrides: - hspec-tables ==0.0.1 - hspec-wai ==0.10.1 - hspec-wai-json ==0.10.1 - - hs-php-session ==0.0.9.3 - hsshellscript ==3.4.5 - HStringTemplate ==0.8.7 - HSvm ==0.1.1.3.22 @@ -1129,7 +1129,6 @@ default-package-overrides: - html-entities ==1.1.4.3 - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - - http2 ==2.0.5 - HTTP ==4000.3.15 - http-api-data ==0.4.1.1 - http-client ==0.6.4.1 @@ -1138,15 +1137,16 @@ default-package-overrides: - http-client-tls ==0.3.5.3 - http-common ==0.8.2.1 - http-conduit ==2.3.7.3 - - http-date ==0.0.8 + - http-date ==0.0.9 - http-directory ==0.1.8 - http-download ==0.2.0.0 - - httpd-shed ==0.4.1.1 - http-link-header ==1.0.3.1 - http-media ==0.8.0.0 - http-reverse-proxy ==0.6.0 - http-streams ==0.8.7.2 - http-types ==0.12.3 + - http2 ==2.0.5 + - httpd-shed ==0.4.1.1 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.0.0 - HUnit-approx ==1.1.1.1 @@ -1158,7 +1158,6 @@ default-package-overrides: - hw-conduit ==0.2.1.0 - hw-conduit-merges ==0.2.1.0 - hw-diagnostics ==0.0.1.0 - - hweblib ==0.6.3 - hw-excess ==0.2.3.0 - hw-fingertree ==0.1.2.0 - hw-fingertree-strict ==0.1.2.0 @@ -1172,6 +1171,7 @@ default-package-overrides: - hw-rankselect-base ==0.3.4.1 - hw-streams ==0.0.1.0 - hw-string-parse ==0.0.0.4 + - hweblib ==0.6.3 - hxt ==9.3.1.18 - hxt-charproperties ==9.4.0.0 - hxt-css ==0.1.0.3 @@ -1209,7 +1209,7 @@ default-package-overrides: - influxdb ==1.7.1.6 - ini ==0.4.1 - inj ==1.0 - - inline-c ==0.9.1.0 + - inline-c ==0.9.1.2 - inline-c-cpp ==0.4.0.2 - inliterate ==0.1.0 - insert-ordered-containers ==0.2.3.1 @@ -1252,10 +1252,10 @@ default-package-overrides: - iso3166-country-codes ==0.20140203.8 - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - - iterable ==3.0 - it-has ==0.2.0.0 - - ixset-typed ==0.5 + - iterable ==3.0 - ix-shapable ==0.1.0 + - ixset-typed ==0.5 - jack ==0.7.1.4 - jira-wiki-markup ==1.1.4 - jose ==0.8.3.1 @@ -1265,9 +1265,9 @@ default-package-overrides: - js-jquery ==3.3.1 - json-alt ==1.0.0 - json-feed ==1.0.11 - - jsonpath ==0.2.0.0 - json-rpc ==1.0.3 - json-rpc-generic ==0.2.1.5 + - jsonpath ==0.2.0.0 - JuicyPixels ==3.3.5 - JuicyPixels-blurhash ==0.1.0.3 - JuicyPixels-extra ==0.4.1 @@ -1339,20 +1339,20 @@ default-package-overrides: - libyaml ==0.1.2 - LibZip ==1.0.1 - life-sync ==1.1.1.0 + - lift-generics ==0.1.3 - lifted-async ==0.10.1.2 - lifted-base ==0.2.3.12 - - lift-generics ==0.1.3 - line ==4.0.1 - linear ==1.21.1 - linenoise ==0.3.2 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - List ==0.6.2 - - ListLike ==4.7.2 - list-predicate ==0.1.0.1 - - listsafe ==0.1.0.1 - list-singleton ==1.0.0.4 - list-t ==1.0.4 + - ListLike ==4.7.2 + - listsafe ==0.1.0.1 - ListTree ==0.2.3 - little-logger ==0.1.0 - little-rio ==0.1.1 @@ -1382,8 +1382,8 @@ default-package-overrides: - lzma-conduit ==1.2.1 - machines ==0.7 - magic ==1.1 - - mainland-pretty ==0.7.0.1 - main-tester ==0.2.0.1 + - mainland-pretty ==0.7.0.1 - makefile ==1.1.0.0 - managed ==1.0.8 - markdown ==0.1.17.4 @@ -1392,9 +1392,9 @@ default-package-overrides: - massiv ==0.5.4.0 - massiv-io ==0.2.1.0 - massiv-test ==0.1.4 - - mathexpr ==0.3.0.0 - math-extras ==0.1.1.0 - math-functions ==0.3.4.1 + - mathexpr ==0.3.0.0 - matplotlib ==0.7.5 - matrices ==0.5.0 - matrix ==0.3.6.1 @@ -1435,12 +1435,12 @@ default-package-overrides: - mime-mail ==0.5.0 - mime-mail-ses ==0.4.3 - mime-types ==0.1.0.9 + - min-max-pqueue ==0.1.0.2 - mini-egison ==1.0.0 - minimal-configuration ==0.1.4 - minimorph ==0.2.2.0 - minio-hs ==1.5.2 - miniutter ==0.5.1.0 - - min-max-pqueue ==0.1.0.2 - mintty ==0.1.2 - miso ==1.6.0.0 - missing-foreign ==0.1.1 @@ -1464,35 +1464,35 @@ default-package-overrides: - monad-control-aligned ==0.0.1.1 - monad-coroutine ==0.9.0.4 - monad-extras ==0.6.0 - - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 - monad-logger ==0.3.35 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.11 - monad-loops ==0.4.3 - - monad-memo ==0.5.1 + - monad-memo ==0.5.3 - monad-metrics ==0.2.1.4 - monad-par ==0.3.5 - - monad-parallel ==0.7.2.3 - monad-par-extras ==0.3.3 + - monad-parallel ==0.7.2.3 - monad-peel ==0.2.1.2 - monad-products ==4.0.1 - - MonadPrompt ==1.0.0.5 - - MonadRandom ==0.5.2 - monad-resumption ==0.1.4.0 - monad-skeleton ==0.1.5 - monad-st ==0.2.4.1 - - monads-tf ==0.1.0.3 - monad-time ==0.3.1.0 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.1 + - monadic-arrays ==0.2.2 + - MonadPrompt ==1.0.0.5 + - MonadRandom ==0.5.2 + - monads-tf ==0.1.0.3 - mongoDB ==2.7.0.0 - - monoid-extras ==0.5.1 - - monoid-subclasses ==1.0.1 - - monoid-transformer ==0.0.4 - mono-traversable ==1.0.15.1 - mono-traversable-instances ==0.1.1.0 - mono-traversable-keys ==0.1.0 + - monoid-extras ==0.5.1 + - monoid-subclasses ==1.0.1 + - monoid-transformer ==0.0.4 - more-containers ==0.2.2.0 - morpheus-graphql ==0.12.0 - morpheus-graphql-core ==0.12.0 @@ -1502,13 +1502,13 @@ default-package-overrides: - mpi-hs-cereal ==0.1.0.0 - mtl-compat ==0.2.2 - mtl-prelude ==2.0.3.1 - - multiarg ==0.30.0.10 - multi-containers ==0.1.1 + - multiarg ==0.30.0.10 - multimap ==1.2.1 - multiset ==0.3.4.3 - multistate ==0.8.0.3 - - murmur3 ==1.0.4 - murmur-hash ==0.1.0.9 + - murmur3 ==1.0.4 - MusicBrainz ==0.4.1 - mustache ==2.3.1 - mutable-containers ==0.3.4 @@ -1555,16 +1555,16 @@ default-package-overrides: - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - nix-paths ==1.0.1 + - no-value ==1.0.0.0 + - non-empty ==0.3.2 + - non-empty-sequence ==0.2.0.4 + - non-negative ==0.1.2 - nonce ==1.0.7 - nondeterminism ==1.4 - - non-empty ==0.3.2 - nonempty-containers ==0.3.4.1 - - nonemptymap ==0.0.6.0 - - non-empty-sequence ==0.2.0.4 - nonempty-vector ==0.2.0.2 - - non-negative ==0.1.2 + - nonemptymap ==0.0.6.0 - not-gloss ==0.7.7.0 - - no-value ==1.0.0.0 - nowdoc ==0.1.1.0 - nqe ==0.6.3 - nsis ==0.3.3 @@ -1575,9 +1575,9 @@ default-package-overrides: - NumInstances ==1.4 - numtype-dk ==0.5.0.2 - nuxeo ==0.3.2 + - o-clock ==1.1.0 - oauthenticated ==0.2.1.0 - ObjectName ==1.1.0.1 - - o-clock ==1.1.0 - odbc ==0.2.2 - oeis2 ==1.0.4 - ofx ==0.4.4.0 @@ -1590,8 +1590,8 @@ default-package-overrides: - Only ==0.1 - oo-prototypes ==0.1.0.0 - opaleye ==0.6.7006.1 - - OpenAL ==1.7.0.5 - open-browser ==0.2.1.0 + - OpenAL ==1.7.0.5 - openexr-write ==0.1.0.2 - OpenGL ==3.0.3.0 - OpenGLRaw ==3.3.4.0 @@ -1616,7 +1616,7 @@ default-package-overrides: - optparse-simple ==0.1.1.3 - optparse-text ==0.1.1.0 - ordered-containers ==0.2.2 - - ormolu ==0.1.2.0 + - ormolu ==0.1.3.0 - overhang ==1.0.0 - packcheck ==0.5.1 - pager ==0.1.1.0 @@ -1671,14 +1671,14 @@ default-package-overrides: - persistent-mysql ==2.10.2.3 - persistent-pagination ==0.1.1.1 - persistent-postgresql ==2.10.1.2 - - persistent-qq ==2.9.1.1 + - persistent-qq ==2.9.2 - persistent-sqlite ==2.10.6.2 - persistent-template ==2.8.2.3 - persistent-test ==2.0.3.1 - persistent-typed-db ==0.1.0.1 - pg-harness-client ==0.6.0 - - pgp-wordlist ==0.1.0.3 - pg-transact ==0.3.1.1 + - pgp-wordlist ==0.1.0.3 - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 - pipes ==4.3.14 @@ -1717,33 +1717,33 @@ default-package-overrides: - port-utils ==0.2.1.0 - posix-paths ==0.2.1.6 - possibly ==1.0.0.0 + - post-mess-age ==0.2.1.0 - postgres-options ==0.2.0.0 - postgresql-binary ==0.12.2 - postgresql-libpq ==0.9.4.2 - postgresql-orm ==0.5.1 - postgresql-simple ==0.6.2 - postgrest ==7.0.0 - - post-mess-age ==0.2.1.0 - pptable ==0.3.0.0 - pqueue ==1.4.1.3 - prefix-units ==0.2.0 - prelude-compat ==0.0.0.2 - prelude-safeenum ==0.1.1.2 - - prettyclass ==1.0.0.0 - pretty-class ==1.0.1.1 - pretty-hex ==1.1 - - prettyprinter ==1.6.2 - - prettyprinter-ansi-terminal ==1.1.2 - - prettyprinter-compat-annotated-wl-pprint ==1 - - prettyprinter-compat-ansi-wl-pprint ==1.0.1 - - prettyprinter-compat-wl-pprint ==1.0.0.1 - - prettyprinter-convert-ansi-wl-pprint ==1.1.1 - pretty-relative-time ==0.2.0.0 - pretty-show ==1.10 - pretty-simple ==3.2.3.0 - pretty-sop ==0.2.0.3 - pretty-terminal ==0.1.0.0 - pretty-types ==0.3.0.1 + - prettyclass ==1.0.0.0 + - prettyprinter ==1.6.2 + - prettyprinter-ansi-terminal ==1.1.2 + - prettyprinter-compat-annotated-wl-pprint ==1 + - prettyprinter-compat-ansi-wl-pprint ==1.0.1 + - prettyprinter-compat-wl-pprint ==1.0.0.1 + - prettyprinter-convert-ansi-wl-pprint ==1.1.1 - primes ==0.2.1.0 - primitive ==0.7.0.1 - primitive-addr ==0.1.0.2 @@ -1754,17 +1754,12 @@ default-package-overrides: - product-profunctors ==0.10.0.1 - profiterole ==0.1 - profunctors ==5.5.2 - - projectroot ==0.2.0.1 - project-template ==0.2.1.0 + - projectroot ==0.2.0.1 - prometheus-client ==1.0.1 - promises ==0.3 - prompt ==0.1.1.2 - prospect ==0.1.0.0 - - proto3-wire ==1.1.0 - - protobuf ==0.2.1.3 - - protobuf-simple ==0.1.1.0 - - protocol-radius ==0.0.1.1 - - protocol-radius-test ==0.1.0.1 - proto-lens ==0.7.0.0 - proto-lens-arbitrary ==0.1.2.9 - proto-lens-optparse ==0.1.1.7 @@ -1772,6 +1767,11 @@ default-package-overrides: - proto-lens-protoc ==0.7.0.0 - proto-lens-runtime ==0.7.0.0 - proto-lens-setup ==0.4.0.4 + - proto3-wire ==1.1.0 + - protobuf ==0.2.1.3 + - protobuf-simple ==0.1.1.0 + - protocol-radius ==0.0.1.1 + - protocol-radius-test ==0.1.0.1 - protolude ==0.2.4 - proxied ==0.3.1 - psqueues ==0.2.7.2 @@ -1813,25 +1813,25 @@ default-package-overrides: - random-shuffle ==0.0.4 - random-tree ==0.6.0.5 - range ==0.3.0.2 - - Ranged-sets ==0.4.0 - range-set-list ==0.1.3.1 + - Ranged-sets ==0.4.0 - rank1dynamic ==0.4.0 - rank2classes ==1.3.2.1 - - Rasterific ==0.7.5.2 + - Rasterific ==0.7.5.3 - rasterific-svg ==0.3.3.2 - - ratel ==1.0.12 - rate-limit ==1.4.2 + - ratel ==1.0.12 - ratel-wai ==1.1.3 + - raw-strings-qq ==1.1 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 - - raw-strings-qq ==1.1 - rcu ==0.2.4 - rdf ==0.1.0.4 - rdtsc ==1.3.0.1 - re2 ==0.3 - - readable ==0.3.1 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 + - readable ==0.3.1 - reanimate ==0.3.3.0 - reanimate-svg ==0.9.8.0 - rebase ==1.6.1 @@ -1840,8 +1840,8 @@ default-package-overrides: - records-sop ==0.1.0.3 - recursion-schemes ==5.1.3 - reducers ==3.12.3 - - refact ==0.3.0.2 - ref-fd ==0.4.0.2 + - refact ==0.3.0.2 - reflection ==2.1.6 - reform ==0.2.7.4 - reform-blaze ==0.2.4.3 @@ -1900,14 +1900,14 @@ default-package-overrides: - RSA ==2.4.1 - runmemo ==1.0.0.1 - safe ==0.3.19 - - safecopy ==0.10.3 - safe-decimal ==0.2.0.0 - safe-exceptions ==0.1.7.1 - safe-exceptions-checked ==0.1.0 - safe-foldable ==0.1.0.0 - - safeio ==0.0.5.0 - safe-json ==1.1.1 - safe-money ==0.9 + - safecopy ==0.10.3 + - safeio ==0.0.5.0 - SafeSemaphore ==0.10.1 - salak ==0.3.6 - salak-yaml ==0.3.5.3 @@ -1943,8 +1943,8 @@ default-package-overrides: - semigroupoid-extras ==5 - semigroupoids ==5.3.4 - semigroups ==0.19.1 - - semirings ==0.5.4 - semiring-simple ==1.0.0.1 + - semirings ==0.5.4 - semver ==0.3.4 - sendfile ==0.7.11.1 - seqalign ==0.2.0.4 @@ -2000,9 +2000,9 @@ default-package-overrides: - shared-memory ==0.2.0.0 - shell-conduit ==4.7.0 - shell-escape ==0.2.0 + - shell-utility ==0.1 - shellmet ==0.0.3.1 - shelltestrunner ==1.9 - - shell-utility ==0.1 - shelly ==1.9.0 - should-not-typecheck ==2.1.0 - show-combinators ==0.2.0.0 @@ -2016,9 +2016,9 @@ default-package-overrides: - simple-log ==0.9.12 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.30 - - simplest-sqlite ==0.1.0.2 - simple-templates ==1.0.0 - simple-vec3 ==0.6.0.1 + - simplest-sqlite ==0.1.0.2 - simplistic-generics ==2.0.0 - since ==0.0.0 - singleton-bool ==0.1.5 @@ -2068,14 +2068,14 @@ default-package-overrides: - splitmix ==0.0.5 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 + - sql-words ==0.1.6.4 - sqlcli ==0.2.2.0 - sqlcli-odbc ==0.2.0.1 - - sql-words ==0.1.6.4 - squeather ==0.4.0.0 - srcloc ==0.5.1.2 - stache ==2.1.1 - - stackcollapse-ghc ==0.0.1.2 - stack-templatizer ==0.1.0.2 + - stackcollapse-ghc ==0.0.1.2 - starter ==0.3.0 - stateref ==0.3 - statestack ==0.3 @@ -2108,15 +2108,15 @@ default-package-overrides: - strict-list ==0.1.5 - strict-tuple ==0.1.3 - strict-tuple-lens ==0.1.0.1 - - stringbuilder ==0.5.1 - string-class ==0.1.7.0 - string-combinators ==0.6.0.5 - string-conv ==0.1.2 - string-conversions ==0.4.0.1 - string-interpolate ==0.2.1.0 - string-qq ==0.0.4 - - stringsearch ==0.3.6.6 - string-transform ==1.1.1 + - stringbuilder ==0.5.1 + - stringsearch ==0.3.6.6 - stripe-concepts ==1.0.2.4 - stripe-signature ==1.0.0.6 - strive ==5.0.12 @@ -2124,14 +2124,14 @@ default-package-overrides: - structured ==0.1 - structured-cli ==2.5.2.0 - stylish-haskell ==0.11.0.3 + - sum-type-boilerplate ==0.1.1 - summoner ==2.0.1.1 - summoner-tui ==2.0.1.1 - - sum-type-boilerplate ==0.1.1 - sundown ==0.6 - superbuffer ==0.3.1.1 - svg-builder ==0.1.1 - - SVGFonts ==1.7.0.1 - svg-tree ==0.6.2.4 + - SVGFonts ==1.7.0.1 - swagger ==0.3.0 - swagger2 ==2.5 - swish ==0.10.0.4 @@ -2141,10 +2141,10 @@ default-package-overrides: - symmetry-operations-symbols ==0.0.2.1 - sysinfo ==0.1.1 - system-argv0 ==0.1.1 - - systemd ==2.3.0 - system-fileio ==0.3.16.4 - system-filepath ==0.4.14 - system-info ==0.5.1 + - systemd ==2.3.0 - tabular ==0.2.2.8 - taffybar ==3.2.2 - tagchup ==0.4.1.1 @@ -2198,14 +2198,13 @@ 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.2 + - texmath ==0.12.0.3 - text-binary ==0.2.1.1 - text-builder ==0.6.6.1 - text-conversions ==0.3.0 - text-icu ==0.7.0.1 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.13 - - textlocal ==0.1.0.5 - text-manipulate ==0.2.0.1 - text-metrics ==0.3.0 - text-postgresql ==0.0.3.1 @@ -2215,17 +2214,15 @@ default-package-overrides: - text-show ==3.8.5 - text-show-instances ==3.8.3 - text-zipper ==0.10.1 - - tfp ==1.0.1.1 + - textlocal ==0.1.0.5 - tf-random ==0.5 + - tfp ==1.0.1.1 - th-abstraction ==0.3.2.0 - th-bang-compat ==0.0.1.0 - th-constraint-compat ==0.0.1.0 - th-data-compat ==0.1.0.0 - th-desugar ==1.10 - th-env ==0.1.0.2 - - these ==1.1.1.1 - - these-lens ==1.0.0.1 - - these-optics ==1 - th-expand-syns ==0.4.6.0 - th-extras ==0.0.0.4 - th-lift ==0.8.1 @@ -2233,31 +2230,34 @@ default-package-overrides: - th-nowq ==0.1.0.5 - th-orphans ==0.13.10 - th-printf ==0.7 - - thread-hierarchy ==0.3.0.2 - - thread-local-storage ==0.2 - - threads ==0.5.1.6 - - thread-supervisor ==0.1.0.1 - - threepenny-gui ==0.9.0.0 - th-reify-compat ==0.0.1.5 - th-reify-many ==0.1.9 + - th-strict-compat ==0.1.0.1 + - th-test-utils ==1.0.2 + - these ==1.1.1.1 + - these-lens ==1.0.0.1 + - these-optics ==1 + - thread-hierarchy ==0.3.0.2 + - thread-local-storage ==0.2 + - thread-supervisor ==0.1.0.1 + - threads ==0.5.1.6 + - threepenny-gui ==0.9.0.0 - throttle-io-stream ==0.2.0.1 - through-text ==0.1.0.0 - throwable-exceptions ==0.1.0.9 - - th-strict-compat ==0.1.0.1 - - th-test-utils ==1.0.2 - thyme ==0.3.5.5 - tidal ==1.5.2 - tile ==0.3.0.0 - time-compat ==1.9.3 - - timeit ==2.0 - - timelens ==0.2.0.2 - time-lens ==0.4.0.2 - time-locale-compat ==0.1.1.5 - time-locale-vietnamese ==1.0.0.0 - time-manager ==0.0.0 - time-parsers ==0.1.2.1 - - timerep ==2.0.0.2 - time-units ==1.0.0 + - timeit ==2.0 + - timelens ==0.2.0.2 + - timerep ==2.0.0.2 - timezone-olson ==0.2.0 - timezone-series ==0.1.9 - tinylog ==0.15.0 @@ -2269,7 +2269,7 @@ default-package-overrides: - tmapchan ==0.0.3 - tmapmvar ==0.0.4 - tmp-postgres ==1.34.1.0 - - tomland ==1.3.0.0 + - tomland ==1.3.1.0 - tonalude ==0.1.1.0 - topograph ==1.0.0.1 - torsor ==0.1 @@ -2287,17 +2287,14 @@ default-package-overrides: - triplesec ==0.2.2.1 - trivial-constraint ==0.6.0.0 - tsv2csv ==0.1.0.2 - - ttc ==0.2.2.0 + - ttc ==0.2.3.0 - ttl-hashtables ==1.4.1.0 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 - - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 + - tuples-homogenous-h98 ==0.1.1.0 - turtle ==1.5.20 - - TypeCompose ==0.9.14 - - typed-process ==0.2.6.0 - - typed-uuid ==0.0.0.2 - type-equality ==1 - type-errors ==0.2.0.0 - type-errors-pretty ==0.0.1.1 @@ -2308,12 +2305,15 @@ default-package-overrides: - type-level-numbers ==0.1.1.1 - type-map ==0.1.6.0 - type-natural ==0.8.3.1 - - typenums ==0.1.2.1 - 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.3.0 - type-spec ==0.4.0.0 + - TypeCompose ==0.9.14 + - typed-process ==0.2.6.0 + - typed-uuid ==0.0.0.2 + - typenums ==0.1.2.1 + - typerep-map ==0.3.3.0 - tzdata ==0.1.20190911.0 - ua-parser ==0.7.5.1 - uglymemo ==0.1.0.1 @@ -2413,7 +2413,7 @@ default-package-overrides: - wai-cors ==0.2.7 - wai-enforce-https ==0.0.2.1 - wai-eventsource ==3.0.0 - - wai-extra ==3.0.31 + - wai-extra ==3.0.32 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.3.6 - wai-middleware-caching ==0.1.0.2 @@ -2442,19 +2442,19 @@ default-package-overrides: - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witherable-class ==0 - - within ==0.1.1.0 - with-location ==0.1.0 - with-utf8 ==1.0.2.1 + - witherable-class ==0 + - within ==0.1.1.0 - witness ==0.4 - wizards ==1.0.3 - wl-pprint-annotated ==0.1.0.1 - wl-pprint-console ==0.1.0.2 - wl-pprint-text ==1.2.0.1 - - word24 ==2.0.1 - - word8 ==0.1.3 - word-trie ==0.3.0 - word-wrap ==0.4.1 + - word24 ==2.0.1 + - word8 ==0.1.3 - world-peace ==1.0.2.0 - wrap ==0.0.0 - wreq ==0.5.3.2 @@ -2482,7 +2482,6 @@ default-package-overrides: - xml-basic ==0.1.3.1 - xml-conduit ==1.9.0.0 - xml-conduit-writer ==0.1.1.2 - - xmlgen ==0.6.2.2 - xml-hamlet ==0.5.0.1 - xml-helpers ==1.0.0 - xml-html-qq ==0.1.0.1 @@ -2492,6 +2491,7 @@ default-package-overrides: - xml-to-json ==2.0.1 - xml-to-json-fast ==2.0.0 - xml-types ==0.3.8 + - xmlgen ==0.6.2.2 - xmonad ==0.15 - xmonad-contrib ==0.16 - xmonad-extras ==0.15.2 @@ -2500,12 +2500,13 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.5.0 - yamlparse-applicative ==0.1.0.1 + - yes-precure5-command ==5.5.3 - yesod ==1.6.1.0 - yesod-auth ==1.6.10 - yesod-auth-fb ==1.10.1 - yesod-auth-hashdb ==1.7.1.2 - yesod-bin ==1.6.0.6 - - yesod-core ==1.6.18 + - yesod-core ==1.6.18.4 - yesod-fb ==0.6.1 - yesod-form ==1.6.7 - yesod-form-bootstrap4 ==3.0.0 @@ -2517,7 +2518,6 @@ default-package-overrides: - yesod-static ==1.6.1.0 - yesod-test ==1.6.10 - yesod-websockets ==0.3.0.2 - - yes-precure5-command ==5.5.3 - yi-rope ==0.11 - yjsvg ==0.2.0.1 - yjtools ==0.9.18 @@ -2530,8 +2530,8 @@ default-package-overrides: - zim-parser ==0.2.1.0 - zip ==1.5.0 - zip-archive ==0.4.1 - - zippers ==0.3 - zip-stream ==0.2.0.1 + - zippers ==0.3 - zlib ==0.6.2.2 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 @@ -2589,6 +2589,7 @@ extra-packages: - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below - network == 3.0.* # required by network-bsd, HTTP, and many others (2019-04-30) - ormolu == 0.0.5.0 # required by haskell-language-server + - pandoc-types == 1.21 # required by for pandoc_2_10_1 - pantry == 0.2.0.0 # required by stack-2.1.3.1 - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3 - patience ^>= 0.1 # required by chell-0.4.x @@ -3581,7 +3582,6 @@ broken-packages: - buster - buster-gtk - buster-network - - bustle - butter - butterflies - bv-sized @@ -3862,6 +3862,9 @@ broken-packages: - clexer - CLI - cli-builder + - cli-extras + - cli-git + - cli-nix - clif - clifford - clifm @@ -3978,9 +3981,11 @@ broken-packages: - complexity - compose-trans - composite-aeson + - composite-aeson-cofree-list - composite-aeson-path - composite-aeson-refined - composite-aeson-throw + - composite-aeson-writeonly - composite-binary - composite-ekg - composite-opaleye @@ -7439,8 +7444,6 @@ broken-packages: - llvm-general - llvm-general-pure - llvm-general-quote - - llvm-hs - - llvm-hs-pretty - llvm-ht - llvm-pkg-config - llvm-pretty @@ -7502,7 +7505,6 @@ broken-packages: - loopy - lord - lorem - - lorentz - loris - loshadka - lostcities @@ -7877,7 +7879,6 @@ broken-packages: - moo - morfette - morfeusz - - morley - morpheus-graphql-cli - morpheus-graphql-client - morphisms-functors @@ -8151,6 +8152,7 @@ broken-packages: - nix-deploy - nix-eval - nix-freeze-tree + - nix-thunk - nix-tools - nixfromnpm - nixpkgs-update @@ -8187,6 +8189,8 @@ broken-packages: - np-extras - np-linear - nptools + - nri-env-parser + - nri-prelude - ntp-control - ntrip-client - null-canvas @@ -8677,10 +8681,12 @@ broken-packages: - polydata - polydata-core - polynomial + - polysemy-chronos - polysemy-http - polysemy-optics - polysemy-RandomFu - polysemy-test + - polysemy-time - polysemy-webserver - polysemy-zoo - polyseq @@ -8832,6 +8838,7 @@ broken-packages: - prolog-graph - prolog-graph-lib - prologue + - prolude - prometheus-effect - promise - pronounce @@ -10111,8 +10118,6 @@ broken-packages: - SuffixStructures - sugarhaskell - suitable - - summoner - - summoner-tui - sump - sunlight - sunroof-compiler @@ -10222,6 +10227,7 @@ broken-packages: - tagsoup-navigate - tagsoup-parsec - tagsoup-selection + - tagstew - tagstream-conduit - tai64 - takahashi 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 a1938de0ab..9be6256837 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -782,4 +782,14 @@ self: super: builtins.intersectAttrs super { testToolDepends = [ pkgs.git pkgs.mercurial ]; }); + haskell-language-server = overrideCabal super.haskell-language-server (drv: { + postInstall = let + inherit (pkgs.lib) concatStringsSep take splitString; + ghc_version = self.ghc.version; + ghc_major_version = concatStringsSep "." (take 2 (splitString "." ghc_version)); + in '' + ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${ghc_version} + ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${ghc_major_version} + ''; + }); } 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 4bdd247170..af060b6805 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -6525,8 +6525,8 @@ self: { }: mkDerivation { pname = "Frames-map-reduce"; - version = "0.3.0.0"; - sha256 = "0rkxx09m63dqzz597d81r88xgr53ap78gc6kmjvw0ph7i0f43yp8"; + version = "0.4.0.0"; + sha256 = "1ajqkzg3q59hg1gwbamff72j9sxljqq7sghrqw5xbnxfd4867dcf"; libraryHaskellDepends = [ base containers foldl Frames hashable map-reduce-folds newtype profunctors vinyl @@ -6540,6 +6540,23 @@ self: { broken = true; }) {}; + "Frames-streamly" = callPackage + ({ mkDerivation, base, exceptions, Frames, primitive, streamly + , text, vinyl + }: + mkDerivation { + pname = "Frames-streamly"; + version = "0.1.0.0"; + sha256 = "0gzg52icabky5fzglxms8h9n1ncp1gvg2f8bsywmyw1maqdy36fq"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base exceptions Frames primitive streamly text vinyl + ]; + testHaskellDepends = [ base Frames streamly text vinyl ]; + description = "A streamly layer for Frames I/O"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Frank" = callPackage ({ mkDerivation, base, mtl, newtype, she, void }: mkDerivation { @@ -9440,6 +9457,8 @@ self: { pname = "HTTP"; version = "4000.3.15"; sha256 = "150m5v125s4jrxzl85jhnh69kp4mjyzhkqp0c1k087008f73csqd"; + revision = "1"; + editedCabalFile = "1nqwz6ns014z23n96567bf6a27if9ss5bj53grcdlmry6lrjad1v"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -17027,8 +17046,8 @@ self: { }: mkDerivation { pname = "Rasterific"; - version = "0.7.5.2"; - sha256 = "0f2qskrkxpj728zplrjz3j6h5cxwqvr0qi3614krjgcx69iym3sx"; + version = "0.7.5.3"; + sha256 = "164ivzwrla90baqz6gapmcmi1yg5bk0sczqv4xawx3l7dzkz8ghv"; libraryHaskellDepends = [ base bytestring containers dlist FontyFruity free JuicyPixels mtl primitive transformers vector vector-algorithms @@ -21047,12 +21066,12 @@ self: { platforms = stdenv.lib.platforms.none; }) {}; - "Win32_2_9_0_0" = callPackage + "Win32_2_10_0_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.9.0.0"; - sha256 = "1m9v1qimqi19siy1a7mzb52f3jdj5zs81085nybnyj7yk9988s1p"; + version = "2.10.0.0"; + sha256 = "09g61dgw3xvg066qdydw7nxn8vk1nxxwzi1wwr19rkaxhz43149n"; description = "A binding to Windows Win32 API"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.none; @@ -21825,15 +21844,15 @@ self: { ({ mkDerivation, base, case-insensitive, deepseq, ghc-prim , hashable, hspec, hspec-discover, HUnit, integer-gmp, primitive , QuickCheck, quickcheck-instances, scientific, tagged - , template-haskell, unordered-containers, word8 + , template-haskell, time, unordered-containers, word8 }: mkDerivation { pname = "Z-Data"; - version = "0.1.1.0"; - sha256 = "0z7cri6mkmj22ffwg3mz8yyjr81z4ww7kkmi7m9ilmbbpssma5fw"; + version = "0.1.4.2"; + sha256 = "0w7yk3krzpjymc074qfn1mr2wzb4i72wgrix1krmskk8pgn5aihc"; libraryHaskellDepends = [ base case-insensitive deepseq ghc-prim hashable integer-gmp - primitive QuickCheck scientific tagged template-haskell + primitive QuickCheck scientific tagged template-haskell time unordered-containers ]; libraryToolDepends = [ hspec-discover ]; @@ -21841,7 +21860,28 @@ self: { base hashable hspec HUnit integer-gmp primitive QuickCheck quickcheck-instances scientific word8 ]; - description = "array, vector and text"; + description = "Array, vector and text"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "Z-IO" = callPackage + ({ mkDerivation, base, bytestring, exceptions, hashable, hspec + , hspec-discover, HUnit, primitive, QuickCheck + , quickcheck-instances, scientific, stm, time, word8, Z-Data, zlib + }: + mkDerivation { + pname = "Z-IO"; + version = "0.1.3.0"; + sha256 = "0qcnpk2ps2m2s23fv3ydldicz93ad82xadh53wpnwi1m1dh6kjpm"; + libraryHaskellDepends = [ + base exceptions primitive stm time Z-Data + ]; + libraryToolDepends = [ hspec-discover ]; + testHaskellDepends = [ + base bytestring hashable hspec HUnit primitive QuickCheck + quickcheck-instances scientific word8 Z-Data zlib + ]; + description = "Simple and high performance IO toolkit for Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -22193,6 +22233,25 @@ self: { broken = true; }) {}; + "acc" = callPackage + ({ mkDerivation, base, criterion, deepseq, QuickCheck + , quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "acc"; + version = "0.1.1"; + sha256 = "1n3cc6gfs1x1c40aphrc89381sr26m5kkvqv04q8ccw256dv3ryh"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Sequence optimized for monoidal construction and folding"; + license = stdenv.lib.licenses.mit; + }) {}; + "accelerate" = callPackage ({ mkDerivation, ansi-terminal, base, base-orphans, bytestring , Cabal, cabal-doctest, containers, cryptonite, deepseq, directory @@ -22846,6 +22905,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "achille" = callPackage + ({ mkDerivation, aeson, base, binary, binary-instances, bytestring + , containers, data-default, directory, filepath, frontmatter, Glob + , mtl, optparse-applicative, pandoc, pandoc-types, process, tasty + , tasty-hunit, text, time + }: + mkDerivation { + pname = "achille"; + version = "0.0.0"; + sha256 = "1d15dfzw4sryilrws68cp064j4646mn0rqdnwaaz7k5y4wnwjivg"; + libraryHaskellDepends = [ + aeson base binary binary-instances bytestring data-default + directory filepath frontmatter Glob optparse-applicative pandoc + pandoc-types process text time + ]; + testHaskellDepends = [ + base bytestring containers directory filepath Glob mtl tasty + tasty-hunit text time + ]; + description = "A library for building static site generators"; + license = stdenv.lib.licenses.mit; + }) {}; + "acid-state" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers , criterion, deepseq, directory, filelock, filepath, hedgehog @@ -24909,6 +24991,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-schemas_1_3_2" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, criterion, deepseq + , first-class-families, hashable, hint, interpolate, megaparsec + , QuickCheck, raw-strings-qq, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, text, th-orphans + , th-test-utils, unordered-containers + }: + mkDerivation { + pname = "aeson-schemas"; + version = "1.3.2"; + sha256 = "1mchqhpnv7rnhi1lbcsg1pwr5ml2444h3l2yak353s8lr204pg1p"; + libraryHaskellDepends = [ + aeson base first-class-families hashable megaparsec + template-haskell text unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-qq base deepseq first-class-families hashable hint + interpolate megaparsec QuickCheck raw-strings-qq tasty tasty-golden + tasty-hunit tasty-quickcheck template-haskell text th-orphans + th-test-utils unordered-containers + ]; + benchmarkHaskellDepends = [ + aeson base criterion deepseq first-class-families hashable + megaparsec template-haskell text th-test-utils unordered-containers + ]; + description = "Easily consume JSON data on-demand with type-safety"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-serialize" = callPackage ({ mkDerivation, aeson, base, cereal, hspec, HUnit }: mkDerivation { @@ -25058,8 +25170,8 @@ self: { }: mkDerivation { pname = "aeson-value-parser"; - version = "0.19.2.1"; - sha256 = "1hv1h0kckjy98l1vd21z1mr6cyg23xzilzs8ppri8b6k731w1bwx"; + version = "0.19.4"; + sha256 = "1z4l7x29zxalmf8qqynyz87mgr0xbjzvffmxk76r0kal31yljq81"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable megaparsec mtl scientific text text-builder transformers unordered-containers vector @@ -30403,8 +30515,8 @@ self: { }: mkDerivation { pname = "antlr-haskell"; - version = "0.1.0.0"; - sha256 = "057mr0vw299hjjxlcpmwpbpwn6snzdvr73gmwxhh1gqgbh9g4bx4"; + version = "0.1.0.1"; + sha256 = "1z796wgc4jnqc2mnrg5lwjazx07355f6jl02s5cq1zycxrlc7ry9"; libraryHaskellDepends = [ base containers deepseq hashable haskell-src-meta mtl template-haskell text th-lift transformers unordered-containers @@ -31969,6 +32081,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "arch-hs" = callPackage + ({ mkDerivation, aeson, algebraic-graphs, base, bytestring, Cabal + , colourista, conduit, conduit-extra, containers, deepseq + , directory, filepath, hackage-db, megaparsec, microlens + , microlens-th, neat-interpolation, optparse-applicative, polysemy + , req, split, tar-conduit, template-haskell, text + }: + mkDerivation { + pname = "arch-hs"; + version = "0.1.1.0"; + sha256 = "192zdilmwnsa1nm9p1xzxqiddpv5hw87a7vw16lvm5z2p65c5aly"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson algebraic-graphs base bytestring Cabal colourista conduit + conduit-extra containers deepseq directory filepath hackage-db + megaparsec microlens microlens-th neat-interpolation + optparse-applicative polysemy req split tar-conduit + template-haskell text + ]; + executableHaskellDepends = [ + aeson algebraic-graphs base bytestring Cabal colourista conduit + conduit-extra containers deepseq directory filepath hackage-db + megaparsec microlens microlens-th neat-interpolation + optparse-applicative polysemy req split tar-conduit + template-haskell text + ]; + description = "A program generating PKGBUILD for hackage packages"; + license = stdenv.lib.licenses.mit; + }) {}; + "archive" = callPackage ({ mkDerivation, base, bytestring, debian, debian-mirror, directory , Extra, filepath, help, HUnit, mtl, network, old-locale, pretty @@ -33255,8 +33398,8 @@ self: { }: mkDerivation { pname = "asciichart"; - version = "1.0.1"; - sha256 = "1k9x4h8ay0wjc0gp9jmbc76q5mrzb2q837qcwgyp374x9xyiblq9"; + version = "1.0.2"; + sha256 = "0581dfx3a4cghdhm5sa5j1qqxr173i3zdi3c543i7pzcpmh9fcz0"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ base hspec random raw-strings-qq silently ]; description = "Line charts in terminal"; @@ -34603,6 +34746,8 @@ self: { pname = "attoparsec"; version = "0.13.2.4"; sha256 = "1cpgxc17lh4lnpblb3cimpq4ka23bf89q6yvd0jwk7klw5nwsrms"; + revision = "1"; + editedCabalFile = "0jlipzz2b1jb8yw22rvnhvbnadzcdf3wkwn4svl3j4m6858s0har"; libraryHaskellDepends = [ array base bytestring containers deepseq scientific text transformers @@ -35448,8 +35593,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v"; - revision = "37"; - editedCabalFile = "09z2wlr6g1lm4cdbbf0zjbl1j19xs31y126lcbzcs254f8mx5m13"; + revision = "38"; + editedCabalFile = "0jbvk8azs2x63cfxbppa67qg27zirgash448g7vmf07jqb8405cb"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -36728,14 +36873,14 @@ self: { , containers, directory, exceptions, extensible-effects, filepath , free, hashable, hspec, hspec-expectations, lens, monad-control , mtl, neat-interpolation, optparse-applicative, parallel, parsec - , pretty, pretty-show, process, QuickCheck, random, shake, syb - , tagged, template, text, time, transformers, unordered-containers - , vector, yaml + , posix-pty, pretty, pretty-show, process, QuickCheck, random + , shake, syb, tagged, template, text, time, transformers, unix + , unordered-containers, vector, yaml }: mkDerivation { pname = "b9"; - version = "2.1.0"; - sha256 = "0zrblqyq7zm2zya20zaxvcgb489y2kywns72kxyp6ymi2sax586g"; + version = "3.1.0"; + sha256 = "1jggx5ph7js5r9jck6y2ghlb2il2winz0wg1y01vkp6dc1jpqjd7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36743,9 +36888,9 @@ self: { bytestring conduit conduit-extra ConfigFile containers directory exceptions extensible-effects filepath free hashable hspec hspec-expectations lens monad-control mtl neat-interpolation - optparse-applicative parallel parsec pretty pretty-show process - QuickCheck random shake syb tagged template text time transformers - unordered-containers vector yaml + optparse-applicative parallel parsec posix-pty pretty pretty-show + process QuickCheck random shake syb tagged template text time + transformers unix unordered-containers vector yaml ]; executableHaskellDepends = [ aeson base binary bytestring containers directory @@ -37438,6 +37583,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-compat_0_11_2" = callPackage + ({ mkDerivation, base, unix }: + mkDerivation { + pname = "base-compat"; + version = "0.11.2"; + sha256 = "1nyvkaij4m01jndw72xl8931czz1xp6jpnynpajabys2ahabb9jk"; + libraryHaskellDepends = [ base unix ]; + description = "A compatibility layer for base"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-compat-batteries" = callPackage ({ mkDerivation, base, base-compat, hspec, hspec-discover , QuickCheck @@ -37453,6 +37610,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-compat-batteries_0_11_2" = callPackage + ({ mkDerivation, base, base-compat, hspec, hspec-discover + , QuickCheck + }: + mkDerivation { + pname = "base-compat-batteries"; + version = "0.11.2"; + sha256 = "08rh9nlm9ir28fm42xim06ga8qwdqdcvkbb5ckz99bwnmajndq1i"; + libraryHaskellDepends = [ base base-compat ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "base-compat with extra batteries"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-compat-migrate" = callPackage ({ mkDerivation, base, base-compat }: mkDerivation { @@ -37550,6 +37723,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-orphans_0_8_3" = callPackage + ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck + }: + mkDerivation { + pname = "base-orphans"; + version = "0.8.3"; + sha256 = "1d9yrxrl270wjpq9iwy1a1faicc650njpr3d3ffn76kqgnn33alv"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Backwards-compatible orphan instances for base"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-prelude" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -37658,8 +37846,8 @@ self: { pname = "base16-bytestring"; version = "1.0.0.0"; sha256 = "12bnl2fs0h4hcjpr69xqqngjh0117dlvkv56lxski6g6fnbwps2r"; - revision = "1"; - editedCabalFile = "0k47j9csaqizvbk3v7zm05l3z23v359h3w079chzbf44z99hkphc"; + revision = "2"; + editedCabalFile = "16nmmf3mmkdrssx6i77drh7ac7r6cfb1dnbna62z32h11yyyk49j"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework @@ -39666,6 +39854,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bifunctors_5_5_8" = callPackage + ({ mkDerivation, base, base-orphans, comonad, containers, hspec + , hspec-discover, QuickCheck, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + }: + mkDerivation { + pname = "bifunctors"; + version = "5.5.8"; + sha256 = "0gffvmxmpxljivg4j7p5l46kxiv29ml0h23361dh23gsy5m4jz41"; + libraryHaskellDepends = [ + base base-orphans comonad containers tagged template-haskell + th-abstraction transformers + ]; + testHaskellDepends = [ + base hspec QuickCheck template-haskell transformers + transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "Bifunctors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bighugethesaurus" = callPackage ({ mkDerivation, base, HTTP, split }: mkDerivation { @@ -39883,8 +40094,8 @@ self: { pname = "binary"; version = "0.7.6.1"; sha256 = "0rqhz349w72h1bi79lga5x1d95g59h15srlahxbhfrmy2pycm1cg"; - revision = "2"; - editedCabalFile = "0kk10dhawx3lravnlxi2f3n430k0qz3i5p8mpmi0bi6j72ihlddw"; + revision = "3"; + editedCabalFile = "0j9wsnqs0hymwwnp4n5qsqnz7lwcvblj3xa1b0yg0h8zwfsrfkci"; libraryHaskellDepends = [ array base bytestring containers ]; testHaskellDepends = [ array base bytestring Cabal containers directory filepath HUnit @@ -40372,6 +40583,8 @@ self: { pname = "binary-tagged"; version = "0.3"; sha256 = "1bvzwhdjxxr7b3lk23rwcygi34d6a5mairi2j2gh7k3p8983fgss"; + revision = "1"; + editedCabalFile = "1swaxiyz16wmsi0qdm9nfs56ld37hg9vqp73j3lvdq84f1s0ck2l"; libraryHaskellDepends = [ array base base16-bytestring binary bytestring containers structured tagged @@ -40458,8 +40671,8 @@ self: { ({ mkDerivation, base, binaryen }: mkDerivation { pname = "binaryen"; - version = "0.0.3.0"; - sha256 = "08pdk57q4n49l3wyd9zbda4w5ci65ifq4yxscq61kkdqz8i4ggjs"; + version = "0.0.4.0"; + sha256 = "1kgvzn5m2pq7ncid27n68p9axrdganna08wlp8csg9c22jixg7rg"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ binaryen ]; description = "Haskell bindings to binaryen"; @@ -42868,10 +43081,8 @@ self: { }: mkDerivation { pname = "blank-canvas"; - version = "0.7.1"; - sha256 = "02w428jpb49yaqzw93121lf1m4pjxi8wniqhnrvqh2zh63gsfws1"; - revision = "3"; - editedCabalFile = "1l2xcvms2jw10c4jvnc3kldk21vqcchckms0bawrcf908yhq525g"; + version = "0.7.3"; + sha256 = "1g10959ly5nv2xfhax4pamzxnxkqbniahplc5za8k5r4nq1vjrm2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -43067,6 +43278,8 @@ self: { pname = "blaze-builder"; version = "0.4.1.0"; sha256 = "05681dih2d8s96an945wkbwl05w8ddbcfx8n3r3ck79ydyb8pz4i"; + revision = "1"; + editedCabalFile = "1p66mh9z3aqgind755xzf39pvl2hwjnwrlwiwyj653yzb1gn6c9j"; libraryHaskellDepends = [ base bytestring deepseq text ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework @@ -44623,8 +44836,8 @@ self: { pname = "bound"; version = "2.0.1"; sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9"; - revision = "8"; - editedCabalFile = "1qfl93gabiz1z0cjlc2xzmr844sjqfzcadayn154c3b4dfgy1cf6"; + revision = "9"; + editedCabalFile = "1vy84wc79a64f9qa2x9s3rs8g0kz45khh3l6sjqpmfm8xafvv2hq"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph @@ -44638,6 +44851,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bound_2_0_2" = callPackage + ({ mkDerivation, base, bifunctors, binary, bytes, Cabal + , cabal-doctest, cereal, comonad, deepseq, deriving-compat, doctest + , functor-classes-compat, hashable, mmorph, profunctors + , template-haskell, th-abstraction, transformers + , transformers-compat, vector, void + }: + mkDerivation { + pname = "bound"; + version = "2.0.2"; + sha256 = "14kl0aak48m1sbvi0g772hfmn6w984yc4j9p4ljxq6bfb2q4gqax"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base bifunctors binary bytes cereal comonad deepseq hashable mmorph + profunctors template-haskell th-abstraction transformers + transformers-compat + ]; + testHaskellDepends = [ + base deriving-compat doctest functor-classes-compat transformers + transformers-compat vector void + ]; + description = "Making de Bruijn Succ Less"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bound-extras" = callPackage ({ mkDerivation, base, bound, containers, deepseq, filepath , hashable, pretty, tasty, tasty-golden, text-short, transformers @@ -45045,7 +45284,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_55" = callPackage + "brick_0_57" = callPackage ({ mkDerivation, base, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, exceptions , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm @@ -45054,10 +45293,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.55"; - sha256 = "0n51vh8j75a2b6qbfah9k9zrp15m4rkq7fywpp811v93h8zf02fy"; - revision = "1"; - editedCabalFile = "1kn5nksvds8njy8zv7bq7gankngfam3dl1if0qvlhsfdl3n3d1zr"; + version = "0.57"; + sha256 = "15481cmm208gxcs96rcvg6qgx87b2fk7ws82675viasw64mhvmg1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45585,8 +45822,8 @@ self: { pname = "bsb-http-chunked"; version = "0.0.0.4"; sha256 = "0z0f18yc6zlwh29c6175ivfcin325lvi4irpvv0n3cmq7vi0k0ql"; - revision = "2"; - editedCabalFile = "0bz62lxdbnwkfr1d4ngm8xi4y1ndpdflbv71s6h43vp5lbd546hr"; + revision = "3"; + editedCabalFile = "15hg352id2f4x0dnvv47bdiz6gv5hp5a2mki9yzmhc7ajpk31mdd"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ attoparsec base blaze-builder bytestring doctest hedgehog tasty @@ -46024,6 +46261,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bugsnag-hs_0_2_0_1" = callPackage + ({ mkDerivation, aeson, auto-update, base, bytestring, hedgehog + , http-client, stm, text, time, unordered-containers + }: + mkDerivation { + pname = "bugsnag-hs"; + version = "0.2.0.1"; + sha256 = "12s3swamnm9hc3fkwc2qqzr0xz41i0hkgsjmphfsb544r07cfmjn"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson auto-update base bytestring http-client stm text time + unordered-containers + ]; + testHaskellDepends = [ aeson base bytestring hedgehog stm ]; + description = "A Bugsnag client for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bugzilla" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection , containers, data-default, http-conduit, http-types, iso8601-time @@ -46455,8 +46711,6 @@ self: { testPkgconfigDepends = [ gio-unix ]; description = "Draw sequence diagrams of D-Bus traffic"; license = stdenv.lib.licenses.lgpl21Plus; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {gio-unix = null; inherit (pkgs) libpcap; system-glib = pkgs.glib;}; @@ -46867,14 +47121,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bytestring_0_10_12_0" = callPackage + "bytestring_0_11_0_0" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, integer-gmp }: mkDerivation { pname = "bytestring"; - version = "0.10.12.0"; - sha256 = "1s1kgnqb8ybz223sf2838mmxnlhwsd3lnakng6ap38m058bzzj7d"; - revision = "1"; - editedCabalFile = "10d0n2k8zhlw0bbrm2na9zchlggm8ix2wi2lav6vkbd98sg96mip"; + version = "0.11.0.0"; + sha256 = "03fwkbn52946y2l1ddrqq1jp8l9bhgi0gwxpz1wqqsn6n2vz5rrj"; libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ]; description = "Fast, compact, strict and lazy byte strings with a list interface"; license = stdenv.lib.licenses.bsd3; @@ -47070,6 +47322,8 @@ self: { pname = "bytestring-lexing"; version = "0.5.0.2"; sha256 = "0wrzniawhgpphc6yx1v972gyqxdbv0pizaz9bafahrshyb9svy81"; + revision = "1"; + editedCabalFile = "0icnbv83h542vkmn51ykzc4w1g7nl4w6d6lj79909hnwr2g10616"; libraryHaskellDepends = [ base bytestring ]; description = "Parse and produce literals efficiently from strict or lazy bytestrings"; license = stdenv.lib.licenses.bsd2; @@ -47294,6 +47548,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bytestring-tree-builder_0_2_7_4" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq + , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "bytestring-tree-builder"; + version = "0.2.7.4"; + sha256 = "1j0jr2xnbqwnl6zwsi07hx9nbw9643xmamp7y3maqhha78h7x4mh"; + libraryHaskellDepends = [ + base base-prelude bytestring semigroups text + ]; + testHaskellDepends = [ + base-prelude bytestring QuickCheck quickcheck-instances tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base-prelude bytestring criterion deepseq + ]; + description = "A very efficient ByteString builder implementation based on the binary tree"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bytestring-trie" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -47788,8 +48066,8 @@ self: { ({ mkDerivation, base, Cabal, directory, extra, filepath }: mkDerivation { pname = "cabal-auto-expose"; - version = "0.1.0.0"; - sha256 = "1dynrsp1j2y1ylmqc3fkz5nfa5slljxgg0x322j64rljgjqglfy2"; + version = "0.1.0.1"; + sha256 = "16hhvsqdj91pgzlgmwpba8ajjp2jssyf71rw9pwrixshj6826ps2"; libraryHaskellDepends = [ base Cabal directory extra filepath ]; description = "Build time library that autodetects exposed modules"; license = stdenv.lib.licenses.mit; @@ -47860,10 +48138,8 @@ self: { }: mkDerivation { pname = "cabal-cache"; - version = "1.0.1.8"; - sha256 = "0yxq73bdw1ai0yv54prcxpm1ygkpa8m0jnznwm975b82qlmplynw"; - revision = "2"; - editedCabalFile = "1y4zfnr2a5w8kvwvk1dbzv0ik5b2wdlx8z2p6n9k5mzax952s689"; + version = "1.0.2.1"; + sha256 = "0n17ga3namkldd4mfjla58nlg0j7dyjcamap84bdwiglmrg0iwz4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55290,6 +55566,62 @@ self: { broken = true; }) {}; + "cli-extras" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers + , exceptions, io-streams, lens, logging-effect, monad-loops, mtl + , process, terminal-size, text, time, transformers, which + }: + mkDerivation { + pname = "cli-extras"; + version = "0.1.0.0"; + sha256 = "14li1rkkaihklq62m9v9in2lbsr19v1h228a77ik25qarqw4xp9d"; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring containers exceptions + io-streams lens logging-effect monad-loops mtl process + terminal-size text time transformers which + ]; + description = "Miscellaneous utilities for building and working with command line interfaces"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "cli-git" = callPackage + ({ mkDerivation, base, cli-extras, containers, data-default + , exceptions, lens, logging-effect, megaparsec, mtl, text + }: + mkDerivation { + pname = "cli-git"; + version = "0.1.0.0"; + sha256 = "1d9b8wyxzi233lq8qh3fh6v7icikjy4ryhhw033s5207biqqrifh"; + libraryHaskellDepends = [ + base cli-extras containers data-default exceptions lens + logging-effect megaparsec mtl text + ]; + description = "Bindings to the git command-line interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "cli-nix" = callPackage + ({ mkDerivation, base, cli-extras, data-default, exceptions, lens + , logging-effect, mtl, text + }: + mkDerivation { + pname = "cli-nix"; + version = "0.1.0.0"; + sha256 = "0z858fjsrnfb9cwzq8hxyhpwn61m50rjv1916c7zf8nrfsa82z0y"; + libraryHaskellDepends = [ + base cli-extras data-default exceptions lens logging-effect mtl + text + ]; + description = "Bindings to the nix command-line interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "cli-setup" = callPackage ({ mkDerivation, base, directory, process }: mkDerivation { @@ -58013,21 +58345,35 @@ self: { }) {}; "commander-cli" = callPackage - ({ mkDerivation, base, bytestring, directory, mtl, process, text - , unordered-containers + ({ mkDerivation, base, bytestring, commandert, directory, mtl + , process, text, unordered-containers }: mkDerivation { pname = "commander-cli"; - version = "0.7.0.0"; - sha256 = "1xrlgfyq59g7x7msrwl58bzg108jkxk0k5sra8la7zwpx46ach4z"; + version = "0.9.0.0"; + sha256 = "10cqmq6hcgaz13i6ny417xd6fa9mfzjmnxi9w7pvwjq1ba822j7z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring mtl text unordered-containers + base bytestring commandert mtl text unordered-containers ]; - executableHaskellDepends = [ base directory mtl process text ]; - testHaskellDepends = [ base text unordered-containers ]; - description = "A command line argument/option parser library built around a monadic metaphor"; + executableHaskellDepends = [ + base commandert directory mtl process text + ]; + testHaskellDepends = [ base commandert text unordered-containers ]; + description = "A command line argument/option parser library"; + license = stdenv.lib.licenses.mit; + }) {}; + + "commandert" = callPackage + ({ mkDerivation, base, hspec, mtl }: + mkDerivation { + pname = "commandert"; + version = "0.1.0.0"; + sha256 = "0r4qkiw4jzqjkzcimpm6adwq56gj31sqrm0cjddhlwskjbp73g71"; + libraryHaskellDepends = [ base mtl ]; + testHaskellDepends = [ base hspec mtl ]; + description = "A monad for commanders"; license = stdenv.lib.licenses.mit; }) {}; @@ -58128,8 +58474,8 @@ self: { }: mkDerivation { pname = "commonmark-pandoc"; - version = "0.2.0.0"; - sha256 = "1dis51lknwfk7ka0n6pbw03hwn4y5zk23kypkl84iwg2ydxvwbxh"; + version = "0.2.0.1"; + sha256 = "12s20s64qad3varxr9bxpvdzx3ajdw58ssmssj9rqqq8k2nlnqh3"; libraryHaskellDepends = [ base commonmark commonmark-extensions containers pandoc-types text ]; @@ -58821,6 +59167,23 @@ self: { broken = true; }) {}; + "composite-aeson-cofree-list" = callPackage + ({ mkDerivation, aeson, base, composite-aeson + , composite-aeson-writeonly, free, vector + }: + mkDerivation { + pname = "composite-aeson-cofree-list"; + version = "0.1.0.0"; + sha256 = "0jxfisk3zqzhknc2kraq9chh2gx9q00f5lkh0401s0fb4qgdfd0a"; + libraryHaskellDepends = [ + aeson base composite-aeson composite-aeson-writeonly free vector + ]; + description = "Print a Cofree [] as a JSON value"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "composite-aeson-path" = callPackage ({ mkDerivation, base, composite-aeson, path }: mkDerivation { @@ -58868,6 +59231,22 @@ self: { broken = true; }) {}; + "composite-aeson-writeonly" = callPackage + ({ mkDerivation, aeson, aeson-better-errors, base, composite-aeson + }: + mkDerivation { + pname = "composite-aeson-writeonly"; + version = "0.1.0.0"; + sha256 = "1fr235g96i35ygpvbbvrpyz87d6q7h2bjnlf4asv2dn4a6x40dic"; + libraryHaskellDepends = [ + aeson aeson-better-errors base composite-aeson + ]; + description = "WriteOnly indicators for composite-aeson"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "composite-base" = callPackage ({ mkDerivation, base, deepseq, exceptions, hspec, lens , monad-control, mtl, profunctors, QuickCheck, template-haskell @@ -58982,8 +59361,8 @@ self: { ({ mkDerivation, base, composite-base }: mkDerivation { pname = "composite-tuple"; - version = "0.1.1.0"; - sha256 = "0ykxf17zlyjrs8nhj02r0k3l20x7ih1k1z5byxdvw7gxjwsqwq2d"; + version = "0.1.2.0"; + sha256 = "0y5xz4q5z2lw3jy3fdm5rl19sd969cdpq1a44ar45dpab0qffr41"; libraryHaskellDepends = [ base composite-base ]; description = "Tuple functions for composite records"; license = stdenv.lib.licenses.mit; @@ -60767,8 +61146,8 @@ self: { pname = "config-ini"; version = "0.2.4.0"; sha256 = "0dfm4xb1sd713rcqzplzdgw68fyhj24i6lj8j3q8kldpmkl98lbf"; - revision = "1"; - editedCabalFile = "15ryq15851m9hzljamw5spr6hzr6picgf6s3xzkn7nviidcq78mz"; + revision = "2"; + editedCabalFile = "0iwraaa0y1b3xdsg760j1wpylkqshky0k2djcg0k4s97lrwqpbcz"; libraryHaskellDepends = [ base containers megaparsec text transformers unordered-containers ]; @@ -60820,10 +61199,8 @@ self: { }: mkDerivation { pname = "config-schema"; - version = "1.2.0.0"; - sha256 = "0lz9y2qnjc576mbl3qnhyf4c1y5f71q7f5jgv8rj7vsg855q99hm"; - revision = "1"; - editedCabalFile = "1hlk2syn4z5zzvdc8nr3wprdpbmcjyp77spdzvyma626931m8p3a"; + version = "1.2.1.0"; + sha256 = "1p5nhvhq7q5s67l4h4zb19ali5jbxrz9mb5cwzhykqmqji56n5vf"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -60851,14 +61228,13 @@ self: { }) {}; "config-value" = callPackage - ({ mkDerivation, alex, array, base, happy, pretty, text }: + ({ mkDerivation, alex, array, base, containers, happy, pretty, text + }: mkDerivation { pname = "config-value"; - version = "0.7.0.1"; - sha256 = "0r7qylqmdvif75ylb0d0zryl2ghxl3ip9a2jhyq70aqxwdjh18g4"; - revision = "2"; - editedCabalFile = "1kwn53qb7hzjgkk9fh8mabyhxjm5rkw9qapk16isx1s4vns8x9l6"; - libraryHaskellDepends = [ array base pretty text ]; + version = "0.8"; + sha256 = "1l2w2ylxx9d48pjnc9490kisawz48mf038f108g3zvb0j3iz9vyn"; + libraryHaskellDepends = [ array base containers pretty text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; description = "Simple, layout-based value language similar to YAML or JSON"; @@ -61732,12 +62108,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "containers_0_6_3_1" = callPackage + "containers_0_6_4_1" = callPackage ({ mkDerivation, array, base, deepseq }: mkDerivation { pname = "containers"; - version = "0.6.3.1"; - sha256 = "04v59j9xnaq4bab08b3b0m5lwpkjm2awdhd4q9i8rwmxf8977acg"; + version = "0.6.4.1"; + sha256 = "0vn43a7bf49pih9b65b359xf3658d96dpm9j35i8x8j61vlrcsid"; libraryHaskellDepends = [ array base deepseq ]; description = "Assorted concrete container types"; license = stdenv.lib.licenses.bsd3; @@ -63399,10 +63775,8 @@ self: { }: mkDerivation { pname = "cpkg"; - version = "0.2.5.6"; - sha256 = "1fvwvaqd9nn4pnblyi874kwb450h85gg2afa6khp4vsz1bybc8ch"; - revision = "1"; - editedCabalFile = "07scy0rvrinfiwj4l7gfwi8srnrp3v5w0pbjsqsp738akmlbbgna"; + version = "0.2.5.7"; + sha256 = "17rr2cffn5ncpiskicgrmg1w7d0axgavf86336ij05fvvc3gzpgi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64355,6 +64729,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "criterion_1_5_7_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat + , base-compat-batteries, binary, binary-orphans, bytestring + , cassava, code-page, containers, criterion-measurement, deepseq + , directory, exceptions, filepath, Glob, HUnit, js-flot, js-jquery + , microstache, mtl, mwc-random, optparse-applicative, parsec + , QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck + , text, time, transformers, transformers-compat, vector + , vector-algorithms + }: + mkDerivation { + pname = "criterion"; + version = "1.5.7.0"; + sha256 = "1qzn2k1b2all543v47p93p15a5y8lps002vbxmkr6xrinp91cvqk"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base base-compat-batteries binary + binary-orphans bytestring cassava code-page containers + criterion-measurement deepseq directory exceptions filepath Glob + js-flot js-jquery microstache mtl mwc-random optparse-applicative + parsec statistics text time transformers transformers-compat vector + vector-algorithms + ]; + executableHaskellDepends = [ + base base-compat-batteries optparse-applicative + ]; + testHaskellDepends = [ + aeson base base-compat base-compat-batteries bytestring deepseq + directory HUnit QuickCheck statistics tasty tasty-hunit + tasty-quickcheck vector + ]; + description = "Robust, reliable performance measurement and analysis"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "criterion-compare" = callPackage ({ mkDerivation, base, bytestring, cassava, Chart, Chart-diagrams , clay, colour, containers, data-default, filepath, lens, lucid @@ -65063,8 +65475,8 @@ self: { }: mkDerivation { pname = "cryptocompare"; - version = "0.1.1"; - sha256 = "1cqnhg1ww79k3f6yisdir1fqiil13niv002p5s2kir9ks5phybni"; + version = "0.1.2"; + sha256 = "19p923d8hvhlf16gnpxp8fq5y9kmg4kqnq04w48hc1pkba7v9g2q"; libraryHaskellDepends = [ aeson base bytestring containers directory exceptions http-conduit MissingH text time transformers unordered-containers @@ -66223,8 +66635,8 @@ self: { }: mkDerivation { pname = "curl-runnings"; - version = "0.14.0"; - sha256 = "1f4b44b8sw4fpbkcl3naj5y3d3j8d6sb9lxf7k0vy49aghmw50p6"; + version = "0.15.0"; + sha256 = "0kqx5g15yi42p890l1sabvzby1hrh4phkjqwwziv0q4pq4hfz4wp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68802,6 +69214,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-reify_0_6_2" = callPackage + ({ mkDerivation, base, containers, hashable, unordered-containers + }: + mkDerivation { + pname = "data-reify"; + version = "0.6.2"; + sha256 = "19mljyx1v86plnwqm5y1livw5qd8cc9z5k1kfchqiiwj1vsq660v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers hashable unordered-containers + ]; + description = "Reify a recursive data structure into an explicit graph"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-reify-cse" = callPackage ({ mkDerivation, base, containers, data-reify }: mkDerivation { @@ -69647,8 +70076,8 @@ self: { }: mkDerivation { pname = "dawg-ord"; - version = "0.5.1.0"; - sha256 = "1s92i5z63maq74ni49l282pqbz0r0c22miyjjilipr0wnz7rl4nr"; + version = "0.5.1.2"; + sha256 = "1wsxlzljxydcvilkdf8xj21sac0y2ph18vmbznd7psvbwk2q45kf"; libraryHaskellDepends = [ base containers mtl transformers vector ]; @@ -71889,22 +72318,16 @@ self: { }) {}; "derive-topdown" = callPackage - ({ mkDerivation, base, binary, derive, GenericPretty, haskell-src - , mtl, primitive, QuickCheck, simple-sql-parser, syb - , template-haskell, th-expand-syns, transformers + ({ mkDerivation, base, mtl, primitive, syb, template-haskell + , th-expand-syns, transformers }: mkDerivation { pname = "derive-topdown"; - version = "0.0.2.0"; - sha256 = "0vs21aq0mcl1p9fwmwvqf61x5ndgfl4i32g9x40x1safj5c594s6"; + version = "0.0.2.1"; + sha256 = "05vbbndyx5xw01vk3bs3vk9bmnqq7nlj817jk8ggv23x5yg87daf"; libraryHaskellDepends = [ base mtl primitive syb template-haskell th-expand-syns transformers ]; - testHaskellDepends = [ - base binary derive GenericPretty haskell-src mtl primitive - QuickCheck simple-sql-parser syb template-haskell th-expand-syns - transformers - ]; description = "Help Haskellers derive class instances for composited data types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -71975,6 +72398,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "deriving-compat_0_5_10" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged + , template-haskell, th-abstraction, transformers + , transformers-compat, void + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.5.10"; + sha256 = "1ah04xsb71wv6iax47xpdykfadxp3lcw2l6vkg15723l1xgy8ach"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghc-prim template-haskell + th-abstraction transformers transformers-compat + ]; + testHaskellDepends = [ + base base-compat base-orphans hspec QuickCheck tagged + template-haskell transformers transformers-compat void + ]; + testToolDepends = [ hspec-discover ]; + description = "Backports of GHC deriving extensions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "derp" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -72552,8 +72999,8 @@ self: { pname = "dhall"; version = "1.35.0"; sha256 = "19h0afgxqq9da1apx4xx9p4p0f2r6miivc4l1dkhbbvfk2r5wkw3"; - revision = "1"; - editedCabalFile = "16hlc738l0w58g5fj6kyr7il24n23a6jbwd6m0xc1sncv74pxh8w"; + revision = "2"; + editedCabalFile = "0jfgmh4mh7v2srwvz76zpffhgnrqx9fgrhn2hdsfgrzh95zjx0my"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -74715,8 +75162,8 @@ self: { }: mkDerivation { pname = "dir-traverse"; - version = "0.2.2.3"; - sha256 = "1nn85mfjsg1w3c9bz4f3igkh1ss0927zaqcz5p9qhwsf8f4wqr3x"; + version = "0.2.3.0"; + sha256 = "1qqz9rrc1snbcswz0d99yf7barwwxn8q719m7ngdyvwx1z8a28m0"; libraryHaskellDepends = [ base directory filepath ]; benchmarkHaskellDepends = [ base criterion directory dirstream pipes pipes-safe system-filepath @@ -77180,6 +77627,32 @@ self: { broken = true; }) {}; + "doctest-exitcode-stdio" = callPackage + ({ mkDerivation, base, doctest-lib, QuickCheck, semigroups + , transformers + }: + mkDerivation { + pname = "doctest-exitcode-stdio"; + version = "0.0"; + sha256 = "1g3c7yrqq2mwqbmvs8vkx1a3cf0p0x74b7fnn344dsk7bsfpgv0x"; + libraryHaskellDepends = [ + base doctest-lib QuickCheck semigroups transformers + ]; + description = "Run doctest's in a Cabal.Test.exitcode-stdio environment"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "doctest-lib" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "doctest-lib"; + version = "0.1"; + sha256 = "1vswam0dhw52dihgnzirh18gqs8rj8h6jd7pl6y1mg2f9f9zmih2"; + libraryHaskellDepends = [ base ]; + description = "Parts of doctest exposed as library"; + license = stdenv.lib.licenses.mit; + }) {}; + "doctest-prop" = callPackage ({ mkDerivation, base, doctest, HUnit, QuickCheck }: mkDerivation { @@ -79573,8 +80046,8 @@ self: { ({ mkDerivation, base, data-default }: mkDerivation { pname = "ease"; - version = "0.1.0.1"; - sha256 = "14wd2r4c2akxzhqa997gjwf8xvdnk8mhp1hv3na35x2b7xs74njm"; + version = "0.1.0.2"; + sha256 = "1psg2d64igvjgskzk8y92xxbh14rzlnvcpv8l3nqx8x5950hxdxk"; libraryHaskellDepends = [ base data-default ]; description = "Robert Penner's easing equations"; license = stdenv.lib.licenses.bsd3; @@ -83121,6 +83594,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eq_4_2_1" = callPackage + ({ mkDerivation, base, semigroupoids }: + mkDerivation { + pname = "eq"; + version = "4.2.1"; + sha256 = "1bcvjpbdis79dd09i07l7rjkh7j79qbpwb731rgr9k9215268wfa"; + libraryHaskellDepends = [ base semigroupoids ]; + description = "Leibnizian equality"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "equal-files" = callPackage ({ mkDerivation, base, bytestring, explicit-exception, filemanip , transformers, utility-ht @@ -83331,8 +83816,8 @@ self: { ({ mkDerivation, base, containers, text }: mkDerivation { pname = "errata"; - version = "0.1.0.0"; - sha256 = "193m9c0409jvk6s8acqad3dg5x97mr6814gq0diyc3yc7b7mdmvf"; + version = "0.2.0.0"; + sha256 = "14yg0zh7lawjdqpzw7qiwi0c41zqhbvijxxxba319mij5skmmr4k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers text ]; @@ -83467,6 +83952,17 @@ self: { broken = true; }) {}; + "error-or" = callPackage + ({ mkDerivation, base, containers, text }: + mkDerivation { + pname = "error-or"; + version = "0.1.0.0"; + sha256 = "1bpazb078xfbylzpzh9dq3p3fgddpizv118n31papi0fr7xddrli"; + libraryHaskellDepends = [ base containers text ]; + description = "Composable, hierarchical errors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "error-util" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -85214,6 +85710,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exception-hierarchy_0_1_0_4" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "exception-hierarchy"; + version = "0.1.0.4"; + sha256 = "0hph7mng5llcvazq9mqh9pndgbjjwivgmhpqlbf4r1xii7c0ymnx"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Exception type hierarchy with TemplateHaskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "exception-mailer" = callPackage ({ mkDerivation, base, hslogger, mime-mail, text }: mkDerivation { @@ -86317,20 +86825,20 @@ self: { "extensible" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, comonad - , constraints, deepseq, ghc-prim, hashable, lens, membership - , monad-skeleton, prettyprinter, primitive, profunctors, QuickCheck - , StateVar, tagged, template-haskell, text, th-lift, transformers - , unordered-containers, vector + , constraints, deepseq, ghc-prim, hashable, incremental, lens + , membership, monad-skeleton, prettyprinter, primitive, profunctors + , QuickCheck, StateVar, tagged, template-haskell, text, th-lift + , transformers, unordered-containers, vector }: mkDerivation { pname = "extensible"; - version = "0.8"; - sha256 = "1p5mnzk4x6dk8gyr3n47wlndnqf8w7112whr872355zqyvcxlsq6"; + version = "0.8.1"; + sha256 = "189svxwh54zzczrrirlnfyqmv2f12h8qxw9rqq47mn55ch40xnw3"; libraryHaskellDepends = [ aeson base bytestring cassava comonad constraints deepseq ghc-prim - hashable membership monad-skeleton prettyprinter primitive - profunctors QuickCheck StateVar tagged template-haskell text - th-lift transformers unordered-containers vector + hashable incremental membership monad-skeleton prettyprinter + primitive profunctors QuickCheck StateVar tagged template-haskell + text th-lift transformers unordered-containers vector ]; testHaskellDepends = [ base lens QuickCheck template-haskell ]; description = "Extensible, efficient, optics-friendly data types and effects"; @@ -86982,32 +87490,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fakedata_0_7_1" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , exceptions, filepath, gauge, hashable, hspec, hspec-discover - , random, string-random, template-haskell, text, time - , unordered-containers, vector, yaml + "fakedata_0_8_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq + , directory, exceptions, fakedata-parser, filepath, gauge, hashable + , hspec, hspec-discover, random, string-random, template-haskell + , text, time, unordered-containers, vector, yaml }: mkDerivation { pname = "fakedata"; - version = "0.7.1"; - sha256 = "1fbrfndwamwdnklbmyldhn45qxyyc61akbwvw0bmf645l0mkpn12"; + version = "0.8.0"; + sha256 = "0in9yz7qkdnrp3bz6zdfvz435d9k9zhdq6n18nsm5il949kf68p5"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring containers directory exceptions filepath hashable - random string-random template-haskell text time - unordered-containers vector yaml + attoparsec base bytestring containers directory exceptions + fakedata-parser filepath hashable random string-random + template-haskell text time unordered-containers vector yaml ]; testHaskellDepends = [ - base bytestring containers directory exceptions filepath hashable - hspec hspec-discover random string-random template-haskell text - time unordered-containers vector yaml + attoparsec base bytestring containers directory exceptions + fakedata-parser filepath hashable hspec hspec-discover random + string-random template-haskell text time unordered-containers + vector yaml ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - base bytestring containers deepseq directory exceptions filepath - gauge hashable random string-random template-haskell text time - unordered-containers vector yaml + attoparsec base bytestring containers deepseq directory exceptions + fakedata-parser filepath gauge hashable random string-random + template-haskell text time unordered-containers vector yaml ]; description = "Library for producing fake data"; license = stdenv.lib.licenses.bsd3; @@ -87295,6 +87804,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fast-logger_3_0_2" = callPackage + ({ mkDerivation, array, auto-update, base, bytestring, directory + , easy-file, filepath, hspec, hspec-discover, text, unix-compat + , unix-time + }: + mkDerivation { + pname = "fast-logger"; + version = "3.0.2"; + sha256 = "0ilbjz09vw35jzfvkiqjy6zjbci2l60wcyjzfysrbxzk24qxmb5z"; + libraryHaskellDepends = [ + array auto-update base bytestring directory easy-file filepath text + unix-compat unix-time + ]; + testHaskellDepends = [ base bytestring directory hspec ]; + testToolDepends = [ hspec-discover ]; + description = "A fast logging system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fast-math" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -90975,6 +91504,27 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "flink-statefulfun" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers, either + , http-media, http-types, lens-family, mtl, proto-lens + , proto-lens-protobuf-types, proto-lens-protoc, proto-lens-runtime + , proto-lens-setup, servant, servant-server, text, wai, warp + }: + mkDerivation { + pname = "flink-statefulfun"; + version = "0.3.0.0"; + sha256 = "046acb9mb40cxdbm57s3davdwlpgjkf23xxkprxrl3pbyfxl1g8k"; + setupHaskellDepends = [ base Cabal proto-lens-setup ]; + libraryHaskellDepends = [ + aeson base bytestring containers either http-media http-types + lens-family mtl proto-lens proto-lens-protobuf-types + proto-lens-runtime servant servant-server text wai warp + ]; + libraryToolDepends = [ proto-lens-protoc ]; + description = "Flink stateful functions SDK"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "flip-cmd" = callPackage ({ mkDerivation, base, process, safe-exceptions }: mkDerivation { @@ -91121,8 +91671,8 @@ self: { }: mkDerivation { pname = "floskell"; - version = "0.10.4"; - sha256 = "14cwby2xyv2cviknpji6117jz6zfjrayrfvc75481g229yhcx156"; + version = "0.10.5"; + sha256 = "0cm12krcri332yw0zb3k4kakpq30xlfxkyc8i67bniwm7h973hnh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -91878,22 +92428,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "foldl_1_4_8" = callPackage + "foldl_1_4_9" = callPackage ({ mkDerivation, base, bytestring, comonad, containers , contravariant, criterion, doctest, hashable, mwc-random , primitive, profunctors, semigroupoids, text, transformers - , unordered-containers, vector, vector-builder + , unordered-containers, vector }: mkDerivation { pname = "foldl"; - version = "1.4.8"; - sha256 = "1jlrcj9nq8xwlrsny6fzfizai3ilc1zbw38abgf35ryl23r5j6pd"; - revision = "1"; - editedCabalFile = "09jz01w3brgd8fwya56qgg0riv9vxzc0r9lkkhkx54nflari2rig"; + version = "1.4.9"; + sha256 = "06cl9nyamzrmk894zm5na5hkbvnfyla1yvs2dk2ydms5m0v7z1na"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable mwc-random primitive profunctors semigroupoids text transformers - unordered-containers vector vector-builder + unordered-containers vector ]; testHaskellDepends = [ base doctest ]; benchmarkHaskellDepends = [ base criterion ]; @@ -93232,6 +93780,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "free_5_1_4" = callPackage + ({ mkDerivation, base, comonad, containers, distributive + , exceptions, mtl, profunctors, semigroupoids, template-haskell + , th-abstraction, transformers, transformers-base + }: + mkDerivation { + pname = "free"; + version = "5.1.4"; + sha256 = "0nid1vpf4c4pwxa5x7wyb2h378q0jf57zh14gkkhrj7bzc5qnprc"; + libraryHaskellDepends = [ + base comonad containers distributive exceptions mtl profunctors + semigroupoids template-haskell th-abstraction transformers + transformers-base + ]; + description = "Monads for free"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "free-algebras" = callPackage ({ mkDerivation, base, containers, data-fix, dlist, free, groups , hedgehog, kan-extensions, mtl, transformers @@ -93263,6 +93830,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "free-categories_0_2_0_2" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "free-categories"; + version = "0.2.0.2"; + sha256 = "1s5fdl7sgqhwk3zqrbv9qjzp7r12wyh4pwz38yywzhc32gl0vm4r"; + libraryHaskellDepends = [ base ]; + description = "free categories"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "free-category" = callPackage ({ mkDerivation, base, criterion, free-algebras, QuickCheck, tasty , tasty-quickcheck @@ -95329,8 +95908,8 @@ self: { }: mkDerivation { pname = "fused-effects-readline"; - version = "0.1.0.0"; - sha256 = "1s9s5dbj0gs4y0cngqb7ynykx840n065bixx1c22xz1i481bf52m"; + version = "0.1.0.1"; + sha256 = "1n1rdwrjww6hihryigk33bk9wcy69hi80c82kcbkclbmmaziz3j2"; libraryHaskellDepends = [ base directory filepath fused-effects haskeline prettyprinter prettyprinter-ansi-terminal terminal-size transformers @@ -95379,10 +95958,8 @@ self: { }: mkDerivation { pname = "fused-effects-th"; - version = "0.1.0.1"; - sha256 = "0yr9gymqna0q47cv9j17cwgbbjc8sjf7f1lm8fbig5zybb6ycpm9"; - revision = "1"; - editedCabalFile = "0slildsx3al8gn9s8w1dqq55pwsizjbkwmkm1vl742zk0kivax8c"; + version = "0.1.0.2"; + sha256 = "0p1fiy34388154cmj849x5pvrbz3zmrl3dj525wrkj0c10gi234i"; libraryHaskellDepends = [ base fused-effects template-haskell ]; testHaskellDepends = [ base fused-effects tasty tasty-hunit template-haskell @@ -95444,16 +96021,16 @@ self: { , directory-tree, dlist, file-embed, filepath, free, gitrev, happy , haskeline, language-c-quote, mainland-pretty, megaparsec, mtl , neat-interpolation, parallel, parser-combinators, pcg-random - , process, process-extras, QuickCheck, regex-tdfa, srcloc, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, temporary - , terminal-size, text, time, transformers, unordered-containers - , utf8-string, vector, vector-binary-instances, versions - , zip-archive, zlib + , process, process-extras, QuickCheck, regex-tdfa, sexp-grammar + , srcloc, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , temporary, terminal-size, text, time, transformers + , unordered-containers, utf8-string, vector + , vector-binary-instances, versions, zip-archive, zlib }: mkDerivation { pname = "futhark"; - version = "0.16.4"; - sha256 = "14k682phqdp2scmv064i6jyymf3j2f3bs25yw1qff76bkymv02vd"; + version = "0.17.2"; + sha256 = "16h0s6m6mnzxfbijd979zqbbrdma6gpm7yvg4lxnl5xcw26k57w4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95461,21 +96038,35 @@ self: { cmark-gfm containers directory directory-tree dlist file-embed filepath free gitrev haskeline language-c-quote mainland-pretty megaparsec mtl neat-interpolation parallel pcg-random process - process-extras regex-tdfa srcloc template-haskell temporary - terminal-size text time transformers unordered-containers + process-extras regex-tdfa sexp-grammar srcloc template-haskell + temporary terminal-size text time transformers unordered-containers utf8-string vector vector-binary-instances versions zip-archive zlib ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base text ]; testHaskellDepends = [ - base containers megaparsec mtl parser-combinators QuickCheck tasty - tasty-hunit tasty-quickcheck text + base containers megaparsec mtl parser-combinators QuickCheck + sexp-grammar tasty tasty-hunit tasty-quickcheck text ]; description = "An optimising compiler for a functional, array-oriented language"; license = stdenv.lib.licenses.isc; }) {}; + "futhask" = callPackage + ({ mkDerivation, base, directory, raw-strings-qq, split }: + mkDerivation { + pname = "futhask"; + version = "0.1.0"; + sha256 = "11cgnalnywm0xrjhzygd9vvff8yd46s886ljvdbmpl01py97kpwx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory raw-strings-qq split ]; + executableHaskellDepends = [ base directory raw-strings-qq split ]; + description = "Generate Haskell wrappers for Futhark libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "futun" = callPackage ({ mkDerivation, base, bytestring, network, unix }: mkDerivation { @@ -97073,6 +97664,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-deriving_1_14" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover + , template-haskell, th-abstraction + }: + mkDerivation { + pname = "generic-deriving"; + version = "1.14"; + sha256 = "00nbnxxkxyjfzj3zf6sxh3im24qv485w4jb1gj36c2wn4gjdbayh"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell th-abstraction + ]; + testHaskellDepends = [ base hspec template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Generic programming library for generalised deriving"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generic-enum" = callPackage ({ mkDerivation, array, base, bytestring, hspec }: mkDerivation { @@ -97464,6 +98073,8 @@ self: { pname = "generics-sop"; version = "0.5.1.0"; sha256 = "0g0z0k5bnw3whfj3qswzhadrhg85jfn491s30cgai0ijfjm5gipa"; + revision = "1"; + editedCabalFile = "1m61bb6k96ybsrc3hpxn0fdspq9mbkyfklx7vfnd55mava4ahzp2"; libraryHaskellDepends = [ base ghc-prim sop-core template-haskell th-abstraction ]; @@ -101683,8 +102294,8 @@ self: { }: mkDerivation { pname = "gi-poppler"; - version = "0.18.23"; - sha256 = "0dn6qnsrgnvbz9nbv0ig9hyjmswrq6v3z1bcnf0pybcdwr8j1zrw"; + version = "0.18.24"; + sha256 = "1n69xzw5w3y27x0vz4i4hi7ypr714ilj9i985ym713kvdfdyz12g"; setupHaskellDepends = [ base Cabal gi-cairo gi-gio gi-glib gi-gobject haskell-gi ]; @@ -103736,25 +104347,23 @@ self: { ({ mkDerivation, async, attoparsec, base, base64-bytestring , bytestring, Cabal, config-schema, config-value, containers , directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL - , HUnit, irc-core, kan-extensions, lens, mwc-random, network - , process, psqueues, regex-tdfa, semigroupoids, split, stm - , template-haskell, text, time, transformers, unix - , unordered-containers, vector, vty + , HUnit, irc-core, kan-extensions, lens, network, process, psqueues + , random, regex-tdfa, semigroupoids, split, stm, template-haskell + , text, time, transformers, unix, unordered-containers, vector, vty }: mkDerivation { pname = "glirc"; - version = "2.36"; - sha256 = "0s136d0nnw0vs198kzana10ybnka4mx0jyqdf1wsz5m9a4y3cnvj"; + version = "2.37"; + sha256 = "1222dz42lyk44xgs10wwjpd2qn4l0ak3v98vj103xh535hki9ibn"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ async attoparsec base base64-bytestring bytestring config-schema config-value containers directory filepath free gitrev hashable - hookup HsOpenSSL irc-core kan-extensions lens mwc-random network - process psqueues regex-tdfa semigroupoids split stm - template-haskell text time transformers unix unordered-containers - vector vty + hookup HsOpenSSL irc-core kan-extensions lens network process + psqueues random regex-tdfa semigroupoids split stm template-haskell + text time transformers unix unordered-containers vector vty ]; executableHaskellDepends = [ base lens text vty ]; testHaskellDepends = [ base HUnit ]; @@ -108563,8 +109172,8 @@ self: { }: mkDerivation { pname = "graphql-client"; - version = "1.0.0"; - sha256 = "1qzrlk3vkvavi14zz7dkndz8qh449s6rpbrd5phqclgbrah1hj3a"; + version = "1.1.0"; + sha256 = "0yk6nfyyynydrgwc1cdy5235121gw5q4iaapbvixpckz2diidxx7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111149,18 +111758,18 @@ self: { ({ mkDerivation, base, bifunctors, blaze-html, blaze-markup , bytestring, containers, directory, filepath, markdown, mime-types , mtl, network-uri, optparse-applicative, rss, scotty, scotty-tls - , text, time, transformers + , text, time, transformers, warp-tls }: mkDerivation { pname = "hablog"; - version = "0.6.0"; - sha256 = "0373kjd67iivrrr6kcjrhcqkk2wrxfx9zz3qn58mhycp8w78biaq"; + version = "0.7.1"; + sha256 = "1nn88hpp1q1y96px18qvc9q6gq51dl6m1m9hiipr64a6rngryxiy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bifunctors blaze-html blaze-markup bytestring containers directory filepath markdown mime-types mtl network-uri rss scotty - scotty-tls text time transformers + scotty-tls text time transformers warp-tls ]; executableHaskellDepends = [ base optparse-applicative text ]; description = "A blog system"; @@ -112842,6 +113451,45 @@ self: { broken = true; }) {inherit (pkgs) utillinux;}; + "hakyll_4_13_4_1" = callPackage + ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring + , containers, cryptonite, data-default, deepseq, directory + , file-embed, filepath, fsnotify, http-conduit, http-types + , lrucache, memory, mtl, network-uri, optparse-applicative, pandoc + , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa + , resourcet, scientific, tagsoup, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, time + , time-locale-compat, unordered-containers, utillinux, vector, wai + , wai-app-static, warp, yaml + }: + mkDerivation { + pname = "hakyll"; + version = "4.13.4.1"; + sha256 = "1z9k3029bjyxy2aqmqr6gzsva50154y4bfxqkmsjgl38lx3s6kk9"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary blaze-html blaze-markup bytestring containers + cryptonite data-default deepseq directory file-embed filepath + fsnotify http-conduit http-types lrucache memory mtl network-uri + optparse-applicative pandoc pandoc-citeproc parsec process random + regex-tdfa resourcet scientific tagsoup template-haskell text time + time-locale-compat unordered-containers vector wai wai-app-static + warp yaml + ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base bytestring containers filepath QuickCheck tasty tasty-hunit + tasty-quickcheck text unordered-containers yaml + ]; + testToolDepends = [ utillinux ]; + description = "A static website compiler library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) utillinux;}; + "hakyll-R" = callPackage ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process }: @@ -113494,6 +114142,31 @@ self: { broken = true; }) {HALVMCore = null; XenDevice = null;}; + "ham" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base + , brick, bytestring, containers, HTTP, microlens, microlens-th + , optparse-generic, serialport, text, time, transformers, unix + , unordered-containers, vector, vty + }: + mkDerivation { + pname = "ham"; + version = "0.1.0.0"; + sha256 = "14nf2bbfp09yvn1d4lkcmrh8n9bmy8s48r23ig6h4mkchjxxpvqr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty array attoparsec base brick bytestring + containers HTTP microlens microlens-th serialport text time + transformers unix unordered-containers vector vty + ]; + executableHaskellDepends = [ + base brick containers microlens optparse-generic text time unix + vector vty + ]; + testHaskellDepends = [ base bytestring ]; + license = "GPL"; + }) {}; + "hamid" = callPackage ({ mkDerivation, base, HCodecs, newtype }: mkDerivation { @@ -113660,8 +114333,8 @@ self: { ({ mkDerivation, base, containers, random }: mkDerivation { pname = "hanabi-dealer"; - version = "0.10.1.0"; - sha256 = "09kaxb2930synwwcwgk1xhbdmsd3zzr69i0ss4swasw4zlx8n0sh"; + version = "0.10.2.0"; + sha256 = "0axqpa1p7lzxym8nyppc3nhbfzis8y71ywi444v3w6syyvh06ygf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers random ]; @@ -114180,8 +114853,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.4.0.3"; - sha256 = "1pz75kmvmbpki9k957ymwhj427ghpd9qqsjplgd5mz4v2ikpng50"; + version = "2.4.1"; + sha256 = "1166ccqpjwr331chf7hi4n42m2frahpf93ardfjgv8x6d0p5pfss"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang @@ -116594,7 +117267,7 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; - "haskell-gi_0_24_4" = callPackage + "haskell-gi_0_24_5" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal , cabal-doctest, containers, directory, doctest, filepath, glib , gobject-introspection, haskell-gi-base, mtl, pretty-show, process @@ -116602,8 +117275,8 @@ self: { }: mkDerivation { pname = "haskell-gi"; - version = "0.24.4"; - sha256 = "0q2r8y9ca3w389sx613jz95hg9cssj6g4i2xyi8423nyqvyzms48"; + version = "0.24.5"; + sha256 = "0cb7qbi92zgqv9nx0v6pggw3lwv931hpph2jnrbmr1vl7sz48rqn"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal attoparsec base bytestring Cabal containers directory @@ -120221,6 +120894,21 @@ self: { broken = true; }) {}; + "hasql-pipes" = callPackage + ({ mkDerivation, base, bytestring-tree-builder, hasql, pipes + , pipes-safe, protolude + }: + mkDerivation { + pname = "hasql-pipes"; + version = "0.1.0.1"; + sha256 = "1wdpi21mxlb2iwqr25ap9xg8pd71sihxz129xpbj9nzn8w685day"; + libraryHaskellDepends = [ + base bytestring-tree-builder hasql pipes pipes-safe protolude + ]; + description = "A pipe to stream a postgres database cursor in the hasql ecosystem"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hasql-pool" = callPackage ({ mkDerivation, base-prelude, hasql, hspec, resource-pool, time }: mkDerivation { @@ -126990,19 +127678,19 @@ self: { }) {}; "hlatex" = callPackage - ({ mkDerivation, base, base-unicode-symbols, containers, derive - , directory, filepath, mtl, process, template-haskell, transformers - , uniplate, utf8-string + ({ mkDerivation, base, base-unicode-symbols, containers, directory + , filepath, mtl, process, template-haskell, transformers, uniplate + , utf8-string }: mkDerivation { pname = "hlatex"; - version = "0.3.1"; - sha256 = "13ldla8y8nw8fg4xrlqr60xqgs2n5sm72gzx99lqp0a4f84s3a0y"; + version = "0.3.2"; + sha256 = "0r4wdnps7m3j94xqab1lf8za5mning132h0micbqp86pnhlqn8g5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base-unicode-symbols containers derive directory filepath mtl - process template-haskell transformers uniplate utf8-string + base base-unicode-symbols containers directory filepath mtl process + template-haskell transformers uniplate utf8-string ]; description = "A library to build valid LaTeX files"; license = stdenv.lib.licenses.bsd3; @@ -127213,6 +127901,8 @@ self: { pname = "hledger-iadd"; version = "1.3.12"; sha256 = "0klrqss2ch4yi50m1rybznzsjg4ahbx7rg9n8w5svpf34fdlp048"; + revision = "1"; + editedCabalFile = "0amfrcwklqzpjkgr714d0as57m5ndaywi04d44ygvq2p5jd0h129"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127680,8 +128370,10 @@ self: { }: mkDerivation { pname = "hls-plugin-api"; - version = "0.4.0.0"; - sha256 = "1fr9j1nf0lkff3fb5vslfvkb42836ncfhhkswn8rq6mwlv0mv03k"; + version = "0.4.1.0"; + sha256 = "00ms2m9sn7a935fh6l3grzvbfq67acjymqmy9rjpn30d0slr1672"; + revision = "1"; + editedCabalFile = "09fd4br6s8lddl98nmwybayqr0z58k8h8fdw5r3jxw00cr13vw31"; libraryHaskellDepends = [ aeson base containers data-default Diff ghc ghc-boot-th ghcide haskell-lsp hslogger lens process regex-tdfa shake text @@ -128668,6 +129360,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hoauth2_1_15_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.15.0"; + sha256 = "12f564jcma8pl1qbc8g258jb92q5bdv3xzl6xr3bin8hln86sz1f"; + 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 @@ -129218,8 +129931,8 @@ self: { ({ mkDerivation, base, hourglass, split }: mkDerivation { pname = "homura-stopwatch"; - version = "0.1.3"; - sha256 = "0daq08k77dscg8fcqh7pwpyyvjdv8xdl8gq37rwhrbinll177qs0"; + version = "0.2.0"; + sha256 = "1vxdgxqk7zrvymmvk597s5gqkn3c93q548ssm3jdvcrg4csbk551"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hourglass split ]; @@ -129624,15 +130337,16 @@ self: { }) {}; "hookup" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, HsOpenSSL - , HsOpenSSL-x509-system, network + ({ mkDerivation, async, attoparsec, base, bytestring, HsOpenSSL + , HsOpenSSL-x509-system, network, stm }: mkDerivation { pname = "hookup"; - version = "0.4"; - sha256 = "0zfplby1lkbdr3s6icv1p4vii77a2sb3mx0ylp9pjg7f3ic9lw8i"; + version = "0.5"; + sha256 = "1kpwg5jik2z8xrw192mglacgnm2clg9yca68jzk4gk0569krysnf"; libraryHaskellDepends = [ - attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network + async attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system + network stm ]; description = "Abstraction over creating network connections with SOCKS5 and TLS"; license = stdenv.lib.licenses.isc; @@ -135326,6 +136040,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-wai_0_11_0" = callPackage + ({ mkDerivation, base, base-compat, bytestring, case-insensitive + , hspec, hspec-core, hspec-expectations, http-types, QuickCheck + , text, transformers, wai, wai-extra + }: + mkDerivation { + pname = "hspec-wai"; + version = "0.11.0"; + sha256 = "0fk23vrs5apjy11z47mply2kay3n193gnyrbb9fkpwvmxyhxlp0x"; + libraryHaskellDepends = [ + base base-compat bytestring case-insensitive hspec-core + hspec-expectations http-types QuickCheck text transformers wai + wai-extra + ]; + testHaskellDepends = [ + base base-compat bytestring case-insensitive hspec hspec-core + hspec-expectations http-types QuickCheck text transformers wai + wai-extra + ]; + description = "Experimental Hspec support for testing WAI applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-wai-json" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring , case-insensitive, hspec, hspec-wai, template-haskell @@ -135343,6 +136081,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-wai-json_0_11_0" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring + , case-insensitive, hspec, hspec-wai, template-haskell + }: + mkDerivation { + pname = "hspec-wai-json"; + version = "0.11.0"; + sha256 = "0cra0jfb8j9g5447lij0d8nnbqv06f5i4j51h14vjw0n7zb4i8y4"; + libraryHaskellDepends = [ + aeson aeson-qq base bytestring case-insensitive hspec-wai + template-haskell + ]; + testHaskellDepends = [ base hspec hspec-wai ]; + description = "Testing JSON APIs with hspec-wai"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-webdriver" = callPackage ({ mkDerivation, aeson, base, data-default, hashable, hspec , hspec-core, HUnit, lifted-base, stm, text, transformers @@ -137301,6 +138057,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-client-websockets" = callPackage + ({ mkDerivation, base, bytestring, doctest, hspec, http-client + , http-client-tls, network-uri, utf8-string, websockets + }: + mkDerivation { + pname = "http-client-websockets"; + version = "0.1.0.0"; + sha256 = "1wx1dx3n8vjz3qa9l2a7l6i2scwbwxavjh0ss6awwphyirfl0v6p"; + revision = "1"; + editedCabalFile = "0wj1b817w8c0cjpqkbganvrbhz99hnr5gcj47l3g4bv4n90ygrpn"; + libraryHaskellDepends = [ + base bytestring http-client network-uri utf8-string websockets + ]; + testHaskellDepends = [ + base bytestring doctest hspec http-client-tls network-uri + websockets + ]; + description = "Glue code for http-client and websockets"; + license = stdenv.lib.licenses.cc0; + }) {}; + "http-common" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , case-insensitive, directory, mtl, network, text, transformers @@ -137430,8 +138207,8 @@ self: { }: mkDerivation { pname = "http-date"; - version = "0.0.8"; - sha256 = "09slbzqayjnqqz9zybk7slgzvizgplikqgg4b2flzgks91466k0g"; + version = "0.0.9"; + sha256 = "0dxrlwaqdimgxr8nziyzgqsrg44dl9gxa060cg0k7ndpnlpcbjwa"; libraryHaskellDepends = [ array attoparsec base bytestring time ]; testHaskellDepends = [ base bytestring doctest hspec old-locale time @@ -137570,8 +138347,8 @@ self: { }: mkDerivation { pname = "http-io-streams"; - version = "0.1.4.0"; - sha256 = "004qqxc101qa9kcsn72wlgmfn14js3x6fx18kqvzhhxjh6fx0g1h"; + version = "0.1.5.0"; + sha256 = "0c8x4iyvg2yjsvvfvvp96ddw9fpmjiaql4c7kpf93f9i5rkyxjy5"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary blaze-builder brotli-streams bytestring case-insensitive containers @@ -143278,8 +144055,8 @@ self: { }: mkDerivation { pname = "implicit-hie-cradle"; - version = "0.2.0.0"; - sha256 = "1rzif3hzayqhm6spmynvw7ynkymsycaiycf6z9h18382vsd53qrk"; + version = "0.2.0.1"; + sha256 = "1l2i05w547sdgh7dhvwvc8x6i100lb2l3zwr6bhjmapdj5sjnqd1"; libraryHaskellDepends = [ base base16-bytestring bytestring containers directory extra filepath hie-bios hslogger implicit-hie process temporary text time @@ -143545,8 +144322,8 @@ self: { }: mkDerivation { pname = "incremental"; - version = "0.3"; - sha256 = "0l433m75m89iyb8djfzk7nfysmy11p75a852ib48n4gzkgyvi3mh"; + version = "0.3.1"; + sha256 = "0s2hlhszk8aj5zbl64il5c9gccda64bfbgwfl5fvzsdr79qylv40"; libraryHaskellDepends = [ aeson base bytestring containers deepseq semigroups text ]; @@ -144449,8 +145226,8 @@ self: { }: mkDerivation { pname = "inline-c"; - version = "0.9.1.0"; - sha256 = "0xi9ic5qjdfwblkaphf989lb37r1wc2z9kkhz1ailhw1lzq7g5l2"; + version = "0.9.1.2"; + sha256 = "1lvsjjxnjwfnqlq4i5mz2xizpx052nq25wjgm47302akpjzpym6n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144963,8 +145740,8 @@ self: { pname = "intcode"; version = "0.3.0.0"; sha256 = "0qcws15hn03wnsv1rg93sw9zhwsyvwpiafrmwnyv9v990qap1x8y"; - revision = "1"; - editedCabalFile = "1ad9fm65l8rnkm7236ak7v9j7hvj1jswwdcaw0xcsn9znn4xawl0"; + revision = "2"; + editedCabalFile = "1yd0i90i910ysc7xflpdnkp4bgp1k6cdcl8p3qwqi07vlngkscxw"; libraryHaskellDepends = [ base containers primitive ]; testHaskellDepends = [ base containers doctest primitive ]; description = "Advent of Code 2019 intcode interpreter"; @@ -145254,6 +146031,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "intern_0_9_3" = callPackage + ({ mkDerivation, array, base, bytestring, hashable, text + , unordered-containers + }: + mkDerivation { + pname = "intern"; + version = "0.9.3"; + sha256 = "1pbk804kq5p25ixrihhpfgy0fwj8i6cybxlhk42krzni7ad7gx4k"; + libraryHaskellDepends = [ + array base bytestring hashable text unordered-containers + ]; + description = "Efficient hash-consing for arbitrary data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "internetmarke" = callPackage ({ mkDerivation, base, explicit-exception, HPDF, parsec, process , transformers, utility-ht @@ -145822,6 +146615,29 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "invariant_0_5_4" = callPackage + ({ mkDerivation, array, base, bifunctors, comonad, containers + , contravariant, ghc-prim, hspec, hspec-discover, profunctors + , QuickCheck, StateVar, stm, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + , unordered-containers + }: + mkDerivation { + pname = "invariant"; + version = "0.5.4"; + sha256 = "1jlp0gbfjsx7k08275djh8m3v4rpg8llw5gdkg9s9qfx0lc0mymr"; + libraryHaskellDepends = [ + array base bifunctors comonad containers contravariant ghc-prim + profunctors StateVar stm tagged template-haskell th-abstraction + transformers transformers-compat unordered-containers + ]; + testHaskellDepends = [ base hspec QuickCheck template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell98 invariant functors"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "invertible" = callPackage ({ mkDerivation, base, haskell-src-meta, invariant, lens , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell @@ -146633,8 +147449,8 @@ self: { }: mkDerivation { pname = "irc-core"; - version = "2.8"; - sha256 = "1msn18qxvwywwkqz2mv6d5awk29w3f3jqjdjw7dwvk5k25llmc3l"; + version = "2.9"; + sha256 = "1n1fd46am795bsb96jnq2kj3gn787q5j41115g1smfp01zbnjp1b"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -148901,12 +149717,12 @@ self: { }) {}; "joint" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, transformers }: mkDerivation { pname = "joint"; - version = "0.1.6"; - sha256 = "17vqr8r338ikvqsvrqqs7k93z54g60ibg9x4by34aqjahh5l5gby"; - libraryHaskellDepends = [ base ]; + version = "0.1.7"; + sha256 = "193ygi06hfn1smdhh7fz74lz2gffcvg66cxp6qlvi7m3rbhm1f1l"; + libraryHaskellDepends = [ base transformers ]; description = "Trying to compose non-composable"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -148929,16 +149745,19 @@ self: { }) {}; "jord" = callPackage - ({ mkDerivation, base, criterion, hspec, HUnit }: + ({ mkDerivation, base, criterion, hspec, hspec-discover, HUnit + , markdown-unlit + }: mkDerivation { pname = "jord"; - version = "1.0.0.0"; - sha256 = "0fqc74l2n6z79rdg22svk94k5a2yw8r8djdbd94afjqpyq05dbcq"; + version = "2.0.0.0"; + sha256 = "0f4x7di0qjngglyjqgfczvlji5hmk7wr16laxdjr2cyp81aa3vgj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base criterion ]; - testHaskellDepends = [ base hspec HUnit ]; + testHaskellDepends = [ base hspec HUnit markdown-unlit ]; + testToolDepends = [ hspec-discover markdown-unlit ]; description = "Geographical Position Calculations"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -148987,6 +149806,37 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "jose_0_8_4" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, concise, containers, cryptonite, hspec, lens, memory + , monad-time, mtl, network-uri, pem, QuickCheck + , quickcheck-instances, safe, tasty, tasty-hspec, tasty-quickcheck + , template-haskell, text, time, unordered-containers, vector, x509 + }: + mkDerivation { + pname = "jose"; + version = "0.8.4"; + sha256 = "0xs4r4znbgfc407q3zndhffk6l9m57wml29pcwyqywd5i3xl5pyb"; + 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 template-haskell text time + unordered-containers vector x509 + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite hspec lens memory monad-time mtl network-uri + pem QuickCheck quickcheck-instances safe 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 @@ -151031,6 +151881,8 @@ self: { pname = "kan-extensions"; version = "5.2"; sha256 = "1lyvyiwwh962j2nnnsqzlvp5zq6z8p3spvhmji99cjvldxc7wwkb"; + revision = "1"; + editedCabalFile = "1kiazy9sd42iham8h9f6biifiwc26x0fci4p0376wq1n6fcxl9y4"; libraryHaskellDepends = [ adjunctions array base comonad containers contravariant distributive free invariant mtl profunctors semigroupoids tagged @@ -151040,6 +151892,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "kan-extensions_5_2_1" = callPackage + ({ mkDerivation, adjunctions, array, base, comonad, containers + , contravariant, distributive, free, invariant, mtl, profunctors + , semigroupoids, tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "kan-extensions"; + version = "5.2.1"; + sha256 = "114zs8j81ich4178qvvlnpch09dvbv1mm1g7xf2g78f77gh9ia7a"; + libraryHaskellDepends = [ + adjunctions array base comonad containers contravariant + distributive free invariant mtl profunctors semigroupoids tagged + transformers transformers-compat + ]; + description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kangaroo" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -152587,6 +153458,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "kind-generics-th_0_2_2_1" = callPackage + ({ mkDerivation, base, ghc-prim, kind-generics, template-haskell + , th-abstraction + }: + mkDerivation { + pname = "kind-generics-th"; + version = "0.2.2.1"; + sha256 = "014dzqs8n15vvj0vypd0ws1yxn1vy92gbk2zvi5m660wsgrj62aa"; + libraryHaskellDepends = [ + base ghc-prim kind-generics template-haskell th-abstraction + ]; + testHaskellDepends = [ base kind-generics template-haskell ]; + description = "Template Haskell support for generating `GenericK` instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kinds" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -153160,10 +154048,8 @@ self: { }: mkDerivation { pname = "kubernetes-client"; - version = "0.2.0.0"; - sha256 = "07vvp8yb7jx5cgn3siykkh7jdkkcxapclyp09q4n975fzd01waww"; - revision = "1"; - editedCabalFile = "18gp9q7myy4yvqv5p1ra12d5g69qrc0r0i8ifzwavj4vc92bhmdc"; + version = "0.3.0.0"; + sha256 = "1wpcamcvyphs2y370qzn5fmc18zyn8nb0099si12n9xgk5zdmcrq"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring connection containers data-default-class either filepath hoauth2 http-client @@ -153197,8 +154083,8 @@ self: { }: mkDerivation { pname = "kubernetes-client-core"; - version = "0.2.0.0"; - sha256 = "03f9h4cb02nj2g49grp3i22djc6zh2bqxl7yxkx1yf70fnqv2zcq"; + version = "0.3.0.0"; + sha256 = "0ifn69iqxwxkl4y2qlz5d25fbyqb2pks0cd064j54hc0fjwlxlzk"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq exceptions http-api-data http-client http-client-tls @@ -154764,8 +155650,8 @@ self: { }: mkDerivation { pname = "language-dickinson"; - version = "1.3.0.3"; - sha256 = "1bgcczk8v3gfrh44hsqmw7an7998yvn0dgla3rc0kr0xs7zsgp62"; + version = "1.4.0.0"; + sha256 = "139y3kgbrjv8x16rda9ixhcdl6xs26blq0sgcz7zpzwgbp60yflb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -155780,24 +156666,28 @@ self: { "lapack" = callPackage ({ mkDerivation, base, blas-ffi, blaze-html, boxes, ChasingBottoms - , comfort-array, data-ref, deepseq, fixed-length - , guarded-allocation, hyper, lapack-ffi, lazyio, monoid-transformer - , netlib-ffi, non-empty, QuickCheck, quickcheck-transformer, random - , semigroups, text, tfp, transformers, unique-logic-tf, utility-ht + , comfort-array, data-ref, deepseq, doctest-exitcode-stdio + , fixed-length, guarded-allocation, hyper, lapack-ffi, lazyio + , monoid-transformer, netlib-ffi, non-empty, QuickCheck + , quickcheck-transformer, random, semigroups, text, tfp + , transformers, unique-logic-tf, utility-ht }: mkDerivation { pname = "lapack"; - version = "0.3.1"; - sha256 = "1w8nndh3gj6vrildxjn13lmi7aqjwbhpqkdj7d21fsfbmhjlgwvr"; + version = "0.3.2"; + sha256 = "12h9k8hx3qpfa3ma24glngpk1x9m8h17qzv86sfq54br19ikz5y0"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base blas-ffi blaze-html boxes comfort-array deepseq fixed-length guarded-allocation hyper lapack-ffi lazyio netlib-ffi non-empty semigroups text tfp transformers utility-ht ]; testHaskellDepends = [ - base ChasingBottoms comfort-array data-ref monoid-transformer - netlib-ffi non-empty QuickCheck quickcheck-transformer random - semigroups tfp transformers unique-logic-tf utility-ht + base ChasingBottoms comfort-array data-ref doctest-exitcode-stdio + monoid-transformer netlib-ffi non-empty QuickCheck + quickcheck-transformer random semigroups tfp transformers + unique-logic-tf utility-ht ]; description = "Numerical Linear Algebra using LAPACK"; license = stdenv.lib.licenses.bsd3; @@ -157379,39 +158269,14 @@ self: { }) {}; "lens-core" = callPackage - ({ mkDerivation, array, base, base-compat, base-orphans, bytestring - , Cabal, cabal-doctest, call-stack, comonad, containers, criterion - , deepseq, directory, doctest, dual, filepath, foldable1 - , generic-deriving, ghc-prim, hs-functors, HUnit, mtl, nats - , parallel, QuickCheck, semigroups, simple-reflect, tagged - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , test-framework-th, text, transformers, unordered-containers, util - , vector - }: + ({ mkDerivation, base }: mkDerivation { pname = "lens-core"; - version = "0.1.0.3"; - sha256 = "0bnjnnfavgxy600yzmhqcj91awgk420ybr8wi4pghj2pi8z0581v"; - revision = "1"; - editedCabalFile = "0dalyxy1a0dkywm9mziiqhg4vcpkmw7g4lvahkw4mi371jkgvb4b"; - setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; - libraryHaskellDepends = [ - array base base-orphans call-stack containers dual foldable1 - ghc-prim hs-functors mtl tagged transformers util vector - ]; - testHaskellDepends = [ - base bytestring containers deepseq directory doctest filepath - generic-deriving HUnit mtl nats parallel QuickCheck semigroups - simple-reflect test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-th text transformers - unordered-containers vector - ]; - benchmarkHaskellDepends = [ - base base-compat bytestring comonad containers criterion deepseq - generic-deriving transformers unordered-containers vector - ]; - description = "Lenses, Folds and Traversals"; - license = stdenv.lib.licenses.bsd2; + version = "0.2"; + sha256 = "1q8290h588qbkylig6m7zp899pb8prbdz9k1ynr7f4g8wnjbzbbv"; + libraryHaskellDepends = [ base ]; + description = "A placeholder for a future lens core package"; + license = "(BSD-2-Clause OR Apache-2.0)"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -158530,8 +159395,8 @@ self: { }: mkDerivation { pname = "libjwt-typed"; - version = "0.1"; - sha256 = "0w0snz2gbdx6csp85bwwga57v1dpz53q2dkhkmmmzrl29jbix9h3"; + version = "0.2"; + sha256 = "0fcxp5v1rak0gazw1vfnc6rjz77xiqr91c78kybw5ca76q0hj005"; libraryHaskellDepends = [ base bytestring case-insensitive casing data-default either exceptions extra monad-time proxied text time transformers @@ -158716,6 +159581,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "libmpd_0_9_2_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , data-default-class, filepath, hspec, mtl, network, old-locale + , QuickCheck, safe-exceptions, text, time, unix, utf8-string + }: + mkDerivation { + pname = "libmpd"; + version = "0.9.2.0"; + sha256 = "0vjzwdxlldn07v9mkkx5vbh4pmz7s71qjh4c126f968a807zmqrn"; + libraryHaskellDepends = [ + attoparsec base bytestring containers data-default-class filepath + mtl network old-locale safe-exceptions text time utf8-string + ]; + testHaskellDepends = [ + attoparsec base bytestring containers data-default-class filepath + hspec mtl network old-locale QuickCheck safe-exceptions text time + unix utf8-string + ]; + description = "An MPD client library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "libnix" = callPackage ({ mkDerivation, aeson, base, directory, errors, filepath, process , protolude, tasty, tasty-hunit, text @@ -159085,8 +159973,8 @@ self: { }: mkDerivation { pname = "libsystemd-journal"; - version = "1.4.4"; - sha256 = "1114fv3dvljxkwgxyx9ycpks8bwzj401d4ziri80rkf2ycl0pxc7"; + version = "1.4.5"; + sha256 = "01lgfysjclmjhfd1vl36r6xb7zl5i1pzzivzi1qwnih01laa5ix8"; libraryHaskellDepends = [ base bytestring hashable hsyslog pipes pipes-safe semigroups text transformers uniplate unix-bytestring unordered-containers uuid @@ -159353,6 +160241,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lift-generics_0_2" = callPackage + ({ mkDerivation, base, base-compat, generic-deriving, ghc-prim + , hspec, hspec-discover, mtl, template-haskell, th-compat + }: + mkDerivation { + pname = "lift-generics"; + version = "0.2"; + sha256 = "1m5pnf0vgbhkjzgkzfzzvd5jq1ilxpkh9mwjl06rs2kl1af66nna"; + libraryHaskellDepends = [ + base generic-deriving ghc-prim template-haskell th-compat + ]; + testHaskellDepends = [ + base base-compat generic-deriving hspec mtl template-haskell + th-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lift-read-show" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -159876,6 +160785,8 @@ self: { pname = "linear"; version = "1.21.1"; sha256 = "0rwr8h9ddzbxrfxzdqsy841rj27xbvy73v20r2aml7jqzy0s3gqc"; + revision = "1"; + editedCabalFile = "1nhngppga6fr3xxmjbz6kl4gcz79k3rmhz7d3vabhp2p4knk2m2d"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers @@ -159891,6 +160802,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "linear_1_21_2" = callPackage + ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes + , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq + , distributive, doctest, ghc-prim, hashable, HUnit, lens, random + , reflection, semigroupoids, semigroups, simple-reflect, tagged + , template-haskell, test-framework, test-framework-hunit + , transformers, transformers-compat, unordered-containers, vector + , void + }: + mkDerivation { + pname = "linear"; + version = "1.21.2"; + sha256 = "07x4y5clayhx992qb48fb0ajkr8vc01zipk0yq8rap6x6bg53vbr"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + adjunctions base base-orphans binary bytes cereal containers + deepseq distributive ghc-prim hashable lens random reflection + semigroupoids semigroups tagged template-haskell transformers + transformers-compat unordered-containers vector void + ]; + testHaskellDepends = [ + base binary bytestring deepseq doctest HUnit lens reflection + simple-reflect test-framework test-framework-hunit vector + ]; + description = "Linear Algebra"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "linear-accelerate" = callPackage ({ mkDerivation, accelerate, base, Cabal, cabal-doctest , distributive, doctest, lens, linear @@ -160629,8 +161569,8 @@ self: { ({ mkDerivation, base, bytestring, containers, hashable }: mkDerivation { pname = "lio"; - version = "0.11.7.0"; - sha256 = "17ckrv1ksm2ab91x63h5ia65hckw0zcxfr2mdl6aa2xxscnm4k8h"; + version = "0.11.7.1"; + sha256 = "04hcbvxskjji04sxx4jydac62sh6h7jlggn7kfwm8axmwjczjjqs"; libraryHaskellDepends = [ base bytestring containers hashable ]; description = "Labeled IO Information Flow Control Library"; license = stdenv.lib.licenses.mit; @@ -161921,8 +162861,6 @@ self: { ]; description = "General purpose LLVM bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {llvm-config = null;}; "llvm-hs-pretty" = callPackage @@ -161943,8 +162881,6 @@ self: { ]; description = "A pretty printer for LLVM IR"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "llvm-hs-pure" = callPackage @@ -163621,8 +164557,6 @@ self: { ]; description = "EDSL for the Michelson Language"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "loris" = callPackage @@ -163888,7 +164822,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lsp-test_0_11_0_5" = callPackage + "lsp-test_0_11_0_6" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl @@ -163897,8 +164831,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.11.0.5"; - sha256 = "0r038x65lc0ij6hs8klgj8v8f0fqqrn12dyxc0k8zf9pan9bwnph"; + version = "0.11.0.6"; + sha256 = "0f32i582rw6b1a3lr3jlddl7ry8v7xnfwhhd5vhhw71kqwafrrbs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163994,8 +164928,8 @@ self: { }: mkDerivation { pname = "lti13"; - version = "0.1.2.1"; - sha256 = "0fs8hj07b9p8m4y8jzmh0ny5x8fnxx75yb8kyk8slc6fjg8ybzlm"; + version = "0.1.2.2"; + sha256 = "18l5sj2rv3lfis6hcaymn8vv7w6dbsnzl9wsfml5vfmlpb4jw8fw"; libraryHaskellDepends = [ aeson base bytestring containers http-client http-types jose-jwt oidc-client safe-exceptions text @@ -164996,6 +165930,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "machines_0_7_1" = callPackage + ({ mkDerivation, adjunctions, base, Cabal, cabal-doctest, comonad + , conduit, containers, criterion, distributive, doctest, mtl, pipes + , pointed, profunctors, semigroupoids, semigroups, streaming + , transformers, transformers-compat, void + }: + mkDerivation { + pname = "machines"; + version = "0.7.1"; + sha256 = "0ayajyzaczdazfsmamlm5vap43x2mdm4w8v5970y1xlxh4rb3bs1"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + adjunctions base comonad containers distributive mtl pointed + profunctors semigroupoids semigroups transformers + transformers-compat void + ]; + testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ + base conduit criterion mtl pipes streaming + ]; + description = "Networked stream transducers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "machines-amazonka" = callPackage ({ mkDerivation, amazonka, amazonka-autoscaling, amazonka-core , amazonka-ec2, amazonka-s3, amazonka-sts, base @@ -166387,8 +167346,8 @@ self: { }: mkDerivation { pname = "map-reduce-folds"; - version = "0.1.0.4"; - sha256 = "126zh0icfgd8q10ib2kll4z06lk1099g1lysz56jzxwb8vjknq9r"; + version = "0.1.0.5"; + sha256 = "0a0xavn4dlcpkjw75lc8k9f8w8620m60s8q9r4c157010mb4w829"; libraryHaskellDepends = [ base containers discrimination foldl hashable hashtables parallel profunctors split streaming streamly text unordered-containers @@ -167697,8 +168656,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "50200.10.1"; - sha256 = "0m4vqxxcqvbgm6flfwqy2w47ada3r29r34yw1gyv02na7gx3rqi1"; + version = "50200.10.2"; + sha256 = "1yla2wjhv093l3pngbk1ph0sl3ib7qmns2i0c1k8kgxrz4yj2gfb"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -167736,8 +168695,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "50200.7.0"; - sha256 = "1zqvfp0miql9ha9fcvr84p7yhli5br9kmsn080h058zknyabrl8p"; + version = "50200.8.0"; + sha256 = "1x1wrf7yvwhwfn10207qv5ljpa1jwfm1ck67bwjzh3pcgq0d6x5w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167761,8 +168720,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "50200.7.0"; - sha256 = "0gzrbgzynzr5g234dm1qbs9xkddfvm08rv1n12qx0191fzicbf25"; + version = "50200.8.0"; + sha256 = "17d914dirzvpg3l4qly56y8y5yv18pc6qxngvi8sl410xnbx5p31"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -169752,8 +170711,8 @@ self: { }: mkDerivation { pname = "metro"; - version = "0.1.0.1"; - sha256 = "1snivs6zf3pjkh6p29wafjnrw8sfcrakl5s8ksn20hr1y8780v9k"; + version = "0.1.0.3"; + sha256 = "110zxqs79f8bcqx2w6c9h0snsqbzvkixpmzadmpdx13gqz32i73v"; libraryHaskellDepends = [ base binary bytestring hashable hslogger mtl transformers unix-time unliftio unordered-containers @@ -170265,6 +171224,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microlens-th_0_4_3_6" = callPackage + ({ mkDerivation, base, containers, microlens, template-haskell + , th-abstraction, transformers + }: + mkDerivation { + pname = "microlens-th"; + version = "0.4.3.6"; + sha256 = "1pw0ljpyhpj4jsgs25i4mi1a07vpbwfik84fc2kip1pzajflrcql"; + libraryHaskellDepends = [ + base containers microlens template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base microlens ]; + description = "Automatic generation of record lenses for microlens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "micrologger" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec, lens , text, text-format, time, transformers @@ -172029,8 +173006,8 @@ self: { }: mkDerivation { pname = "mmsyn6ukr"; - version = "0.8.0.0"; - sha256 = "0cs4mi9ia3l3v19hldbaygsywvjcfx66plbyh6311j2qzbrqaq93"; + version = "0.8.1.0"; + sha256 = "0r5lnx1m57kjfb1cfm9a22l9kn552y6vpfbkxpffi03ni407q65q"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -172339,8 +173316,8 @@ self: { pname = "modern-uri"; version = "0.3.2.0"; sha256 = "162s88yayalh4vlngman5gz3k0gnszxrksh1wk5227qihbpsiwhb"; - revision = "2"; - editedCabalFile = "14qxgpv72ybxrv08591ipsn5x5sdf9iflc94n9liagv5rjriy09x"; + revision = "3"; + editedCabalFile = "1md8x7ql885g3n55yfd2kgs4np74d7s6rdzlw69bs4zk8074b4q0"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec mtl profunctors QuickCheck reflection tagged @@ -173329,8 +174306,8 @@ self: { }: mkDerivation { pname = "monad-memo"; - version = "0.5.1"; - sha256 = "1zsvp0g2kzjf5zkv1js65jfc1p3yrkr95csp2ljpqx857qy4lnn6"; + version = "0.5.3"; + sha256 = "1fqdqqv6gp14vf2kkac34bbn3vaxq80yjz2dgp6n89dcfdkc9y0n"; libraryHaskellDepends = [ array base containers primitive transformers vector ]; @@ -174938,8 +175915,6 @@ self: { ]; description = "Developer tools for the Michelson Language"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "morley-prelude" = callPackage @@ -176275,6 +177250,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mtl-uplift" = callPackage + ({ mkDerivation, base, mtl }: + mkDerivation { + pname = "mtl-uplift"; + version = "0.1.0.0"; + sha256 = "1y75za4xl941aadn3bmc3rsa2jklv8z0l4vkwz7x92pbxv5ym8xq"; + libraryHaskellDepends = [ base mtl ]; + testHaskellDepends = [ base mtl ]; + description = "Lift substacks of monad transformer stacks"; + license = stdenv.lib.licenses.mit; + }) {}; + "mtlparse" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -176324,6 +177311,17 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "mtsl" = callPackage + ({ mkDerivation, base, mtl }: + mkDerivation { + pname = "mtsl"; + version = "0.2.0.0"; + sha256 = "02zfqimal6f5a1wldfy4abk7mvmvac71j9m01bxzw5ydmm057wgh"; + libraryHaskellDepends = [ base mtl ]; + description = "Reified monad transformer stacks"; + license = stdenv.lib.licenses.mit; + }) {}; + "mu-avro" = callPackage ({ mkDerivation, aeson, avro, base, bytestring, containers, deepseq , language-avro, mu-rpc, mu-schema, sop-core, tagged @@ -181047,6 +182045,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-byte-order_0_1_6" = callPackage + ({ mkDerivation, base, bytestring, doctest }: + mkDerivation { + pname = "network-byte-order"; + version = "0.1.6"; + sha256 = "0pnwcg13k4qw82n0zc1xibyc24sc77y79j5a62pqdmjrnz4wrc7j"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring doctest ]; + description = "Network byte order utilities"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-bytestring" = callPackage ({ mkDerivation, base, bytestring, network, unix }: mkDerivation { @@ -181819,6 +182830,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-types-icmp" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "network-types-icmp"; + version = "1.0.0.1"; + sha256 = "1j2z51jvrhh9nlnx9sfiabgascyp80ha1906hdm2d4w8xyrp7d1c"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Types for representing ICMP and ICMPv6 messages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "network-uri" = callPackage ({ mkDerivation, base, criterion, deepseq, HUnit, parsec , template-haskell, test-framework, test-framework-hunit @@ -182888,6 +183911,34 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) nix;}; + "nix-thunk" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cli-extras + , cli-git, cli-nix, containers, data-default, directory, either + , exceptions, extra, filepath, git, github, here, lens + , logging-effect, megaparsec, modern-uri, mtl, optparse-applicative + , temporary, text, time, unix, which, yaml + }: + mkDerivation { + pname = "nix-thunk"; + version = "0.1.0.0"; + sha256 = "0jg3j78dwq31g18fkmcbn4d8vlmdb0vpnicac2kmg0dwrw64v2gb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring cli-extras cli-git cli-nix + containers data-default directory either exceptions extra filepath + git github here lens logging-effect megaparsec modern-uri mtl + optparse-applicative temporary text time unix which yaml + ]; + executableHaskellDepends = [ + base cli-extras optparse-applicative text + ]; + description = "Virtual vendorization with Nix"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "nix-tools" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Cabal , containers, cryptohash-sha256, data-fix, deepseq, directory @@ -183883,13 +184934,13 @@ self: { }: mkDerivation { pname = "nothunks"; - version = "0.1.0.0"; - sha256 = "1ygkkyl90z99xgxzjl122vqnra7jl3v5cxzrb78z4lfx2mm59yla"; + version = "0.1.1.0"; + sha256 = "1nnkdzr3ffhy7yqi068ay3p1bc0g0lmpyps3pqf0267vcx8lf8zn"; libraryHaskellDepends = [ base bytestring containers ghc-heap text time vector ]; testHaskellDepends = [ - base containers ghc-prim hedgehog random tasty tasty-hedgehog text + base containers ghc-prim hedgehog random tasty tasty-hedgehog ]; description = "Examine values for unexpected thunks"; license = stdenv.lib.licenses.mit; @@ -184141,6 +185192,51 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "nri-env-parser" = callPackage + ({ mkDerivation, base, modern-uri, network-uri, nri-prelude, text + }: + mkDerivation { + pname = "nri-env-parser"; + version = "0.1.0.1"; + sha256 = "1v6984ndlalrvdff10frik8bxqskmzf8cr13q6095jl6krjivkay"; + libraryHaskellDepends = [ + base modern-uri network-uri nri-prelude text + ]; + description = "Read environment variables as settings to build 12-factor apps"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "nri-prelude" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, auto-update, base + , bytestring, concurrent-output, containers, directory, exceptions + , filepath, hedgehog, junit-xml, pretty-diff, pretty-show + , resourcet, safe-exceptions, tasty, tasty-test-reporter + , terminal-size, text, time, vector + }: + mkDerivation { + pname = "nri-prelude"; + version = "0.1.0.2"; + sha256 = "08m3a4gk66rfzwphpcfkd3z7qbfdkrks0f2wjwz0d3mwj638gnbv"; + libraryHaskellDepends = [ + aeson ansi-terminal async auto-update base bytestring + concurrent-output containers directory exceptions filepath hedgehog + junit-xml pretty-diff pretty-show resourcet safe-exceptions tasty + tasty-test-reporter terminal-size text time vector + ]; + testHaskellDepends = [ + aeson ansi-terminal async auto-update base bytestring + concurrent-output containers directory exceptions filepath hedgehog + junit-xml pretty-diff pretty-show resourcet safe-exceptions tasty + tasty-test-reporter terminal-size text time vector + ]; + description = "A Prelude inspired by the Elm programming language"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "nsis" = callPackage ({ mkDerivation, base, directory, process, transformers, uniplate }: @@ -186406,8 +187502,8 @@ self: { pname = "opaleye"; version = "0.7.1.0"; sha256 = "0i4ndy9dd6jb4dzx8a5fv8jsmnmp7p1kx2qr012xj1qjq36sqpy6"; - revision = "1"; - editedCabalFile = "1kcgpigl645m1n7ikxx4lnnlqmwh06kndg6mbz69rn5ir7qimv51"; + revision = "3"; + editedCabalFile = "14y8nnng9307wb1mafzdr2fmn37cwyfpw9sby8lf9sj467rvghrq"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -186642,8 +187738,8 @@ self: { }: mkDerivation { pname = "open-witness"; - version = "0.4.0.1"; - sha256 = "04a10cv0iddnvp5my4h00bmmpc2mxz6c5gih5p4iyc7bdq6m0w07"; + version = "0.5"; + sha256 = "1p3dd7s7zzjxp29w4n6yrfvlmcnrllz07lgnf2mjdv9lspynids0"; libraryHaskellDepends = [ base constraints hashable random template-haskell transformers witness @@ -188269,14 +189365,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "optparse-generic_1_4_3" = callPackage + "optparse-generic_1_4_4" = callPackage ({ mkDerivation, base, bytestring, Only, optparse-applicative , system-filepath, text, time, transformers, void }: mkDerivation { pname = "optparse-generic"; - version = "1.4.3"; - sha256 = "18ih1r28hlml9wysqrzljmgi6q90s3k6jaaa7a5i48vr9bl3prs8"; + version = "1.4.4"; + sha256 = "0xy0kc8qximsiqpnc1fmh5zlsh6n26s7scrixin5bwnylg056j74"; libraryHaskellDepends = [ base bytestring Only optparse-applicative system-filepath text time transformers void @@ -188343,18 +189439,20 @@ self: { "orbits" = callPackage ({ mkDerivation, ad, base, Cabal, cabal-doctest, checkers, doctest - , exact-real, QuickCheck, random, tagged, tasty, tasty-quickcheck - , tasty-th, units, units-defs + , exact-real, lens, linear, QuickCheck, random, tagged, tasty + , tasty-quickcheck, tasty-th, units, units-defs }: mkDerivation { pname = "orbits"; - version = "0.3"; - sha256 = "1hidsx5is68mi13l3yhvfidk9l1a4mcyj52im1bzqdp916ik05k1"; + version = "0.4"; + sha256 = "1pzdv4iw3z735hnpcgnwa9iq61x868grvn17hg6gfyw2aiag7wcv"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ ad base exact-real units units-defs ]; + libraryHaskellDepends = [ + ad base exact-real lens linear units units-defs + ]; testHaskellDepends = [ - ad base checkers doctest exact-real QuickCheck random tagged tasty - tasty-quickcheck tasty-th units units-defs + ad base checkers doctest exact-real lens linear QuickCheck random + tagged tasty tasty-quickcheck tasty-th units units-defs ]; description = "Types and functions for Kepler orbits"; license = stdenv.lib.licenses.bsd3; @@ -188561,6 +189659,23 @@ self: { broken = true; }) {}; + "ordinal" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover + , QuickCheck, template-haskell, text, vector + }: + mkDerivation { + pname = "ordinal"; + version = "0.1.2.0"; + sha256 = "0x7fhk8vl2rni9h3gsaq591ml68brv1f4bqrp7q3c5b4f2ghwhcs"; + libraryHaskellDepends = [ + base containers template-haskell text vector + ]; + testHaskellDepends = [ base hspec QuickCheck text ]; + testToolDepends = [ hspec-discover ]; + description = "Convert numbers to words in different languages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ordrea" = callPackage ({ mkDerivation, base, containers, directory, process, split , transformers, vector @@ -188825,10 +189940,8 @@ self: { }: mkDerivation { pname = "ormolu"; - version = "0.1.2.0"; - sha256 = "14ndqfcbx0y71d3q5i7d0scbvg9nd5qr5pdn7qvylxlkgpbc77qp"; - revision = "2"; - editedCabalFile = "07p7342972b2ffi46ll8jgbnlx97g7imzpl819hzc0yd2pjn4jn9"; + version = "0.1.3.0"; + sha256 = "13s8irk1w7yrh9algbnvv5hjvnxmi3fndz34rncp33cyfnjv18j7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -190308,7 +191421,7 @@ self: { broken = true; }) {}; - "pandoc-plot_0_9_2_0" = callPackage + "pandoc-plot_0_9_3_0" = callPackage ({ mkDerivation, base, bytestring, containers, criterion , data-default, directory, filepath, githash, hashable, hspec , hspec-expectations, lifted-async, mtl, optparse-applicative @@ -190317,8 +191430,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "0.9.2.0"; - sha256 = "0fryriyqlmfc82nqbqw7a8n7325wwag29v3ag61s600jw66i9fsc"; + version = "0.9.3.0"; + sha256 = "0zhxniymm9szgv0xczq570s0pziiwhm2sbry0jxxqq8d0vdimxyq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190468,6 +191581,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pandoc-types_1_22" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, transformers + }: + mkDerivation { + pname = "pandoc-types"; + version = "1.22"; + sha256 = "0kr5n9yw59513pw2rjc65qs55iq0prn16prk4781arqdh7g7a09q"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq ghc-prim QuickCheck syb + text transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers HUnit QuickCheck string-qq syb + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Types for representing a structured document"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-unlit" = callPackage ({ mkDerivation, base, pandoc }: mkDerivation { @@ -190770,7 +191907,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pantry_0_5_1_2" = callPackage + "pantry_0_5_1_3" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , casa-client, casa-types, conduit, conduit-extra, containers , cryptonite, cryptonite-conduit, digest, exceptions, filelock @@ -190784,8 +191921,8 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.5.1.2"; - sha256 = "1ix1y334l4a7zcqm8i849g67mgvkqzikbhcbkqc1d6hg1lhc7xzr"; + version = "0.5.1.3"; + sha256 = "0yx30zhyq0wbda6z8a9lvp8c83b3nj4l2s8lcxnvwgnzkanvlkss"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring Cabal casa-client casa-types conduit conduit-extra containers cryptonite cryptonite-conduit @@ -192444,13 +193581,13 @@ self: { "passman" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring - , bytestring, containers, HCL, HUnit, lens, random, SHA, text - , transformers + , bytestring, containers, easy-file, HCL, HUnit, lens, random, SHA + , text, transformers }: mkDerivation { pname = "passman"; - version = "0.2"; - sha256 = "1rqld0cdk0m5vi1j095rjyyfjl65d2k983i0zqsjgl1w34bz02cb"; + version = "0.2.1"; + sha256 = "0xa7cc38x012nznp5cwma44gf11v24w7h7cja869i282v7g5693b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192458,7 +193595,8 @@ self: { containers lens random SHA text ]; executableHaskellDepends = [ - aeson base bytestring containers HCL lens random transformers + aeson base bytestring containers easy-file HCL lens random + transformers ]; testHaskellDepends = [ aeson base bytestring containers HUnit lens random @@ -192789,6 +193927,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "path-dhall-instance" = callPackage + ({ mkDerivation, base, dhall, either, path, text }: + mkDerivation { + pname = "path-dhall-instance"; + version = "0.2.0.0"; + sha256 = "084vwqp8qmz0llwdfhls4sg9qbyn17mhbsxskjq4cpjk08xp10d5"; + libraryHaskellDepends = [ base dhall either path text ]; + description = "ToDhall and FromDhall instances for Path"; + license = stdenv.lib.licenses.mit; + }) {}; + "path-extensions" = callPackage ({ mkDerivation, base, exceptions, path }: mkDerivation { @@ -192884,8 +194033,8 @@ self: { ({ mkDerivation, base, exceptions, path, split, text }: mkDerivation { pname = "path-utils"; - version = "0.1.0.0"; - sha256 = "1abva4kfmj00ahd44rgzr6mk41y84gkvc6z7vwqz7m2g3r4zsxm2"; + version = "0.1.1.0"; + sha256 = "0k6wfy8vzddfhxsd5zlbjd4397syqhdg6i8v49d218m0qqfhzkpj"; libraryHaskellDepends = [ base exceptions path split text ]; description = "Handful of simple utility functions for the path library"; license = stdenv.lib.licenses.mit; @@ -194945,6 +196094,8 @@ self: { pname = "persistent-mongoDB"; version = "2.10.0.1"; sha256 = "194cxlxyaxwzgm7a7q8530bh842s5s1vmq33pclldp78nfy1dczm"; + revision = "1"; + editedCabalFile = "084gdbb25qn2cw0qz20hksr9ypf401iwwx2kysibi0y4zxvpcy2z"; libraryHaskellDepends = [ aeson base bson bytestring cereal conduit http-api-data mongoDB network path-pieces persistent resource-pool resourcet text time @@ -195122,27 +196273,6 @@ self: { }) {}; "persistent-qq" = callPackage - ({ mkDerivation, aeson, base, fast-logger, haskell-src-meta, hspec - , HUnit, monad-logger, mtl, persistent, persistent-sqlite - , persistent-template, resourcet, template-haskell, text, unliftio - }: - mkDerivation { - pname = "persistent-qq"; - version = "2.9.1.1"; - sha256 = "16gglrq59jrr4hyk5wwyza6x4s9izf5944igkv6mpj8vnanjazqs"; - libraryHaskellDepends = [ - base haskell-src-meta mtl persistent template-haskell text - ]; - testHaskellDepends = [ - aeson base fast-logger haskell-src-meta hspec HUnit monad-logger - mtl persistent persistent-sqlite persistent-template resourcet - template-haskell text unliftio - ]; - description = "Provides a quasi-quoter for raw SQL for persistent"; - license = stdenv.lib.licenses.mit; - }) {}; - - "persistent-qq_2_9_2" = callPackage ({ mkDerivation, aeson, base, bytestring, fast-logger , haskell-src-meta, hspec, HUnit, monad-logger, mtl, persistent , persistent-sqlite, persistent-template, resourcet @@ -195162,7 +196292,6 @@ self: { ]; description = "Provides a quasi-quoter for raw SQL for persistent"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-ratelimit" = callPackage @@ -195354,7 +196483,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-template_2_8_3_1" = callPackage + "persistent-template_2_9" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, deepseq-generics, file-embed, hspec, http-api-data , monad-control, monad-logger, path-pieces, persistent, QuickCheck @@ -195363,8 +196492,8 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.8.3.1"; - sha256 = "1g42j4pqf40wj6b9zzyvimrfvrpvjfzigydsx2wkr5dld909izb0"; + version = "2.9"; + sha256 = "181ag017wj41pzlc954mcx7s7v1dnqgjnry03hly8zln4iii63yw"; libraryHaskellDepends = [ aeson base bytestring containers http-api-data monad-control monad-logger path-pieces persistent template-haskell text @@ -196079,8 +197208,8 @@ self: { ({ mkDerivation, base, mmsyn2, mmsyn5, vector }: mkDerivation { pname = "phonetic-languages-ukrainian"; - version = "0.2.0.0"; - sha256 = "0lx1br8az752lnnwqm3qp3z27z78922d5i03bxgzd4v6zx78iksp"; + version = "0.2.2.0"; + sha256 = "0f59pzl4309hx65djnzn6wm3pkapzr2rkkcr41b65smlxh4pzzs7"; libraryHaskellDepends = [ base mmsyn2 mmsyn5 vector ]; description = "Prepares Ukrainian text to be used as a phonetic language text"; license = stdenv.lib.licenses.mit; @@ -199138,6 +200267,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pointed_5_0_2" = callPackage + ({ mkDerivation, base, comonad, containers, data-default-class + , hashable, kan-extensions, semigroupoids, semigroups, stm, tagged + , transformers, transformers-compat, unordered-containers + }: + mkDerivation { + pname = "pointed"; + version = "5.0.2"; + sha256 = "07p92y62dibys3xa59rvx52xyyr39nghl73z7hzwnksa3ry3vfmq"; + libraryHaskellDepends = [ + base comonad containers data-default-class hashable kan-extensions + semigroupoids semigroups stm tagged transformers + transformers-compat unordered-containers + ]; + description = "Pointed and copointed data"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pointedalternative" = callPackage ({ mkDerivation, base, mtl, semigroups, transformers }: mkDerivation { @@ -199465,6 +200613,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "poly_0_5_0_0" = callPackage + ({ mkDerivation, base, deepseq, doctest, finite-typelits, gauge + , mod, primitive, QuickCheck, quickcheck-classes, semirings, tasty + , tasty-quickcheck, vector, vector-algorithms, vector-sized + }: + mkDerivation { + pname = "poly"; + version = "0.5.0.0"; + sha256 = "1h7nbyiwnbxyj2jss04raws7zapfq7mvzj7fmi8rqyr0aw91k4zl"; + libraryHaskellDepends = [ + base deepseq finite-typelits primitive semirings vector + vector-algorithms vector-sized + ]; + testHaskellDepends = [ + base doctest finite-typelits mod QuickCheck quickcheck-classes + semirings tasty tasty-quickcheck vector vector-sized + ]; + benchmarkHaskellDepends = [ + base deepseq gauge mod semirings vector + ]; + description = "Polynomials"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "poly-arity" = callPackage ({ mkDerivation, base, constraints }: mkDerivation { @@ -199696,6 +200869,29 @@ self: { broken = true; }) {}; + "polysemy-chronos" = callPackage + ({ mkDerivation, aeson, base, chronos, containers, hedgehog + , polysemy, polysemy-plugin, polysemy-test, polysemy-time, tasty + , tasty-hedgehog, text + }: + mkDerivation { + pname = "polysemy-chronos"; + version = "0.1.0.0"; + sha256 = "1a4rm41x225kvmyfcrvqk0aw89fy16hzms3l1gij0b2xh5c5lfyw"; + libraryHaskellDepends = [ + aeson base chronos containers polysemy polysemy-plugin + polysemy-time text + ]; + testHaskellDepends = [ + aeson base chronos containers hedgehog polysemy polysemy-plugin + polysemy-test polysemy-time tasty tasty-hedgehog text + ]; + description = "Polysemy effect for chronos"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "polysemy-http" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring , case-insensitive, co-log-core, co-log-polysemy, composition @@ -199707,8 +200903,8 @@ self: { }: mkDerivation { pname = "polysemy-http"; - version = "0.2.0.3"; - sha256 = "10a0sihivgxn7w1m9rj6dbs9wiw6gmcf7qg0s2bnd3d4ipxxy89q"; + version = "0.2.0.4"; + sha256 = "1qznm0r7yc831hlgnyf2rmdd6nk2865qcjhzyc2djqv0mw4yg6ak"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring case-insensitive co-log-core co-log-polysemy composition containers data-default either @@ -199766,21 +200962,23 @@ self: { }) {}; "polysemy-test" = callPackage - ({ mkDerivation, base-noprelude, containers, either, hedgehog, path - , path-io, polysemy, polysemy-plugin, relude, string-interpolate - , tasty, tasty-hedgehog, text + ({ mkDerivation, base, containers, either, hedgehog, path, path-io + , polysemy, polysemy-plugin, relude, string-interpolate, tasty + , tasty-hedgehog, text, transformers }: mkDerivation { pname = "polysemy-test"; - version = "0.2.0.0"; - sha256 = "10kakaipasw1gbipjl4x23cma9f6iv3ma547a26b70ysap6c41ys"; + version = "0.3.0.1"; + sha256 = "0xy5ax03qy7936jxhbx3wi341z8r00bmjifha83izgi664hzb5fs"; libraryHaskellDepends = [ - base-noprelude containers either hedgehog path path-io polysemy + base containers either hedgehog path path-io polysemy polysemy-plugin relude string-interpolate tasty tasty-hedgehog text + transformers ]; testHaskellDepends = [ - base-noprelude containers either hedgehog path path-io polysemy + base containers either hedgehog path path-io polysemy polysemy-plugin relude string-interpolate tasty tasty-hedgehog text + transformers ]; description = "Polysemy effects for testing"; license = "BSD-2-Clause-Patent"; @@ -199788,6 +200986,45 @@ self: { broken = true; }) {}; + "polysemy-time" = callPackage + ({ mkDerivation, aeson, base, composition, containers, data-default + , either, hedgehog, polysemy, polysemy-plugin, polysemy-test + , relude, string-interpolate, tasty, tasty-hedgehog + , template-haskell, text, time, torsor + }: + mkDerivation { + pname = "polysemy-time"; + version = "0.1.0.0"; + sha256 = "1sdi8a2swqy8d2bmkmd2zxr968bzmkz4q07b2qw7840sq8q4bp6f"; + libraryHaskellDepends = [ + aeson base composition containers data-default either polysemy + relude string-interpolate template-haskell text time torsor + ]; + testHaskellDepends = [ + aeson base composition containers data-default either hedgehog + polysemy polysemy-plugin polysemy-test relude string-interpolate + tasty tasty-hedgehog template-haskell text time torsor + ]; + description = "Polysemy effect for time"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "polysemy-video" = callPackage + ({ mkDerivation, base, formatting, path, path-utils, polysemy, text + , turtle + }: + mkDerivation { + pname = "polysemy-video"; + version = "0.1.0.1"; + sha256 = "0gpq4105lw24ddp7i4hqc9dnhn9pph4s3p37idfhrmkbyf52y8k8"; + libraryHaskellDepends = [ + base formatting path path-utils polysemy text turtle + ]; + license = stdenv.lib.licenses.mit; + }) {}; + "polysemy-webserver" = callPackage ({ mkDerivation, base, bytestring, hspec, http-conduit, http-types , polysemy, polysemy-plugin, text, wai, wai-websockets, warp @@ -200206,6 +201443,8 @@ self: { pname = "popkey"; version = "0.1.0.1"; sha256 = "1nlbd54q7npxm9hk4f289md6rch0sqnl236iimwsrwllpq6rbxbz"; + revision = "2"; + editedCabalFile = "1wpbwyya9fcdiyqs6lrbcxw7d64vn12kc7n63h2wjxrizjhfs6n6"; libraryHaskellDepends = [ base bitvec bytestring containers hw-bits hw-prim hw-rankselect hw-rankselect-base store text vector @@ -201680,8 +202919,8 @@ self: { pname = "postgrest"; version = "7.0.1"; sha256 = "1cn69dinfv3y8ymsa364b9b0ly3dg80and902gamymb9v89jpsgf"; - revision = "2"; - editedCabalFile = "061lr5hy3xf1nx7yqjpspxqdccmhvvfkyzd3qxzsg5s041hy4krs"; + revision = "4"; + editedCabalFile = "043rkx27yqphnfd369l1a5nx8gn9f1nl1q7ybyzd171m9lpqvbq1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203477,8 +204716,8 @@ self: { }: mkDerivation { pname = "primal"; - version = "0.1.0.0"; - sha256 = "0y60m1249n5mzglmbkhv98lzzmmkxs2k0mn882kqs89h04hfx546"; + version = "0.2.0.0"; + sha256 = "1vr6rrg4hapivlny2bi47swhm2rwjdzrsxz4r97d4gdydr5vphln"; libraryHaskellDepends = [ base deepseq transformers ]; testHaskellDepends = [ base doctest template-haskell ]; description = "Primeval world of Haskell"; @@ -203488,14 +204727,17 @@ self: { }) {}; "primal-memory" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, primal - , primitive, random + ({ mkDerivation, base, bytestring, criterion, deepseq, doctest + , primal, primitive, QuickCheck, random, template-haskell, text }: mkDerivation { pname = "primal-memory"; - version = "0.1.0.0"; - sha256 = "0lvz5kj6bvlgz1jykcv8dri77pjmy6fzppvk9vlvh4cx22zh9y5m"; - libraryHaskellDepends = [ base bytestring deepseq primal ]; + version = "0.2.0.0"; + sha256 = "00yw3m0bjgm3pns60clfy6g905ylwkipw82rwqx3aacgny1hbjy0"; + libraryHaskellDepends = [ base bytestring deepseq primal text ]; + testHaskellDepends = [ + base bytestring doctest primal QuickCheck template-haskell + ]; benchmarkHaskellDepends = [ base criterion deepseq primal primitive random ]; @@ -204508,6 +205750,8 @@ self: { pname = "product-profunctors"; version = "0.11.0.1"; sha256 = "0lwwjnpxgkgk02179j8jj9c1zvaw4f406i9gm7ngqczl8y796q3l"; + revision = "1"; + editedCabalFile = "07k4g2jpxdh2n60b2wkngw6pklfh5fwf9360ih9m88dr7mi5c88n"; libraryHaskellDepends = [ base bifunctors contravariant profunctors tagged template-haskell ]; @@ -204691,6 +205935,8 @@ self: { pname = "profunctors"; version = "5.5.2"; sha256 = "0z5gk2ip4x2z0jad9lnsnq1q1i8bbgchw3bwgiy3gbmgp2m7j5az"; + revision = "1"; + editedCabalFile = "0b73nqyl3yc3q4r0asrciqx7q19y6ygfszb79kn37pndnzj4m0hd"; libraryHaskellDepends = [ base base-orphans bifunctors comonad contravariant distributive tagged transformers @@ -204699,6 +205945,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "profunctors_5_6" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, comonad + , contravariant, distributive, tagged, transformers + }: + mkDerivation { + pname = "profunctors"; + version = "5.6"; + sha256 = "1qwc56d7rjawg472j1kq7lsqzr55cqgmsbkvxy7x65vwyr4aa1nb"; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad contravariant distributive + tagged transformers + ]; + description = "Profunctors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "progress" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -205024,6 +206287,24 @@ self: { broken = true; }) {}; + "prolude" = callPackage + ({ mkDerivation, aeson, base, bytestring, mongoDB, safe-exceptions + , scientific, text, time, vector + }: + mkDerivation { + pname = "prolude"; + version = "0.0.0.0"; + sha256 = "0ys3hx9924giy008ddm0z6m20wf9b4i893wkjpxx4jkda9m155x2"; + libraryHaskellDepends = [ + aeson base bytestring mongoDB safe-exceptions scientific text time + vector + ]; + description = "ITProTV's custom prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "prometheus" = callPackage ({ mkDerivation, atomic-primops, base, bytestring, containers , http-client, http-client-tls, http-types, network-uri, text @@ -207675,6 +208956,29 @@ self: { broken = true; }) {}; + "qhs" = callPackage + ({ mkDerivation, base, bytestring, containers, cryptonite, hspec + , optparse-applicative, process, simple-sql-parser, split + , sqlite-simple, syb, text, zlib + }: + mkDerivation { + pname = "qhs"; + version = "0.3.2"; + sha256 = "0pcsjkd8mnnkywkjxid7zjlczcbyyq6zkxv3vw7fqn8d226l9a34"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring containers cryptonite optparse-applicative + simple-sql-parser split sqlite-simple syb text zlib + ]; + testHaskellDepends = [ + base bytestring containers cryptonite hspec optparse-applicative + process simple-sql-parser split sqlite-simple syb text zlib + ]; + description = "Command line tool qhs, SQL queries on CSV and TSV files"; + license = stdenv.lib.licenses.mit; + }) {}; + "qhull-simple" = callPackage ({ mkDerivation, base, qhull, vector }: mkDerivation { @@ -208919,10 +210223,8 @@ self: { }: mkDerivation { pname = "quickjs-hs"; - version = "0.1.2.1"; - sha256 = "0dbypa7p3x5j2nmbw2qvs4aik74jfkfa9b0mmv2290p6sj9ag1hd"; - revision = "1"; - editedCabalFile = "0f18980s2sky2fnrdnadyhivjhbzxcq9m3isnji8q2gbzpbywca7"; + version = "0.1.2.2"; + sha256 = "1zis42hsvljrqli9469n9k0h44i79a9v9qcd10agq1gylkhgsmkr"; libraryHaskellDepends = [ aeson base bytestring containers exceptions inline-c mtl scientific string-conv text time transformers unliftio-core @@ -212271,7 +213573,7 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "reanimate_0_5_0_1" = callPackage + "reanimate_1_0_0_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base , base64-bytestring, bytestring, cassava, cereal, colour , containers, cubicbezier, directory, filelock, filepath @@ -212285,8 +213587,8 @@ self: { }: mkDerivation { pname = "reanimate"; - version = "0.5.0.1"; - sha256 = "1rk28hwz30dq2162fzl98sa0kz1vpy4r3a00npw30vv3ywjm2sgz"; + version = "1.0.0.0"; + sha256 = "0abjz0yw2d4i84j37hx24k3nmjz946fj200v43hhpwbjiydb1cnn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal array attoparsec base base64-bytestring @@ -212413,22 +213715,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rebase_1_7_3" = callPackage + "rebase_1_10" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , contravariant, contravariant-extras, deepseq, dlist, either - , hashable, mtl, profunctors, scientific, selective, semigroupoids - , stm, text, time, transformers, unordered-containers, uuid, vector - , void + , hashable, hashable-time, mtl, profunctors, scientific, selective + , semigroupoids, stm, text, time, transformers + , unordered-containers, uuid, vector, vector-instances, void }: mkDerivation { pname = "rebase"; - version = "1.7.3"; - sha256 = "0w5ywvwq4m2jw5rrlvxwnczwnxx5gkzdlbji85n0crcsqkhkmn1i"; + version = "1.10"; + sha256 = "0scv2ybph1adm75q7ynadbqji95p1qz8z9h6i3zpidyhp7617fiq"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers contravariant - contravariant-extras deepseq dlist either hashable mtl profunctors - scientific selective semigroupoids stm text time transformers - unordered-containers uuid vector void + contravariant-extras deepseq dlist either hashable hashable-time + mtl profunctors scientific selective semigroupoids stm text time + transformers unordered-containers uuid vector vector-instances void ]; description = "A more progressive alternative to the \"base\" package"; license = stdenv.lib.licenses.mit; @@ -212524,6 +213826,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "record-dot-preprocessor_0_2_7" = callPackage + ({ mkDerivation, base, extra, filepath, ghc, record-hasfield + , uniplate + }: + mkDerivation { + pname = "record-dot-preprocessor"; + version = "0.2.7"; + sha256 = "1ma1rc962z2qr7xwxh03bkbcmn9dsqizrjv699wbc82fzfzn5hrr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base extra ghc uniplate ]; + executableHaskellDepends = [ base extra ]; + testHaskellDepends = [ base extra filepath record-hasfield ]; + description = "Preprocessor to allow record.field syntax"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "record-encode" = callPackage ({ mkDerivation, base, doctest, generics-sop, hspec, QuickCheck , vector @@ -213308,18 +214628,16 @@ self: { }) {}; "refinery" = callPackage - ({ mkDerivation, base, containers, exceptions, mmorph, mtl, pipes - , semigroupoids + ({ mkDerivation, base, checkers, exceptions, hspec, logict, mmorph + , mtl, QuickCheck }: mkDerivation { pname = "refinery"; - version = "0.1.0.0"; - sha256 = "1g18ih1122h61jxgi72kxc9b4x7nvfxl807km46x150x1f3m7wvl"; - libraryHaskellDepends = [ - base containers exceptions mmorph mtl pipes semigroupoids - ]; + version = "0.2.0.0"; + sha256 = "0nsfmb5y8y0hanh3h03v0n8wa5frgj85gz8ycl8h5z045j2kk3wq"; + libraryHaskellDepends = [ base exceptions logict mmorph mtl ]; testHaskellDepends = [ - base containers exceptions mmorph mtl pipes semigroupoids + base checkers exceptions hspec logict mmorph mtl QuickCheck ]; description = "Toolkit for building proof automation systems"; license = stdenv.lib.licenses.bsd3; @@ -216152,6 +217470,22 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "replace-attoparsec_1_4_2_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, parsers, text + }: + mkDerivation { + pname = "replace-attoparsec"; + version = "1.4.2.0"; + sha256 = "02amqp8gbsdvbbb55p6bab6hfhmcc1xijs0dc8677l9iv1q628yq"; + libraryHaskellDepends = [ attoparsec base bytestring text ]; + testHaskellDepends = [ + attoparsec base bytestring Cabal parsers text + ]; + description = "Find, replace, and split string patterns with Attoparsec parsers (instead of regex)"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "replace-megaparsec" = callPackage ({ mkDerivation, base, bytestring, Cabal, megaparsec , parser-combinators, text @@ -216168,6 +217502,23 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "replace-megaparsec_1_4_3_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, megaparsec + , parser-combinators, text + }: + mkDerivation { + pname = "replace-megaparsec"; + version = "1.4.3.0"; + sha256 = "0lngw78rzb5q4n2d55kap8czyjwylpayi3ywy4zkcacc6x9dril7"; + libraryHaskellDepends = [ + base bytestring megaparsec parser-combinators text + ]; + testHaskellDepends = [ base bytestring Cabal megaparsec text ]; + description = "Find, replace, and split string patterns with Megaparsec parsers (instead of regex)"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "replica" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, Diff , file-embed, http-types, QuickCheck, quickcheck-instances @@ -216452,6 +217803,8 @@ self: { pname = "req"; version = "3.6.0"; sha256 = "1ks9iqnnsa8m65ndyblyndb95fc4r4xachq1zrik04adxrdj3b50"; + revision = "1"; + editedCabalFile = "1vr4926n5ac8h4i71q0hqwgf78l7f572wal22ndys3dscvg4a7f1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -216649,12 +218002,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rerebase_1_7_3" = callPackage + "rerebase_1_10" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.7.3"; - sha256 = "0ynvpawhjwbw3231nlwpk5x5wwbzpx1iw66vs97wpk5b8p1bhrld"; + version = "1.10"; + sha256 = "199zsfk0lidvmwn68ik0sb3b4kqq2hfd7248j1rv1sd0vinc4vrs"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = stdenv.lib.licenses.mit; @@ -218799,8 +220152,8 @@ self: { }: mkDerivation { pname = "rng-utils"; - version = "0.3.0"; - sha256 = "1fj6x5ihjsbw1cypdifccv2nkbx5gvax9aclypanlv5fw2qsr1h8"; + version = "0.3.1"; + sha256 = "0wpyq1lxqcxkzvswfq9sc916alck68g3z5xb04brzxhvwzgppwnq"; libraryHaskellDepends = [ base bytestring random ]; testHaskellDepends = [ base bytestring hedgehog tasty tasty-hedgehog @@ -219961,15 +221314,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "rpmbuild-order_0_4_3" = callPackage + "rpmbuild-order_0_4_3_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , directory, extra, fgl, filepath, hspec, optparse-applicative , process, simple-cmd, simple-cmd-args, unix }: mkDerivation { pname = "rpmbuild-order"; - version = "0.4.3"; - sha256 = "19aszn4fcsxbzciswrb80qvm6r3x28kyl7g5m3c1569f0ib3rbg6"; + version = "0.4.3.1"; + sha256 = "01k1lw0gxxsnl4wqzsynl6xkrnim5fjmdj6jb6b0bgd5jd1y0fyj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223137,8 +224490,8 @@ self: { pname = "scotty"; version = "0.12"; sha256 = "1lpggpdzgjk23mq7aa64yylds5dbm4ynhcvbarqihjxabvh7xmz1"; - revision = "1"; - editedCabalFile = "1g1j4v3hvvbi48pn32d671x3vg41x2pjbpj9vgagiqlqmz9pkrn5"; + revision = "2"; + editedCabalFile = "1a5xv44fkjxw6ggp415543zbb1mrkdi05kprf5y8rv3wc8avnssd"; libraryHaskellDepends = [ aeson base base-compat-batteries blaze-builder bytestring case-insensitive data-default-class exceptions fail http-types @@ -223241,8 +224594,8 @@ self: { ({ mkDerivation, base, ditto, ditto-lucid, lucid, scotty, text }: mkDerivation { pname = "scotty-form"; - version = "0.2.0.0"; - sha256 = "048vfcvi2wmpmg0ldm4fjkszsx498m22fsg0p8xdanbfbfzrzwwa"; + version = "0.3.0.0"; + sha256 = "0v04j8ffbbm319xh5cfk1zjh3z12n18g38ppmzww0b7n4ixr2f8c"; libraryHaskellDepends = [ base ditto ditto-lucid lucid scotty text ]; @@ -224832,8 +226185,8 @@ self: { pname = "semigroupoids"; version = "5.3.4"; sha256 = "0r49qpbi803jk3v4i09jr1a98l6hcgnjhrv1a9fhmay3ff4y9lh0"; - revision = "1"; - editedCabalFile = "0051jan1q5nghw5wfzf13v07iba4hqd8wq5af4fd0j2k22k4ar1s"; + revision = "2"; + editedCabalFile = "1fij6yynvwssklr5bklrmd3w6j6nj1p36rn78lkwjkh8m3gp620j"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant @@ -225428,7 +226781,7 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "sequence-formats_1_5_1_1" = callPackage + "sequence-formats_1_5_1_3" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, errors , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers @@ -225436,8 +226789,8 @@ self: { }: mkDerivation { pname = "sequence-formats"; - version = "1.5.1.1"; - sha256 = "1gfss5fnv16xg6qxsazh1r7jd9qv5klpnjl6fbmk8p4n7cy5rsxx"; + version = "1.5.1.3"; + sha256 = "1662lfwmss1zrz357r1rm6spyb81fnsf2gzg54yrrx55lq3zki1m"; libraryHaskellDepends = [ attoparsec base bytestring containers errors exceptions foldl lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe @@ -226420,6 +227773,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-client-js" = callPackage + ({ mkDerivation, base, binary, bytestring, case-insensitive + , containers, exceptions, http-media, http-types, jsaddle + , monad-control, mtl, semigroupoids, servant, servant-client-core + , text, transformers, transformers-base + }: + mkDerivation { + pname = "servant-client-js"; + version = "0.1.0.0"; + sha256 = "1r489f9x7pzn9swp89vpywqhwrdz7ql4dkw79fgyz028jwnibgs4"; + libraryHaskellDepends = [ + base binary bytestring case-insensitive containers exceptions + http-media http-types jsaddle monad-control mtl semigroupoids + servant servant-client-core text transformers transformers-base + ]; + description = "A servant client for frontend JavaScript"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-client-namedargs" = callPackage ({ mkDerivation, async, base, hspec, http-client, named, QuickCheck , servant, servant-client, servant-client-core, servant-namedargs @@ -227848,6 +229220,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-serf" = callPackage + ({ mkDerivation, attoparsec, base, hpack, mtl, optparse-applicative + , parser-combinators, regex-base, regex-tdfa, text, tomland + }: + mkDerivation { + pname = "servant-serf"; + version = "0.0.3"; + sha256 = "10ky0hmz1484jz0grwmac9208vlv4k8jwzn2imbrn405p76iifdm"; + isLibrary = true; + isExecutable = true; + executableHaskellDepends = [ + attoparsec base hpack mtl optparse-applicative parser-combinators + regex-base regex-tdfa text tomland + ]; + doHaddock = false; + description = "Generates a servant API module"; + license = stdenv.lib.licenses.mit; + }) {}; + "servant-server" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, Cabal, cabal-doctest, containers, directory, doctest @@ -228604,7 +229995,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "serverless-haskell_0_12_2" = callPackage + "serverless-haskell_0_12_3" = callPackage ({ mkDerivation, aeson, aeson-casing, amazonka-core , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive , hspec, hspec-discover, http-client, http-types, iproute, lens @@ -228613,8 +230004,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.12.2"; - sha256 = "0x61rqv7w0qjnjpkd1hsy1ixdnxv5abicfdglsr62nazhchnh717"; + version = "0.12.3"; + sha256 = "0as4dp3j125k5jfqkzhpw1fx50xywj97wmdiwzq2b6bkkl7ipxjq"; libraryHaskellDepends = [ aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-client http-types iproute lens @@ -229822,8 +231213,8 @@ self: { }: mkDerivation { pname = "shake-futhark"; - version = "0.1.0.2"; - sha256 = "1npkzgixkkkb611hhlrl1xjyp5xl27rlfqyh6q8vz4lg8fmsxsyh"; + version = "0.2.0.0"; + sha256 = "1lal2dwgiw9c9k8lpcqagx5hy9bs8mqciiy5ghndahpf1fwf510m"; libraryHaskellDepends = [ base containers directory filepath futhark shake text ]; @@ -229979,8 +231370,8 @@ self: { }: mkDerivation { pname = "shake-plus-extended"; - version = "0.4.0.0"; - sha256 = "1y12hcsyp8slzacjz8dim64m9sr09z7ppv3s4l30wyha9r395x8i"; + version = "0.4.1.0"; + sha256 = "18gicl8l3biw4xnhlp3sxp19a5s3fry766d7mq7j5q9fzidq31rb"; libraryHaskellDepends = [ aeson base binary-instances comonad extra http-conduit ixset-typed ixset-typed-binary-instance ixset-typed-hashable-instance path @@ -231396,6 +232787,53 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "signable" = callPackage + ({ mkDerivation, aeson, asn1-encoding, asn1-types, base + , base64-bytestring, binary, bytestring, casing, cryptonite + , directory, generic-arbitrary, hspec, memory, microlens, pem + , proto-lens, proto-lens-arbitrary, proto-lens-runtime, QuickCheck + , quickcheck-instances, secp256k1-haskell, text, universum + , unordered-containers + }: + mkDerivation { + pname = "signable"; + version = "0.2"; + sha256 = "1p1g6jhxgskl890g84nw8d465pan9d3prbc4jvyn8502bx00w01s"; + libraryHaskellDepends = [ + asn1-encoding asn1-types base binary bytestring casing cryptonite + memory microlens pem proto-lens proto-lens-runtime + secp256k1-haskell text universum + ]; + testHaskellDepends = [ + aeson asn1-encoding asn1-types base base64-bytestring binary + bytestring casing cryptonite directory generic-arbitrary hspec + memory microlens pem proto-lens proto-lens-arbitrary + proto-lens-runtime QuickCheck quickcheck-instances + secp256k1-haskell text universum unordered-containers + ]; + description = "Deterministic serialisation and signatures with proto-lens support"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "signable-haskell-protoc" = callPackage + ({ mkDerivation, base, bytestring, casing, containers, ghc + , ghc-paths, ghc-source-gen, lens-family, proto-lens + , proto-lens-protoc, proto-lens-runtime, text + }: + mkDerivation { + pname = "signable-haskell-protoc"; + version = "0.2"; + sha256 = "1qipgv7xihnnj0mbw8469cj2vsyb367msc3lk1dfy8gjlfdl6nc3"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring casing containers ghc ghc-paths ghc-source-gen + lens-family proto-lens proto-lens-protoc proto-lens-runtime text + ]; + description = "Deterministic serialisation and signatures with proto-lens support"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "signal" = callPackage ({ mkDerivation, base, unix }: mkDerivation { @@ -233093,19 +234531,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "sized_0_6_0_0" = callPackage + "sized_0_8_0_0" = callPackage ({ mkDerivation, base, constraints, containers, deepseq - , equational-reasoning, ghc-typelits-presburger, hashable, lens - , ListLike, mono-traversable, singletons, type-natural, vector + , equational-reasoning, ghc-typelits-knownnat + , ghc-typelits-presburger, hashable, hspec, inspection-testing + , lens, mono-traversable, singletons, subcategories + , template-haskell, th-lift, these, type-natural, vector }: mkDerivation { pname = "sized"; - version = "0.6.0.0"; - sha256 = "0441ip04gmnyd6wxs1kkmwgz0v936bw95gxc9x00c7z0byd3q6hg"; + version = "0.8.0.0"; + sha256 = "1jwarhc0xi4h5860whi6s9n36qijlh6j6rnxx71dnlsrinfdsn2m"; libraryHaskellDepends = [ base constraints containers deepseq equational-reasoning - ghc-typelits-presburger hashable lens ListLike mono-traversable - singletons type-natural vector + ghc-typelits-knownnat ghc-typelits-presburger hashable lens + mono-traversable singletons subcategories these type-natural vector + ]; + testHaskellDepends = [ + base containers hspec inspection-testing mono-traversable + singletons subcategories template-haskell th-lift vector ]; description = "Sized sequence data-types"; license = stdenv.lib.licenses.bsd3; @@ -234895,8 +236339,8 @@ self: { }: mkDerivation { pname = "snap"; - version = "1.1.3.0"; - sha256 = "09iwyam3k9a90xm99pm54h74f8llfz2jm0i8rrdqwayjy5xq2w3i"; + version = "1.1.3.1"; + sha256 = "1zq7yz5w9ms8zm5z4c05awkdarqbmb7pp13y9c1x04qfd5ba4c47"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator containers directory directory-tree dlist fail filepath hashable @@ -235141,8 +236585,8 @@ self: { }: mkDerivation { pname = "snap-loader-dynamic"; - version = "1.0.0.1"; - sha256 = "1z0f0lsrqdsw7fmfaq8n0jcam8nh5nmpg72q4lapqazlna78ww7x"; + version = "1.0.0.2"; + sha256 = "170a40fv9ary6lpllys95fby2xbpq3cg33sswk92vwpr4wjhx1lw"; libraryHaskellDepends = [ base directory directory-tree hint mtl snap-core template-haskell time unix @@ -235157,10 +236601,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "snap-loader-static"; - version = "1.0.0.0"; - sha256 = "04i9fn84101w8ybns8m2830zlw2vvg81pzrs0vmj6s691y3ivxas"; - revision = "3"; - editedCabalFile = "07f2j0fsw6hhg6qjzfis72ka9dd7iijx09lwypp2mk0qsx6y63bi"; + version = "1.0.0.1"; + sha256 = "0598xvy2jk6xc4xhhjqy2v8f5s7k8x13v4wadw8r37h81jpbic00"; libraryHaskellDepends = [ base template-haskell ]; description = "Snap static loader"; license = stdenv.lib.licenses.bsd3; @@ -235227,6 +236669,8 @@ self: { pname = "snap-server"; version = "1.1.1.2"; sha256 = "1qprlgn59n9layslshpkizzjbsbd87v5h35iylva58vfnwwlmz77"; + revision = "1"; + editedCabalFile = "0bzda5wah6x4cx8g4m6ml4jkcn852i4cxvcgb61jxmwf910arbax"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -237009,6 +238453,8 @@ self: { pname = "sop-core"; version = "0.5.0.1"; sha256 = "1c4xk4bw1ij4gpgy35iv08bhcxhv1siy55qnvp2xd6wcc3qnghys"; + revision = "1"; + editedCabalFile = "1d4sagrlhmvai3f4hvb9rn8aqsjbvi00z0mzv1gds9nblshk83xd"; libraryHaskellDepends = [ base deepseq ]; description = "True Sums of Products"; license = stdenv.lib.licenses.bsd3; @@ -237242,8 +238688,8 @@ self: { }: mkDerivation { pname = "source-constraints"; - version = "0.0.1"; - sha256 = "0i9p63lbcmc78pp0bvym2zdfvrncrzchkw1xbak6idj3ikb1ljpx"; + version = "0.0.2"; + sha256 = "0dni6f4b8la60zq3n8ffklwnk9h6qm9lsddjqh812dw3f2jmllzz"; libraryHaskellDepends = [ attoparsec base bytestring filepath ghc syb text ]; @@ -239005,24 +240451,26 @@ self: { "squeal-postgresql" = callPackage ({ mkDerivation, aeson, async, base, binary, binary-parser , bytestring, bytestring-strict-builder, deepseq, doctest - , free-categories, gauge, generic-random, generics-sop, hedgehog - , hspec, mmorph, monad-loops, mtl, network-ip, postgresql-binary - , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances - , records-sop, resource-pool, scientific, text, time, transformers - , unliftio, unliftio-pool, uuid-types, vector, with-utf8 + , exceptions, free-categories, gauge, generic-random, generics-sop + , hedgehog, hspec, mmorph, monad-control, monad-loops, mtl + , network-ip, postgresql-binary, postgresql-libpq, profunctors + , QuickCheck, quickcheck-instances, records-sop, resource-pool + , scientific, text, time, transformers, transformers-base, unliftio + , unliftio-pool, uuid-types, vector, with-utf8 }: mkDerivation { pname = "squeal-postgresql"; - version = "0.6.0.2"; - sha256 = "0798aw0ahjdjczz5i8n1dwix8vzd0ccl7cbf473x5mxn549nh0qm"; + version = "0.7.0.1"; + sha256 = "0r8rihfn2bmr32h06lcdmp6wiyj1c4m03x4y2sfq8bgwmn5xb50r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base binary binary-parser bytestring - bytestring-strict-builder deepseq free-categories generics-sop - mmorph mtl network-ip postgresql-binary postgresql-libpq - profunctors records-sop resource-pool scientific text time - transformers unliftio unliftio-pool uuid-types vector + bytestring-strict-builder deepseq exceptions free-categories + generics-sop mmorph monad-control mtl network-ip postgresql-binary + postgresql-libpq profunctors records-sop resource-pool scientific + text time transformers transformers-base unliftio unliftio-pool + uuid-types vector ]; executableHaskellDepends = [ base bytestring generics-sop mtl text transformers vector @@ -239661,6 +241109,23 @@ self: { broken = true; }) {}; + "stack-clean-old" = callPackage + ({ mkDerivation, base, directory, extra, filepath, simple-cmd + , simple-cmd-args + }: + mkDerivation { + pname = "stack-clean-old"; + version = "0.1"; + sha256 = "12q3x0lj8mjhfr6zrizl7995qca28qccjfqwhriciv35l4sny9md"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory extra filepath simple-cmd simple-cmd-args + ]; + description = "Clean away old stack build artefacts"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stack-fix" = callPackage ({ mkDerivation, base, options, text, turtle }: mkDerivation { @@ -241538,6 +243003,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stm-actor" = callPackage + ({ mkDerivation, base, hspec, mtl, stm, stm-queue, transformers + , unliftio-core + }: + mkDerivation { + pname = "stm-actor"; + version = "0.2.3.0"; + sha256 = "0982wj1lnxs7jv35hrkjpp539x3nn5hrwm652i1xbvmmy4i2k41p"; + libraryHaskellDepends = [ + base mtl stm stm-queue transformers unliftio-core + ]; + testHaskellDepends = [ base hspec mtl stm stm-queue ]; + description = "A simplistic actor model based on STM"; + license = stdenv.lib.licenses.mit; + }) {}; + "stm-channelize" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -241749,6 +243230,22 @@ self: { broken = true; }) {}; + "stm-queue" = callPackage + ({ mkDerivation, async, base, criterion, deepseq, hspec, stm, time + }: + mkDerivation { + pname = "stm-queue"; + version = "0.1.2.0"; + sha256 = "06l5gavmf4x6vp54p1h27nnm5nnw6f8p82v5np93b25inc67vz4h"; + libraryHaskellDepends = [ base stm ]; + testHaskellDepends = [ async base hspec stm ]; + benchmarkHaskellDepends = [ + async base criterion deepseq hspec stm time + ]; + description = "An implementation of a real-time concurrent queue"; + license = stdenv.lib.licenses.mit; + }) {}; + "stm-queue-extras" = callPackage ({ mkDerivation, base, stm, stm-chans }: mkDerivation { @@ -243619,7 +245116,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "string-interpolate_0_3_0_0" = callPackage + "string-interpolate_0_3_0_2" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, formatting , haskell-src-exts, haskell-src-meta, hspec, hspec-core , interpolate, neat-interpolation, QuickCheck, quickcheck-instances @@ -243628,10 +245125,8 @@ self: { }: mkDerivation { pname = "string-interpolate"; - version = "0.3.0.0"; - sha256 = "0h7lqr5g11pr9ikzg7j26fgj9m8659j1vpcwggvndv6k71sh281a"; - revision = "1"; - editedCabalFile = "0id31zpxvmgs63acy3lx8myms5i8w70cfr1dx5yryzy5l66vaq0w"; + version = "0.3.0.2"; + sha256 = "1dkw4q2fxnr7gnish45lryxwrmdy93ffa1010qdnjlnz5m3dxbyl"; libraryHaskellDepends = [ base bytestring haskell-src-exts haskell-src-meta split template-haskell text text-conversions utf8-string @@ -244236,8 +245731,8 @@ self: { pname = "structured"; version = "0.1"; sha256 = "0xm0m7jxwrbz8jgcn2dl5vhlz0gcg7wxcbbgaqidm2msmnc6fqww"; - revision = "1"; - editedCabalFile = "067ljj4dfa9kvri944flcw489sy2fbyw75b2s9hz916zdqmzqjwd"; + revision = "2"; + editedCabalFile = "0l9ls0r1v5bjcznjd0jcpml8vpr4iq8shp4dm4jkv96i3x277gdv"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers hashable scientific tagged text time-compat transformers @@ -244513,6 +246008,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stylish-haskell_0_12_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , directory, file-embed, filepath, ghc-lib-parser, HsYAML + , HsYAML-aeson, HUnit, mtl, optparse-applicative, random, strict + , syb, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "stylish-haskell"; + version = "0.12.0.0"; + sha256 = "0gpaz4psrq6hpmj755wbsq04gc594z5qph28fysnbbfwr7sr6lmv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers directory file-embed + filepath ghc-lib-parser HsYAML HsYAML-aeson mtl syb text + ]; + executableHaskellDepends = [ + aeson base bytestring Cabal containers directory file-embed + filepath ghc-lib-parser HsYAML HsYAML-aeson mtl + optparse-applicative strict syb + ]; + testHaskellDepends = [ + aeson base bytestring Cabal containers directory file-embed + filepath ghc-lib-parser HsYAML HsYAML-aeson HUnit mtl random syb + test-framework test-framework-hunit text + ]; + description = "Haskell code prettifier"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stylist" = callPackage ({ mkDerivation, async, base, css-syntax, hashable, hspec , network-uri, QuickCheck, scientific, text, unordered-containers @@ -244964,8 +246490,6 @@ self: { ]; description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "summoner-tui" = callPackage @@ -244985,8 +246509,6 @@ self: { executableHaskellDepends = [ base relude ]; description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects using TUI"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "sump" = callPackage @@ -247910,8 +249432,8 @@ self: { pname = "tagged"; version = "0.8.6"; sha256 = "1pciqzxf9ncv954v4r527xkxkn7r5hcr13mfw5dg1xjci3qdw5md"; - revision = "2"; - editedCabalFile = "1y8z8hmm846z7h3wqncpi0d4zhsnkwf08q0wchivkjw8di7ahz0z"; + revision = "3"; + editedCabalFile = "1wv9ngbj3pvs6v52dj0bli9h5vanyw3akpsmfmwsvnnian9hpkkw"; libraryHaskellDepends = [ base deepseq template-haskell transformers ]; @@ -248243,6 +249765,28 @@ self: { broken = true; }) {}; + "tagstew" = callPackage + ({ mkDerivation, base, bytestring, compact, tagsoup, text + , unicode-show, unordered-containers, utf8-string + }: + mkDerivation { + pname = "tagstew"; + version = "0"; + sha256 = "0l49w51s0r7n2kc8254sasaj0b8fg3hf1ykyy6wsiyyn394592j6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring compact tagsoup text unordered-containers + ]; + executableHaskellDepends = [ + base bytestring tagsoup unicode-show utf8-string + ]; + description = "Black magic tagsoup"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "tagstream-conduit" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, data-default, hspec @@ -249386,22 +250930,25 @@ self: { }) {}; "tasty-mgolden" = callPackage - ({ mkDerivation, base, Diff, filepath, hlint, tasty + ({ mkDerivation, ansi-terminal, base, Diff, filepath, hlint, tasty , tasty-expected-failure, tasty-hunit, text, typed-process }: mkDerivation { pname = "tasty-mgolden"; - version = "0.0.1"; - sha256 = "0ysx6gvaz1n1agyw721ay3k7n2l43p2l1p1mf4ppvs4wkg8aibmw"; + version = "0.0.2"; + sha256 = "1s0zpdxqsp7yj7xwlcwfj3ywadcgfm0xapnfna2zs97i6gqx9sf6"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base Diff filepath tasty text ]; + libraryHaskellDepends = [ + ansi-terminal base Diff filepath tasty text + ]; executableHaskellDepends = [ - base Diff filepath tasty tasty-expected-failure tasty-hunit text + ansi-terminal base Diff filepath tasty tasty-expected-failure + tasty-hunit text ]; testHaskellDepends = [ - base Diff filepath hlint tasty tasty-expected-failure tasty-hunit - text typed-process + ansi-terminal base Diff filepath hlint tasty tasty-expected-failure + tasty-hunit text typed-process ]; description = "Golden testing provider for tasty with muti-line diff output"; license = stdenv.lib.licenses.bsd3; @@ -249636,6 +251183,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-wai_0_1_1_1" = callPackage + ({ mkDerivation, base, bytestring, http-types, HUnit, tasty, wai + , wai-extra + }: + mkDerivation { + pname = "tasty-wai"; + version = "0.1.1.1"; + sha256 = "1bnq2mbgv1ksn9sq33dq1q91pzndy7gn61mlnkybk89k0bsw5i7y"; + libraryHaskellDepends = [ + base bytestring http-types HUnit tasty wai wai-extra + ]; + testHaskellDepends = [ base http-types tasty wai ]; + description = "Test 'wai' endpoints via Test.Tasty"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tateti-tateti" = callPackage ({ mkDerivation, array, base, lens-simple, mtl, ncurses, random }: mkDerivation { @@ -251016,15 +252580,14 @@ self: { }) {}; "termbox" = callPackage - ({ mkDerivation, array, base, c2hs }: + ({ mkDerivation, base }: mkDerivation { pname = "termbox"; - version = "0.2.0.1"; - sha256 = "0rqlhinc1vmxnmwxrcv5rb78j3jmp6iwfcabzf95nhclvjhdadr8"; + version = "0.3.0"; + sha256 = "1vi2ssylwvc6xqnhpnvc9q9c70glbf6s63rmyblc53g4qra2wkah"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ array base ]; - libraryToolDepends = [ c2hs ]; + libraryHaskellDepends = [ base ]; description = "termbox bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -251035,10 +252598,8 @@ self: { ({ mkDerivation, base, reactive-banana, termbox }: mkDerivation { pname = "termbox-banana"; - version = "0.2.0"; - sha256 = "1n4775ahmm4h1vn1michsqp5l2j62py5wddnvcipb8225dcq8xsi"; - revision = "1"; - editedCabalFile = "123hndfs6x2ljwfh7izpikyv5v2d9hq122ddkk5nncnpbnb4bba5"; + version = "0.3.0"; + sha256 = "07nn1jff33zb80vhzkw48fik5d5w7j7q982ihpsbb6gbqp5azx5s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base reactive-banana termbox ]; @@ -251664,6 +253225,26 @@ self: { license = stdenv.lib.licenses.isc; }) {}; + "test-monad-laws" = callPackage + ({ mkDerivation, base, monad-control, mtl, QuickCheck + , quickcheck-higherorder, tasty, tasty-quickcheck, transformers + , transformers-base + }: + mkDerivation { + pname = "test-monad-laws"; + version = "0.0.0.0"; + sha256 = "1r6k8ajbp5jc0cyzkrr5n5h106d1npf756din7cb1xrz94qzv068"; + libraryHaskellDepends = [ + base monad-control mtl QuickCheck quickcheck-higherorder + transformers transformers-base + ]; + testHaskellDepends = [ + base mtl QuickCheck quickcheck-higherorder tasty tasty-quickcheck + ]; + description = "Laws for mtl classes as QuickCheck properties"; + license = stdenv.lib.licenses.mit; + }) {}; + "test-pkg" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -252059,8 +253640,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.12.0.2"; - sha256 = "116i1f1qnkraygf05lpw7vg3h6zk8lh14k4i2yx6prb649d2iv1g"; + version = "0.12.0.3"; + sha256 = "06293ng7s9mn05vf5wlw2691gjzh6nmg717rxmbzr96zjv3731ri"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -252232,6 +253813,8 @@ self: { pname = "text-conversions"; version = "0.3.0"; sha256 = "089c56vdj9xysqfr1hnvbnrghlg83q6w10xk02gflpsidcpvwmhp"; + revision = "1"; + editedCabalFile = "1rw2fi2y77599zmkacf2y06jmxkasydmkkknkmg5xg29hw64a82i"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring errors text ]; @@ -252241,6 +253824,24 @@ self: { license = stdenv.lib.licenses.isc; }) {}; + "text-conversions_0_3_1" = callPackage + ({ mkDerivation, base, base16-bytestring, base64-bytestring + , bytestring, errors, hspec, hspec-discover, text + }: + mkDerivation { + pname = "text-conversions"; + version = "0.3.1"; + sha256 = "0kbxin1q8xj9sgdl185gncrdjwcfzndp8sl5qll8y93l60yq8dxi"; + libraryHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring errors text + ]; + testHaskellDepends = [ base bytestring hspec text ]; + testToolDepends = [ hspec-discover ]; + description = "Safe conversions between textual types"; + license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-cp437" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, quickcheck-text , text @@ -253185,6 +254786,21 @@ self: { license = stdenv.lib.licenses.isc; }) {}; + "th-abstraction_0_4_0_0" = callPackage + ({ mkDerivation, base, containers, ghc-prim, template-haskell }: + mkDerivation { + pname = "th-abstraction"; + version = "0.4.0.0"; + sha256 = "09r09va7ihhk2nbz73y0cp4hijbf4zpr4hiss0xqa9pqkkazz62h"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + testHaskellDepends = [ base containers template-haskell ]; + description = "Nicer interface for reified information about data types"; + license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-alpha" = callPackage ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar @@ -253242,6 +254858,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "th-compat" = callPackage + ({ mkDerivation, base, base-compat, hspec, hspec-discover, mtl + , template-haskell + }: + mkDerivation { + pname = "th-compat"; + version = "0.1"; + sha256 = "11v1mdm0pf6wnbsvccm1gnziinabgdpp7qdrcmm53yv3pj8yaalw"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ + base base-compat hspec mtl template-haskell + ]; + testToolDepends = [ hspec-discover ]; + description = "Backward- (and forward-)compatible Quote and Code types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "th-constraint-compat" = callPackage ({ mkDerivation, base, containers, template-haskell }: mkDerivation { @@ -253505,6 +255138,21 @@ self: { broken = true; }) {}; + "th-lego" = callPackage + ({ mkDerivation, base, template-haskell + , template-haskell-compat-v0208, text + }: + mkDerivation { + pname = "th-lego"; + version = "0.1.0.3"; + sha256 = "1gzvvxxy77pz9hxgc3hmz87w17kpiwvzzb5d3ncn13zsyc5j1mcx"; + libraryHaskellDepends = [ + base template-haskell template-haskell-compat-v0208 text + ]; + description = "Template Haskell construction utilities"; + license = stdenv.lib.licenses.mit; + }) {}; + "th-lift" = callPackage ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction }: @@ -253520,6 +255168,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-lift_0_8_2" = callPackage + ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction + }: + mkDerivation { + pname = "th-lift"; + version = "0.8.2"; + sha256 = "1r2wrnrn6qwy6ysyfnlqn6xbfckw0b22h8n00pk67bhhg81jfn9s"; + libraryHaskellDepends = [ + base ghc-prim template-haskell th-abstraction + ]; + testHaskellDepends = [ base ghc-prim template-haskell ]; + description = "Derive Template Haskell's Lift class for datatypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-lift-instances" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck , template-haskell, text, th-lift, transformers, vector @@ -253571,6 +255235,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-orphans_0_13_11" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover + , mtl, template-haskell, th-compat, th-lift, th-lift-instances + , th-reify-many + }: + mkDerivation { + pname = "th-orphans"; + version = "0.13.11"; + sha256 = "1m7mysjhdmfc642dqbxq6sz5fir00kzq54w4n1pcn5d64ip5njkf"; + libraryHaskellDepends = [ + base mtl template-haskell th-compat th-lift th-lift-instances + th-reify-many + ]; + testHaskellDepends = [ + base bytestring ghc-prim hspec template-haskell th-lift + ]; + testToolDepends = [ hspec-discover ]; + description = "Orphan instances for TH datatypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-pprint" = callPackage ({ mkDerivation, base, lens, pretty, template-haskell }: mkDerivation { @@ -253688,6 +255374,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-test-utils_1_1_0" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-golden, tasty-hunit + , template-haskell, th-orphans, transformers + }: + mkDerivation { + pname = "th-test-utils"; + version = "1.1.0"; + sha256 = "12a8yp9wfl40afa3ps8jg3axcaah018pangjm0fzzga2awr1wzwk"; + revision = "1"; + editedCabalFile = "0q3x2gl9n22ww1wzlhgvgj8didnwjyk6frv92cs9i7zirrcfgvcw"; + libraryHaskellDepends = [ + base template-haskell th-orphans transformers + ]; + testHaskellDepends = [ + base bytestring tasty tasty-golden tasty-hunit template-haskell + th-orphans transformers + ]; + description = "Utility functions for testing Template Haskell code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-to-exp" = callPackage ({ mkDerivation, base, hspec, template-haskell }: mkDerivation { @@ -254275,6 +255983,8 @@ self: { pname = "threepenny-gui"; version = "0.9.0.0"; sha256 = "0mvx661xk3nzvvxcda4vdk2ka7mff8jbpib1x59n230w80bc5sja"; + revision = "1"; + editedCabalFile = "0g07sdc3r1cg16m5nbhwaa95zr7kbzag60f8han5pnp67c79n67i"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -256808,8 +258518,8 @@ self: { }: mkDerivation { pname = "tomland"; - version = "1.3.0.0"; - sha256 = "15bzq3frgpqxvvs9r6x8fc66w6rixh81d19ps1x0hr46gcj7b1i4"; + version = "1.3.1.0"; + sha256 = "17909a8aapbrsa0yb642ij80k64dg2dam1v3rsvc3rm07ik61x42"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -258048,6 +259758,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "transformers-compat_0_6_6" = callPackage + ({ mkDerivation, base, ghc-prim, transformers }: + mkDerivation { + pname = "transformers-compat"; + version = "0.6.6"; + sha256 = "1yd936az31g9995frc84g05rrb5b7w59ajssc5183lp6wm8h4bky"; + libraryHaskellDepends = [ base ghc-prim transformers ]; + description = "A small compatibility shim for the transformers library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transformers-compose" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -259680,8 +261402,8 @@ self: { }: mkDerivation { pname = "ttc"; - version = "0.2.2.0"; - sha256 = "0ixkfjmjar4sv6a7n0fjrrpbmkb9143lzbmkrxxklf2r71qy9mcf"; + version = "0.2.3.0"; + sha256 = "0yp92aa62xzzgnlwaw45p8cp9m3w2mmpdr3r2h3zw3dcqvq6hx1l"; libraryHaskellDepends = [ base bytestring template-haskell text ]; testHaskellDepends = [ base bytestring tasty tasty-hunit template-haskell text @@ -262129,8 +263851,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.7.8.1"; - sha256 = "060fg6s7yjasimhx7nz4cxymlsxdv9pshs4sv83vwj31nw33kr7b"; + version = "0.7.9.1"; + sha256 = "0vw0mbkii7j5rr5fp370j8grq355cg0ddw55f24gbjw1z0wc71hx"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -263012,6 +264734,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unboxing-vector_0_2_0_0" = callPackage + ({ mkDerivation, base, deepseq, HUnit, mono-traversable, primitive + , should-not-typecheck, vector + }: + mkDerivation { + pname = "unboxing-vector"; + version = "0.2.0.0"; + sha256 = "10sj7npfmhb9niagyhw5v68fpbhxa637x99dyw6njalsmsyimj91"; + libraryHaskellDepends = [ + base deepseq mono-traversable primitive vector + ]; + testHaskellDepends = [ + base deepseq HUnit mono-traversable primitive should-not-typecheck + vector + ]; + benchmarkHaskellDepends = [ + base deepseq mono-traversable primitive vector + ]; + description = "A newtype-friendly variant of unboxed vectors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unbreak" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , bytestring, cereal, cmdargs, cryptonite, memory, process, text @@ -263729,34 +265474,36 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "uniqueness-periods-vector-common"; - version = "0.3.0.0"; - sha256 = "1dw1j10ambqcjr42jb5p9kwdzpz943dw6pgiivxs41iq2w6nibp6"; + version = "0.4.0.0"; + sha256 = "07g4nhsf81k80fcmidc8symp60rkc7i1ac9wcqrmf8fyv0h44q41"; libraryHaskellDepends = [ base vector ]; description = "Generalization of the dobutokO-poetry-general package functionality"; license = stdenv.lib.licenses.mit; }) {}; "uniqueness-periods-vector-examples" = callPackage - ({ mkDerivation, base, mmsyn6ukr, phonetic-languages-ukrainian - , print-info, uniqueness-periods-vector - , uniqueness-periods-vector-common + ({ mkDerivation, base, mmsyn6ukr, parallel + , phonetic-languages-ukrainian, print-info + , uniqueness-periods-vector, uniqueness-periods-vector-common , uniqueness-periods-vector-filters , uniqueness-periods-vector-general - , uniqueness-periods-vector-properties, vector + , uniqueness-periods-vector-properties + , uniqueness-periods-vector-stats, vector }: mkDerivation { pname = "uniqueness-periods-vector-examples"; - version = "0.4.0.0"; - sha256 = "11f7kgsrz0d7hna02qpf519775w4kli7zxg8yp0d0zzi1yp1cgrq"; + version = "0.7.1.0"; + sha256 = "0vcnvv54lmay53vj5lj5hzzpg9fqh8g7cic3k5zx8vzgw60rx5wy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base mmsyn6ukr phonetic-languages-ukrainian print-info + base mmsyn6ukr parallel phonetic-languages-ukrainian print-info uniqueness-periods-vector uniqueness-periods-vector-common uniqueness-periods-vector-filters uniqueness-periods-vector-general - uniqueness-periods-vector-properties vector + uniqueness-periods-vector-properties + uniqueness-periods-vector-stats vector ]; - description = "Examples of usage for the uniqueness-periods-vector series of packages"; + description = "Usage examples for the uniqueness-periods-vector series of packages"; license = stdenv.lib.licenses.mit; }) {}; @@ -263764,8 +265511,8 @@ self: { ({ mkDerivation, base, mmsyn2, vector }: mkDerivation { pname = "uniqueness-periods-vector-filters"; - version = "0.1.1.0"; - sha256 = "1slwc94m62qp28g3bqbaa4x0zp0zz7x74kv41mcalzd79nlxf7cv"; + version = "0.2.0.0"; + sha256 = "0xzc5nymcgvr0n90266fwzy1c6kwv28wmxhwpq8yl1jjsj99dsbm"; libraryHaskellDepends = [ base mmsyn2 vector ]; description = "A library allows to change the structure of the 'RealFrac' function output"; license = stdenv.lib.licenses.mit; @@ -263777,12 +265524,12 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-general"; - version = "0.4.2.0"; - sha256 = "1ixw5lf2p4wnjsm9989nvsp01aznirb2awhasvlbp0bhgqaj0zmq"; + version = "0.4.4.0"; + sha256 = "09511lvrn02kx3qx4sf2jsyaa3jh55agwqvx22qqyiiwvr9ar7j9"; libraryHaskellDepends = [ base print-info uniqueness-periods-vector-common vector ]; - description = "Generalization of the functionality of the dobutokO-poetry-general-languages package"; + description = "Some kind of the optimization approach to data inner structure"; license = stdenv.lib.licenses.mit; }) {}; @@ -263797,6 +265544,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "uniqueness-periods-vector-stats" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "uniqueness-periods-vector-stats"; + version = "0.1.2.0"; + sha256 = "1k98rdjq4i38lrnradfpdzk25b312h65m4mzbyjjzn7hzfra86gn"; + libraryHaskellDepends = [ base ghc-prim ]; + description = "A very basic descriptive statistics"; + license = stdenv.lib.licenses.mit; + }) {}; + "unit" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -264539,15 +266297,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "unordered-containers_0_2_12_0" = callPackage + "unordered-containers_0_2_13_0" = callPackage ({ mkDerivation, base, bytestring, ChasingBottoms, containers , deepseq, gauge, hashable, hashmap, HUnit, mtl, QuickCheck, random , test-framework, test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "unordered-containers"; - version = "0.2.12.0"; - sha256 = "085x73b2cfab85nkbwmcvc5i6v8kbnpbiv35gnmgw44zlm7an7a8"; + version = "0.2.13.0"; + sha256 = "0mbvld5dym17jc13ycl862k73kg26y9khb8578w13cwfmdli7c46"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base ChasingBottoms containers hashable HUnit QuickCheck random @@ -266385,6 +268143,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uusi" = callPackage + ({ mkDerivation, base, Cabal, colourista, directory, microlens + , optparse-applicative, process, text + }: + mkDerivation { + pname = "uusi"; + version = "0.0.0.0"; + sha256 = "0wii4azq5aj8d1c8n5plsfqqvf9x5s4qw82mhvjhnzja3d6cck4f"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base Cabal colourista directory microlens optparse-applicative + process text + ]; + description = "A program removing all version constraints of dependencies in .cabal file"; + license = stdenv.lib.licenses.mit; + }) {}; + "uvector" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -268963,8 +270739,8 @@ self: { }: mkDerivation { pname = "vivid"; - version = "0.4.2.3"; - sha256 = "0awm9cnjgfqx1qf6jsnwmf0kxqxwny82q1ddqna8ilqcdrbsxh0i"; + version = "0.4.2.4"; + sha256 = "11admh79xx88i0yv8x7b38cchgarjbrxmzcbyd2aqa5v7hvk22k6"; libraryHaskellDepends = [ base binary bytestring containers directory filepath hashable MonadRandom mtl network process random random-shuffle split stm @@ -269267,7 +271043,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vty_5_30" = callPackage + "vty_5_31" = callPackage ({ mkDerivation, ansi-terminal, base, binary, blaze-builder , bytestring, Cabal, containers, deepseq, directory, filepath , hashable, HUnit, microlens, microlens-mtl, microlens-th, mtl @@ -269278,8 +271054,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.30"; - sha256 = "1c2azy8pp39hn098dbssl6z8xf63hf52drdqgw7wl856ka2dsakj"; + version = "5.31"; + sha256 = "0w71qnp1plqpib0b9c5kqyhybfmlw50hnlckw9jwr7m0mfssbqdb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -269380,8 +271156,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.6.6"; - sha256 = "09mq11jqrd9sgx4xcy3xxji21yfhzl9a49mh5fp80y2mxsxdl0v9"; + version = "3.6.7"; + sha256 = "1fiq6vynq38laf2kj60sasmpz3mm5kr9nr0yb0jgamzaxyabh75p"; libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -269399,6 +271175,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vulkan-utils" = callPackage + ({ mkDerivation, base, bytestring, extra, file-embed, filepath + , template-haskell, temporary, typed-process, vulkan + }: + mkDerivation { + pname = "vulkan-utils"; + version = "0.1.2"; + sha256 = "1him27687nbqc5mv56gf8nr9hg4wpx702sijrci0ls7mpjz9qlxp"; + libraryHaskellDepends = [ + base bytestring extra file-embed filepath template-haskell + temporary typed-process vulkan + ]; + description = "Utils for the vulkan package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "waargonaut" = callPackage ({ mkDerivation, attoparsec, base, bifunctors, bytestring, Cabal , cabal-doctest, containers, contravariant, digit, directory @@ -269586,6 +271378,8 @@ self: { pname = "wai-app-static"; version = "3.1.7.2"; sha256 = "138gd5482psq0wbm8s1az672lksi7vbavq6ayiyjkliivf6xpry8"; + revision = "1"; + editedCabalFile = "1q7zwjasysgbp9rdp75535igd7s6mhi2bnl4pzsn6vbyfw3qnsxd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -269778,7 +271572,7 @@ self: { "wai-extra" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , bytestring, call-stack, case-insensitive, containers, cookie + , bytestring, case-insensitive, containers, cookie , data-default-class, deepseq, directory, fast-logger, hspec , http-types, http2, HUnit, iproute, network, old-locale, resourcet , streaming-commons, text, time, transformers, unix, unix-compat @@ -269786,12 +271580,12 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.31"; - sha256 = "1kyid5h7pssgqigmggvx6jh9ip848dkyaslnxi58hhddx0m50vs3"; + version = "3.0.32"; + sha256 = "1676mvyamlrkfsvdnrxj0cd2bl40b8lp4nrcpn67mnjxfs7qflh0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring bytestring call-stack + aeson ansi-terminal base base64-bytestring bytestring case-insensitive containers cookie data-default-class deepseq directory fast-logger http-types http2 iproute network old-locale resourcet streaming-commons text time transformers unix unix-compat @@ -269805,6 +271599,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-extra_3_1_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , bytestring, call-stack, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, fast-logger, hspec + , http-types, http2, HUnit, iproute, network, old-locale, resourcet + , streaming-commons, text, time, transformers, unix, unix-compat + , vault, void, wai, wai-logger, word8, zlib + }: + mkDerivation { + pname = "wai-extra"; + version = "3.1.0"; + sha256 = "1x316vfqkkhmvvvb2g8ag7ycpjsdarmkj4872g5bm44c2419gvvk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base base64-bytestring bytestring call-stack + case-insensitive containers cookie data-default-class deepseq + directory fast-logger http-types http2 HUnit iproute network + old-locale resourcet streaming-commons text time transformers unix + unix-compat vault void wai wai-logger word8 zlib + ]; + testHaskellDepends = [ + base bytestring case-insensitive cookie fast-logger hspec + http-types http2 HUnit resourcet text time transformers wai zlib + ]; + description = "Provides some basic WAI handlers and middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-frontend-monadcgi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, cgi , containers, http-types, transformers, wai @@ -270734,6 +272558,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-middleware-static_0_9_0" = callPackage + ({ mkDerivation, base, bytestring, containers, cryptonite + , directory, expiring-cache-map, filepath, hspec, hspec-discover + , hspec-expectations-lifted, hspec-wai, http-types, memory + , mime-types, mockery, old-locale, scotty, semigroups, text, time + , wai, wai-extra + }: + mkDerivation { + pname = "wai-middleware-static"; + version = "0.9.0"; + sha256 = "161s2lk9529008219q6fgbmv0rkf74jmfj1cii8zxkgnhpvi22zs"; + libraryHaskellDepends = [ + base bytestring containers cryptonite directory expiring-cache-map + filepath http-types memory mime-types old-locale semigroups text + time wai + ]; + testHaskellDepends = [ + base hspec hspec-expectations-lifted hspec-wai http-types mockery + scotty wai-extra + ]; + testToolDepends = [ hspec-discover ]; + description = "WAI middleware that serves requests to static files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-static-caching" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, containers , cryptohash, directory, expiring-cache-map, filepath, http-types @@ -271101,20 +272951,21 @@ self: { "wai-session-postgresql" = callPackage ({ mkDerivation, base, bytestring, cereal, cookie, data-default - , entropy, postgresql-simple, resource-pool, text, time + , entropy, hspec, postgresql-simple, resource-pool, text, time , transformers, wai, wai-session }: mkDerivation { pname = "wai-session-postgresql"; - version = "0.2.1.2"; - sha256 = "10xc34a1l6g2lr8b4grvv17281689gdb8q1vh3kkip5lk7fp1m9r"; + version = "0.2.1.3"; + sha256 = "1l3ws8bkflrk5gnvw0dd98fw83kfhf78mn9z6l2v6yv3gvdfzj6l"; libraryHaskellDepends = [ base bytestring cereal cookie data-default entropy postgresql-simple resource-pool text time transformers wai wai-session ]; testHaskellDepends = [ - base bytestring data-default postgresql-simple text wai-session + base bytestring data-default hspec postgresql-simple text + wai-session ]; description = "PostgreSQL backed Wai session store"; license = stdenv.lib.licenses.bsd3; @@ -272337,6 +274188,25 @@ self: { broken = true; }) {}; + "webauthn" = callPackage + ({ mkDerivation, aeson, asn1-encoding, asn1-types, base + , base16-bytestring, base64-bytestring, bytestring, cborg, cereal + , containers, cryptonite, hashable, memory, serialise, text, x509 + , x509-validation + }: + mkDerivation { + pname = "webauthn"; + version = "0"; + sha256 = "1nmrxpc0q7bs4z7gnkxbm02qpp8c2rn48hxi52y1k4iqglp9mmp0"; + libraryHaskellDepends = [ + aeson asn1-encoding asn1-types base base16-bytestring + base64-bytestring bytestring cborg cereal containers cryptonite + hashable memory serialise text x509 x509-validation + ]; + description = "Web Authentication API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "webby" = callPackage ({ mkDerivation, aeson, base-noprelude, binary, bytestring , formatting, http-api-data, http-types, relude, resourcet, tasty @@ -273690,8 +275560,8 @@ self: { }: mkDerivation { pname = "winery"; - version = "1.3"; - sha256 = "0l22647x0j3487kl8f27hn31lprh0cz906h75azvgn9h8s8hpqmr"; + version = "1.3.1"; + sha256 = "0p504hglnih3gxc8x2iqqq9sih1l6chq53nijlv8f6wy15j9p5hh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -273970,6 +275840,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "witness_0_5" = callPackage + ({ mkDerivation, base, constraints, countable, semigroupoids + , transformers + }: + mkDerivation { + pname = "witness"; + version = "0.5"; + sha256 = "0888969dypgykmhp33nar4a6yhrbd5i6agnbq415ni5cfdx1c2cr"; + libraryHaskellDepends = [ + base constraints countable semigroupoids transformers + ]; + description = "values that witness types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "witty" = callPackage ({ mkDerivation, base, bytestring, network, unix }: mkDerivation { @@ -274523,6 +276409,26 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "wordn" = callPackage + ({ mkDerivation, base, deepseq, gauge, ghc-prim, HUnit, OddWord + , primitive, QuickCheck, quickcheck-classes, tasty, tasty-hunit + , tasty-quickcheck, weigh + }: + mkDerivation { + pname = "wordn"; + version = "0.1.0.0"; + sha256 = "00f24hlnr5xy23k8739ds14xapaj11mba232sacpzvkkhky6lkil"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ + base HUnit primitive QuickCheck quickcheck-classes tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base deepseq gauge OddWord weigh ]; + doHaddock = false; + description = "arbitrary bit size Words"; + license = stdenv.lib.licenses.mit; + }) {}; + "wordpass" = callPackage ({ mkDerivation, base, containers, deepseq, directory, filepath , optparse-applicative, QuickCheck, text, unix-compat, vector @@ -275890,8 +277796,8 @@ self: { }: mkDerivation { pname = "x86-64bit"; - version = "0.4.6"; - sha256 = "19av4xkh80al9gr67n10ivf7hwwg3gfkph2mbq63q8wdh67gyg8s"; + version = "0.4.6.1"; + sha256 = "155ii89a3qjjb1crbps8h41sd9wm5b2qamhw8gpbmywshk9pnd87"; libraryHaskellDepends = [ base deepseq monads-tf tardis vector ]; testHaskellDepends = [ base deepseq monads-tf QuickCheck tardis vector @@ -279826,8 +281732,8 @@ self: { }: mkDerivation { pname = "yesod-auth-lti13"; - version = "0.1.2.1"; - sha256 = "0p4z1vsbf55jc5ljwsdgbvji61554q3ngfn74klr2ddp87dn0fzr"; + version = "0.1.2.2"; + sha256 = "0r1hbnij2dyka1jgxrql9ymfcdc1y60x593a3dmnnw86qksbkb8r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -280141,10 +282047,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.18"; - sha256 = "1hm0frswqcj34scvapszdryjfmnrqq5fhf5hv7qcz8sj3qf46zkd"; - revision = "1"; - editedCabalFile = "14n8l28k6gykym9b3m9kw2j1m8dmiajxqgydpnrr7v75a64xqas9"; + version = "1.6.18.4"; + sha256 = "1i69k0782prgf3wzi714fx0g3jsd654kncn62c7sijsbs0zc6h5h"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra @@ -282625,7 +284529,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "Bindings for the Z3 Theorem Prover"; license = stdenv.lib.licenses.bsd3; - }) {gomp = null; inherit (pkgs) z3;}; + }) {inherit (pkgs) gomp; inherit (pkgs) z3;}; "z3-encoding" = callPackage ({ mkDerivation, base, containers, hspec, mtl, z3 }: @@ -283164,8 +285068,8 @@ self: { }: mkDerivation { pname = "zettelkast"; - version = "0.1.0.0"; - sha256 = "111383ddpalaiwbq5plyi02v2givv21xnxb4j0fb31k8ssmkgbqj"; + version = "0.2.0.0"; + sha256 = "1c7yfngwyr02fkr13cbyaja064qgbw6rjlw4c2yn22xn4xrq65qr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/acl2/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/acl2/default.nix index e3c62aae98..9ad9564524 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/acl2/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/acl2/default.nix @@ -6,7 +6,7 @@ let # Disable immobile space so we don't run out of memory on large books; see - # http://www.cs.utexas.edu/users/moore/acl2/current/HTML/installation/requirements.html#Obtaining-SBCL + # https://www.cs.utexas.edu/users/moore/acl2/current/HTML/installation/requirements.html#Obtaining-SBCL sbcl = args.sbcl.override { disableImmobileSpace = true; }; # Wrap to add `-model` argument because some of the books in 8.3 need this. @@ -121,7 +121,7 @@ in stdenv.mkDerivation rec { '' else '' The community books are not included in this package. ''); - homepage = "http://www.cs.utexas.edu/users/moore/acl2/"; + homepage = "https://www.cs.utexas.edu/users/moore/acl2/"; downloadPage = "https://github.com/acl2-devel/acl2-devel/releases"; license = with licenses; [ # ACL2 itself is bsd3 diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R23.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R23.nix index d42508c2ef..e0e2357cc2 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R23.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R23.nix @@ -3,8 +3,8 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "23.0.3"; - sha256 = "133aw1ffkxdf38na3smmvn5qwwlalh4r4a51793h1wkhdzkyl6mv"; + version = "23.1"; + sha256 = "1k74g6m2lidhp04vrcwrg0jszj3zwxyrm4fsma09sfn9rfsra36g"; prePatch = '' substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix index e4511da498..8d27bfb64f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix @@ -40,6 +40,10 @@ jruby = stdenv.mkDerivation rec { EOF ''; + postFixup = '' + PATH=$out/bin:$PATH patchShebangs $out/bin + ''; + passthru = rec { rubyEngine = "jruby"; gemPath = "lib/${rubyEngine}/gems/${rubyVersion.libDir}"; 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 afb5dd9c5b..22ad9aa05f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix @@ -1,10 +1,10 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; - version = "2.0.5-2020-08-09"; - rev = "e296f56"; + version = "2.0.5-2020-09-27"; + rev = "e8ec6fe"; isStable = true; - sha256 = "0g4wvpmmrxj8ir6yi86gg93khy8ri7x4w091jihpxsmn670da21f"; + sha256 = "0v7g216j0zrjp32nfjqqxzgxgvgbdx89h3x0djbqg3avsgxjwnbk"; 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 cb0320c7c7..18b4d32574 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix @@ -1,8 +1,8 @@ { self, callPackage }: callPackage ./default.nix { inherit self; - version = "2.1.0-2020-08-27"; - rev = "ff1e72a"; + version = "2.1.0-2020-09-30"; + rev = "e9af1ab"; isStable = false; - sha256 = "0rlh5y48jbxnamr3a5i3szzh7y9ycvq052rw6m82gdhrb1jlamdz"; + sha256 = "081vrr4snr1c38cscbq1a8barv7abc9czqqlm4qlbdksa8g32bbj"; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix index 9658186b9c..e0e15ca327 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix @@ -11,7 +11,7 @@ , enableFFI ? true , enableJIT ? true , enableJITDebugModule ? enableJIT -, enableGC64 ? stdenv.hostPlatform.isAarch64 +, enableGC64 ? true , enable52Compat ? false , enableValgrindSupport ? false , valgrind ? null diff --git a/third_party/nixpkgs/pkgs/development/interpreters/micropython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/micropython/default.nix index 3293c4b9f5..8d5a025294 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/micropython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/micropython/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "micropython"; - version = "1.12"; + version = "1.13"; src = fetchFromGitHub { owner = "micropython"; repo = "micropython"; rev = "v${version}"; - sha256 = "1fsigdahnv5yn0mc7dr1y6h7g8ywg084pcgj6d64kb39w641n8j5"; + sha256 = "0m9g6isys4pnlnkdmrw7lxaxdrjn02j481wz5x5cdrmrbi4zi17z"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix index 06d69ed811..d976610859 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix @@ -1,4 +1,7 @@ { stdenv +# Note: either stdenv.mkDerivation or, for octaveFull, the qt-5 mkDerivation +# with wrapQtAppsHook (comes from libsForQt5.callPackage) +, mkDerivation , fetchurl , gfortran , ncurses @@ -55,7 +58,7 @@ assert (!blas.isILP64) && (!lapack.isILP64); -stdenv.mkDerivation rec { +mkDerivation rec { version = "5.2.0"; pname = "octave"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix index 991c385ced..a817861f6f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix @@ -175,11 +175,11 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "15ca5359f99698ef0a199bc307b7956c08907abc"; # Aug 27, 2020 + crossVersion = "f59d2b6a179760230d925550db78b93c410433e4"; # Sept 22, 2020 perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "0pcwv2ac02i2l0fjc8drdw70q6gwbypj2c5a53x2449m919v37h9"; + sha256 = "1r07waq4ik4gf32c046f27pglwcy5rv9b6whj6497xbxfmaa5562"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -215,7 +215,7 @@ in { perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.33.1"; - sha256 = "1rlnqqqzyhal79ys5dv7fwm3mg81s43dwks28b74x2gcmsngjnw9"; + version = "5.33.2"; + sha256 = "0zrb3d744argzy5idmafk92iprq9qbhzqbg4xj5w2i80sgg41212"; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix index 8921cf78aa..a2e546b826 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix @@ -272,16 +272,16 @@ let }; php73base = callPackage generic (_args // { - version = "7.3.20"; - sha256 = "1pl9bjwvdva2yx4sh465z9cr4bnr8mvv008w71sy1kqsj6a7ivf6"; + version = "7.3.23"; + sha256 = "0k600imsxm3r3qdv20ryqhvfmnkmjhvm2hcnqr180l058snncrpx"; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; }); php74base = callPackage generic (_args // { - version = "7.4.8"; - sha256 = "0ql01sfg8l7y2bfwmnjxnfw9irpibnz57ssck24b00y00nkd6j3a"; + version = "7.4.11"; + sha256 = "1idq2sk3x6msy8l2g42jv3y87h1fgb1aybxw7wpjkliv4iaz422l"; }); defaultPhpExtensions = { all, ... }: with all; ([ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix index 94422518b2..2ed5ed951d 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -108,9 +108,9 @@ in { major = "3"; minor = "9"; patch = "0"; - suffix = "rc1"; + suffix = ""; }; - sha256 = "0w6wvyy9fbvfvrmhvmlb5gq18haagywk9hjkp1knjdarfczag9zv"; + sha256 = "0m18z05nlmqm1zjw9s0ifgrn1jvjn3jwjg0bpswhjmw5k4yfcwww"; inherit (darwin) configd; inherit passthruFun; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index b568ee6751..8b6f082674 100755 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -12,11 +12,10 @@ to update all non-pinned libraries in that folder. """ import argparse -import logging import os +import pathlib import re import requests -import toolz from concurrent.futures import ThreadPoolExecutor as Pool from packaging.version import Version as _Version from packaging.version import InvalidVersion @@ -34,6 +33,8 @@ PRERELEASES = False GIT = "git" +NIXPGKS_ROOT = str(pathlib.Path(__file__).absolute().parents[5]) + import logging logging.basicConfig(level=logging.INFO) @@ -101,6 +102,7 @@ def _replace_value(attribute, value, text): new_text = text.replace(old_line, new_line) return new_text + def _fetch_page(url): r = requests.get(url) if r.status_code == requests.codes.ok: @@ -109,6 +111,19 @@ def _fetch_page(url): raise ValueError("request for {} failed".format(url)) +def _fetch_github(url): + headers = {} + token = os.environ.get('GITHUB_API_TOKEN') + if token: + headers["Authorization"] = f"token {token}" + r = requests.get(url, headers=headers) + + if r.status_code == requests.codes.ok: + return r.json() + else: + raise ValueError("request for {} failed".format(url)) + + SEMVER = { 'major' : 0, 'minor' : 1, @@ -167,11 +182,42 @@ def _get_latest_version_pypi(package, extension, current_version, target): break else: sha256 = None - return version, sha256 + return version, sha256, None def _get_latest_version_github(package, extension, current_version, target): - raise ValueError("updating from GitHub is not yet supported.") + def strip_prefix(tag): + return re.sub("^[^0-9]*", "", tag) + + def get_prefix(string): + matches = re.findall(r"^([^0-9]*)", string) + return next(iter(matches), "") + + try: + homepage = subprocess.check_output( + ["nix", "eval", "-f", f"{NIXPGKS_ROOT}/default.nix", "--raw", f"python3Packages.{package}.src.meta.homepage"])\ + .decode('utf-8') + except Exception as e: + raise ValueError(f"Unable to determine homepage: {e}") + owner_repo = homepage[len("https://github.com/"):] # remove prefix + owner, repo = owner_repo.split("/") + + url = f"https://api.github.com/repos/{owner}/{repo}/releases" + all_releases = _fetch_github(url) + releases = list(filter(lambda x: not x['prerelease'], all_releases)) + + if len(releases) == 0: + raise ValueError(f"{homepage} does not contain any stable releases") + + versions = map(lambda x: strip_prefix(x['tag_name']), releases) + version = _determine_latest_version(current_version, target, versions) + + release = next(filter(lambda x: strip_prefix(x['tag_name']) == version, releases)) + prefix = get_prefix(release['tag_name']) + sha256 = subprocess.check_output(["nix-prefetch-url", "--type", "sha256", "--unpack", f"{release['tarball_url']}"], stderr=subprocess.DEVNULL)\ + .decode('utf-8').strip() + + return version, sha256, prefix FETCHERS = { @@ -240,7 +286,9 @@ def _determine_extension(text, fetcher): raise ValueError('url does not point to PyPI.') elif fetcher == 'fetchFromGitHub': - raise ValueError('updating from GitHub is not yet implemented.') + if "fetchSubmodules" in text: + raise ValueError("fetchFromGitHub fetcher doesn't support submodules") + extension = "tar.gz" return extension @@ -262,7 +310,7 @@ def _update_package(path, target): extension = _determine_extension(text, fetcher) - new_version, new_sha256 = FETCHERS[fetcher](pname, extension, version, target) + new_version, new_sha256, prefix = FETCHERS[fetcher](pname, extension, version, target) if new_version == version: logging.info("Path {}: no update available for {}.".format(path, pname)) @@ -274,6 +322,10 @@ def _update_package(path, target): text = _replace_value('version', new_version, text) text = _replace_value('sha256', new_sha256, text) + if fetcher == 'fetchFromGitHub': + text = _replace_value('rev', f"{prefix}${{version}}", text) + # incase there's no prefix, just rewrite without interpolation + text = text.replace('"${version}";', 'version;') with open(path, 'w') as f: f.write(text) @@ -333,7 +385,11 @@ def _commit(path, pname, old_version, new_version, pkgs_prefix="python: ", **kwa def main(): - parser = argparse.ArgumentParser() + epilog = """ +environment variables: + GITHUB_API_TOKEN\tGitHub API token used when updating github packages + """ + parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter, epilog=epilog) parser.add_argument('package', type=str, nargs='+') parser.add_argument('--target', type=str, choices=SEMVER.keys(), default='major') parser.add_argument('--commit', action='store_true', help='Create a commit for each package update') diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix index 0c708cd317..94f01cd51d 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2020.08.2"; + version = "2020.09"; src = fetchurl { url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "16qsq6alvk2x44x39j2fzxigvm5cvmz85i0nkjcw0wz29yyf8lch"; + sha256 = "1izfwns7viwy0x9hnhx13j9w5qa97qpyxqk9cd8iax7i68z057m7"; }; buildInputs = [ icu zlib gmp perl ]; @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { "--with-nqp=${nqp}/bin/nqp" ]; + # Remove test of profiler, fails since 2020.09 + preCheck = "rm t/09-moar/01-profilers.t"; + # Some tests fail on Darwin doCheck = !stdenv.isDarwin; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix index 702fccd7b6..f03043369e 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2020.08"; + version = "2020.09"; src = fetchurl { url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz"; - sha256 = "1gq7z4z5lnkai01721waawkkal82sdmyra05nnbfb1986mq5xpiy"; + sha256 = "08prlvnyqwnzb7mwaqvgv662v78xgwsyy12cpyim6gc4z0i1kcj8"; }; buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix index 3f5f7afcfe..14d5f563fc 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2020.08.2"; + version = "2020.09"; src = fetchurl { url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "14zr1swprxl284k0h1w72pcypj24sga15170ylaqjb8wxy8h1mqw"; + sha256 = "09kiy7r732yrh3nzdzdq9yki0jx2hamyqvrbahk4mlxmb6cl9qmh"; }; buildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix index dbfea17437..02d0f02c34 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix @@ -192,7 +192,7 @@ let description = "The Ruby language"; homepage = "http://www.ruby-lang.org/en/"; license = licenses.ruby; - maintainers = with maintainers; [ vrthra manveru ]; + maintainers = with maintainers; [ vrthra manveru marsam ]; platforms = platforms.all; }; @@ -240,10 +240,10 @@ in { }; ruby_2_7 = generic { - version = rubyVersion "2" "7" "1" ""; + version = rubyVersion "2" "7" "2" ""; sha256 = { - src = "0674x98f542y02r7n2yv2qhmh97blqhi2mvh2dn5f000vlxlh66l"; - git = "0qk729kr5wm67xmwpljpdprwhp5wvn5y4ikqy00p1zcgwlwdcs33"; + src = "1m63461mxi3fg4y3bspbgmb0ckbbb1ldgf9xi0piwkpfsk80cmvf"; + git = "0kbgznf1yprfp9645k31ra5f4757b7fichzi0hdg6nxkj90853s0"; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix index b0c26e19e1..69f2246418 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix @@ -11,7 +11,7 @@ "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch" ]; - "2.7.1" = ops useRailsExpress [ + "2.7.2" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/rvm-patchsets.nix index 331dda5d05..14f932e1d6 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "skaes"; repo = "rvm-patchsets"; - rev = "6d8888d34a321198f7fd9253343b78c209efb046"; - sha256 = "0xczl0nng1649km3bcbjn6zrr591l6m2kkwgnknh1fnwmmrdaya7"; + rev = "e2f4b82e47aeaf2a3b894da3b46ba6f0ca92cbb6"; + sha256 = "059mvf8jcjrfplr8hv2y6ibc41id979k0zwfh6zdnb7dynym4bsg"; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/self/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/self/default.nix index ccf85f1d1c..cf62399adc 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/self/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/self/default.nix @@ -1,11 +1,11 @@ { fetchgit, stdenv, xorg, makeWrapper, ncurses, cmake }: stdenv.mkDerivation { - # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self + # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self # so that it can be written to when using the Self transposer. Running 'Self' # after installation runs without an image. You can then build a Self image with: # $ cd ~/.local/share/self/objects - # $ Self + # $ Self # > 'worldBuilder.self' _RunScript # # This image can later be started with: @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine"; - homepage = "http://selflanguage.org/"; + homepage = "https://selflanguage.org/"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.doublec ]; platforms = with stdenv.lib.platforms; linux; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix index d2aabfe64d..22ce5a0b38 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.abbradar ]; platforms = platforms.unix; + knownVulnerabilities = [ "SpiderMonkey 38 is outdated and contains known security vulnerabilities." ]; # as per https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38 }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix new file mode 100644 index 0000000000..84897ee846 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix @@ -0,0 +1,118 @@ +{ stdenv +, fetchurl +, fetchpatch +, autoconf213 +, pkgconfig +, perl +, python3 +, zip +, buildPackages +, which +, readline +, zlib +, icu67 +, cargo +, rustc +, rust-cbindgen +, yasm +, llvmPackages +, nspr +}: + +stdenv.mkDerivation rec { + pname = "spidermonkey"; + version = "78.1.0"; + + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; + sha256 = "18k47dl9hbnpqw69csxjar5dhwa7r8k7j9kvcfgmwb1iv6ba601n"; + }; + + outputs = [ "out" "dev" ]; + setOutputFlags = false; # Configure script only understands --includedir + + nativeBuildInputs = [ + autoconf213 + cargo + llvmPackages.llvm # for llvm-objdump + perl + pkgconfig + python3 + rust-cbindgen + rustc + which + yasm # to buid icu? seems weird + zip + ]; + + buildInputs = [ + icu67 + nspr + readline + zlib + ]; + + patches = [ + # https://mail.gnome.org/archives/distributor-list/2020-August/msg00000.html + (fetchpatch { + url = "https://github.com/ptomato/mozjs/commit/b2974f8a6558d2dc4517b49ee313a9900a853285.patch"; + sha256 = "1bl5mbx7gmad6fmpc427263i1ychi2linpg69kxlr2w91r5m6ji3"; + }) + (fetchpatch { + url = "https://github.com/ptomato/mozjs/commit/e5a2eb99f653ae03c67e536df1d55d265a0a1605.patch"; + sha256 = "0xhy63nw2byibmjc41yh6dwpg282nylganrs5aprn9pbqbcpsvif"; + }) + ]; + + preConfigure = '' + export CXXFLAGS="-fpermissive" + export LIBXUL_DIST=$out + export PYTHON="${buildPackages.python3.interpreter}" + + # We can't build in js/src/, so create a build dir + mkdir obj + cd obj/ + configureScript=../js/src/configure + ''; + + configureFlags = [ + "--with-system-zlib" + "--with-system-nspr" + "--with-system-icu" + "--with-intl-api" + "--enable-readline" + "--enable-shared-js" + "--disable-jemalloc" + # Fedora and Arch disable optimize, but it doesn't seme to be necessary + # It turns on -O3 which some gcc version had a problem with: + # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e + "--enable-optimize" + "--enable-release" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # Spidermonkey seems to use different host/build terminology for cross + # compilation here. + "--host=${stdenv.buildPlatform.config}" + "--target=${stdenv.hostPlatform.config}" + ]; + + configurePlatforms = [ ]; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + # Remove unnecessary static lib + preFixup = '' + moveToOutput bin/js60-config "$dev" + rm $out/lib/libjs_static.ajs + ln -s $out/bin/js60 $out/bin/js + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Mozilla's JavaScript engine written in C/C++"; + homepage = "https://developer.mozilla.org/en/SpiderMonkey"; + license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. + maintainers = [ maintainers.abbradar ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/adslib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/adslib/default.nix new file mode 100644 index 0000000000..49b54960b7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/adslib/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "adslib"; + version = "unstable-2020-08-28"; + + src = fetchFromGitHub { + owner = "stlehmann"; + repo = "ADS"; + rev = "c457b60d61d73325837ca50be2cc997c4792d481"; + sha256 = "11r86xa8fr4z957hd0abn8x7182nz30a198d02y7gzpbhpi3z43k"; + }; + + installPhase = '' + mkdir -p $out/lib + cp adslib.so $out/lib/adslib.so + ''; + + meta = with lib; { + description = "Beckhoff protocol to communicate with TwinCAT devices"; + homepage = "https://github.com/stlehmann/ADS"; + license = licenses.mit; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix index 1f75892b9a..c4a0a460f8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2020.Q3.5"; + version = "2020.Q3.6"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "08fj3cg3axnwadlpfim23g5nyjl69044fqxdr57af6y79441njay"; + sha256 = "05bvxxgaz94y85g1sq0jzjxd4j8vgdfan04q2fzmfcw3h6p7syjy"; }; buildInputs = [ @@ -68,11 +68,6 @@ in stdenv.mkDerivation rec { # LTO is disabled in gcc for i686 as of #66528 cmakeFlags = stdenv.lib.optionals stdenv.is32bit ["-DXGL_ENABLE_LTO=OFF"]; - postPatch = stdenv.lib.optionalString stdenv.is32bit '' - substituteInPlace drivers/pal/cmake/PalCompilerOptions.cmake \ - --replace "pal_setup_gcc_ipo()" "" - ''; - installPhase = '' install -Dm755 -t $out/lib icd/amdvlk${suffix}.so install -Dm644 -t $out/share/vulkan/icd.d ../drivers/AMDVLK/json/Redhat/amd_icd${suffix}.json diff --git a/third_party/nixpkgs/pkgs/development/libraries/appstream-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/appstream-glib/default.nix index 5b777dff3e..8e77f6aa34 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/appstream-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/appstream-glib/default.nix @@ -23,7 +23,7 @@ , pngquant }: stdenv.mkDerivation rec { - name = "appstream-glib-0.7.17"; + name = "appstream-glib-0.7.18"; outputs = [ "out" "dev" "man" "installedTests" ]; outputBin = "dev"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "appstream-glib"; rev = stdenv.lib.replaceStrings [ "." "-" ] [ "_" "_" ] name; - sha256 = "06pm8l58y0ladimyckbvlslr5bjj9rwb70rgjmn09l41pdpipy2i"; + sha256 = "12s7d3nqjs1fldnppbg2mkjg4280f3h8yzj3q1hiz3chh1w0vjbx"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/aqbanking/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aqbanking/default.nix index c206630b57..37bc175fed 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aqbanking/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aqbanking/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An interface to banking tasks, file formats and country information"; - homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=03&showall=1"; + homepage = "https://www.aquamaniac.de/"; hydraPlatforms = []; license = licenses.gpl2Plus; maintainers = with maintainers; [ goibhniu ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aribb25/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aribb25/default.nix new file mode 100644 index 0000000000..ceae869854 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/aribb25/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, autoreconfHook +, pkgconfig +, pcsclite +, PCSC +, xcbuild +}: + +stdenv.mkDerivation rec { + pname = "aribb25"; + # FIXME: change the rev for fetchFromGitLab in next release + version = "0.2.7"; + + src = fetchFromGitLab { + domain = "code.videolan.org"; + owner = "videolan"; + repo = pname; + # rev = version; FIXME: uncomment in next release + rev = "c14938692b313b5ba953543fd94fd1cad0eeef18"; # 0.2.7 with build fixes + sha256 = "1kb9crfqib0npiyjk4zb63zqlzbhqm35nz8nafsvdjd71qbd2amp"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ] ++ lib.optional stdenv.isDarwin xcbuild; + buildInputs = if stdenv.isDarwin then [ PCSC ] else [ pcsclite ]; + + patches = let + url = commit: "https://code.videolan.org/videolan/${pname}/-/commit/${commit}.diff"; + in [ + (fetchpatch { + name = "make-cli-pipes-work-1.patch"; + url = url "0425184dbf3fdaf59854af5f530da88b2196a57b"; + sha256 = "0ysm2jivpnqxz71vw1102616qxww2gx005i0c5lhi6jbajqsa1cd"; + }) + (fetchpatch { + name = "make-cli-pipes-work-2.patch"; + url = url "cebabeab2bda065dca1c9f033b42d391be866d86"; + sha256 = "1283kqv1r4rbaba0sv2hphkhcxgjkmh8ndlcd24fhx43nn63hd28"; + }) + ]; + + buildFlags = + lib.optional stdenv.isDarwin "pcsclite_CFLAGS=-I${PCSC}/Library/Frameworks/PCSC.framework/Headers"; + + meta = with stdenv.lib; { + homepage = "https://code.videolan.org/videolan/aribb25"; + description = "Sample implementation of the ARIB STD-B25 standard"; + platforms = platforms.all; + license = licenses.isc; + maintainers = with maintainers; [ midchildan ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/cddlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cddlib/default.nix index 76b5390fb6..a9a10fc631 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cddlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cddlib/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "cddlib"; - version = "0.94j"; + version = "0.94l"; src = fetchFromGitHub { owner = "cddlib"; repo = "cddlib"; rev = version; - sha256 = "1z03ljy3rrr0qq5gq54vynnif6fn0xhn05g90nnv0dpyc3ps8lzp"; + sha256 = "0934a0i2m2bamlibi4cbrf1md1pz7dp35jbfamb0k7x644sayl4k"; }; buildInputs = [gmp]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/coin3d/default.nix b/third_party/nixpkgs/pkgs/development/libraries/coin3d/default.nix index 634ac27058..7fd6763725 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/coin3d/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/coin3d/default.nix @@ -1,14 +1,14 @@ -{ fetchFromBitbucket, stdenv, boost, cmake, libGL, libGLU }: +{ fetchFromGitHub, stdenv, boost, cmake, libGL, libGLU }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "coin"; - version = "unstable-2019-06-12"; + version = "4.0.0"; - src = fetchFromBitbucket { - owner = "Coin3D"; + src = fetchFromGitHub { + owner = "coin3d"; repo = "coin"; - rev = "8d860d7ba112b22c4e9b289268fd8b3625ab81d3"; - sha256 = "1cpncljqvw28k5wvpgchv593nayhby5gwpvbnyllc9hb9ms816xn"; + rev = "Coin-${version}"; + sha256 = "1ayg0hl8wanhadahm5xbghghxw1qjwqbrs3dl3ngnff027hsyf8p"; }; postPatch = '' @@ -18,11 +18,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ boost libGL libGLU ]; - meta = { - homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home"; - license = stdenv.lib.licenses.gpl2Plus; + meta = with stdenv.lib; { + homepage = "https://github.com/coin3d/coin"; + license = licenses.bsd3; description = "High-level, retained-mode toolkit for effective 3D graphics development"; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ gebner viric ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/editline/default.nix b/third_party/nixpkgs/pkgs/development/libraries/editline/default.nix index 835258d5bf..549ef7c56b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/editline/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/editline/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "doc" ]; meta = with stdenv.lib; { - homepage = "http://troglobit.com/editline.html"; + homepage = "https://troglobit.com/editline.html"; description = "A readline() replacement for UNIX without termcap (ncurses)"; license = licenses.bsdOriginal; maintainers = with maintainers; [ dtzWill ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix b/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix index 2d83b9bbfa..60d6af9476 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw, - openimageio, libjpeg, libpng, libpthreadstubs, libX11 }: +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw, + openimageio, libjpeg, libpng, libpthreadstubs, libX11, glib }: stdenv.mkDerivation rec { pname = "embree"; - version = "3.11.0"; + version = "3.12.0"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; rev = "v${version}"; - sha256 = "0v5gqi8jp09xxcbyyknji83412bq4l0w35b6hnrqxycgdrnf7hkr"; + sha256 = "1q06fkfww8z8pcnhaqc4d2zi8hn620i9h9dmpnrfy3azalvizhkq"; }; postPatch = '' @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { sed -i "s|SET(EMBREE_ROOT_DIR .*)|set(EMBREE_ROOT_DIR $out)|" \ common/cmake/embree-config.cmake sed -i "s|$""{EMBREE_ROOT_DIR}/||" common/cmake/embree-config.cmake + substituteInPlace common/math/math.h --replace 'defined(__MACOSX__) && !defined(__INTEL_COMPILER)' 0 + substituteInPlace common/math/math.h --replace 'defined(__WIN32__) || defined(__FreeBSD__)' 'defined(__WIN32__) || defined(__FreeBSD__) || defined(__MACOSX__)' ''; cmakeFlags = [ @@ -24,8 +26,10 @@ stdenv.mkDerivation rec { "-DEMBREE_RAY_MASK=ON" ]; + nativeBuildInputs = [ ispc pkgconfig cmake ]; - buildInputs = [ tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ]; + buildInputs = [ tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ] + ++ lib.optionals stdenv.isDarwin [ glib ]; meta = with stdenv.lib; { description = "High performance ray tracing kernels from Intel"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix index 749005e09a..05abb1f2aa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, cryptopp, opencl-headers, opencl-info, - openmpi, ocl-icd, mesa, gbenchmark, gtest }: +{ stdenv, fetchFromGitHub, cmake, gbenchmark, gtest }: stdenv.mkDerivation rec { pname = "ethash"; @@ -17,16 +16,6 @@ stdenv.mkDerivation rec { cmake ]; - buildInputs = [ - boost - cryptopp - opencl-headers - opencl-info - openmpi - ocl-icd - mesa - ]; - checkInputs = [ gbenchmark gtest diff --git a/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix index eb6ed5e210..cc1bb09d39 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "20.08"; + version = "20.09"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "1fs0h5wl0ndix61mz7h59c15kpqikrk7nn1rc7m2a44jiw8mzdnx"; + sha256 = "097pdpd34aw420c46j6nrl5wdklgqrsznml0q2qxw1m7hrl7gkk6"; }; nativeBuildInputs = [cmake]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix index be31997e5f..eb9ecea7a1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, enableShared ? true }: stdenv.mkDerivation rec { pname = "fmt"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix index e2734c6b19..0eff8eafac 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gbenchmark"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - sha256 = "16xlk8h4mfszl4rig22fgpj9kw312az22981ph6pmkf35xsvvv66"; + sha256 = "13rxagpzw6bal6ajlmrxlh9kgfvcixn6j734b2bvfqz7lch8n0pa"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gegl/4.0.nix b/third_party/nixpkgs/pkgs/development/libraries/gegl/4.0.nix index 66bbd55ec4..6b38251a68 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gegl/4.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gegl/4.0.nix @@ -45,6 +45,15 @@ stdenv.mkDerivation rec { sha256 = "097427icgpgvcx40019b3dm8m84cchz79pixzpz648drs8p1wdqg"; }; + patches = [ + # fix build with darwin: https://github.com/NixOS/nixpkgs/issues/99108 + # https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83.patch"; + sha256 = "CSBYbJ2xnEN23xrla1qqr244jxOR5vNK8ljBSXdg4yE="; + }) + ]; + nativeBuildInputs = [ pkgconfig gettext diff --git a/third_party/nixpkgs/pkgs/development/libraries/hivex/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hivex/default.nix index d0afea119d..ee22726414 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hivex/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hivex/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.3.19"; src = fetchurl { - url = "http://libguestfs.org/download/hivex/${pname}-${version}.tar.gz"; + url = "https://libguestfs.org/download/hivex/${pname}-${version}.tar.gz"; sha256 = "0qppahpf7jq950nf8ial47h90nyqgnsffsj3zgdjjwkn958wq0ji"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jbigkit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jbigkit/default.nix index dbf728e7d8..c21d51bc5a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jbigkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jbigkit/default.nix @@ -8,15 +8,23 @@ stdenv.mkDerivation rec { sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy"; }; + makeFlags = [ + "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" + "RANLIB=${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" + ]; + postPatch = '' sed -i 's/^\(CFLAGS.*\)$/\1 -fPIC/' Makefile - '' + stdenv.lib.optionalString stdenv.cc.isClang '' + for f in Makefile libjbig/Makefile pbmtools/Makefile; do - substituteInPlace $f --replace "CC = gcc" "CC = clang" + sed -i -E 's/\bar /$(AR) /g;s/\branlib /$(RANLIB) /g' "$f" done ''; installPhase = '' + runHook preInstall + install -D -m644 libjbig/libjbig.a $out/lib/libjbig.a install -D -m644 libjbig/libjbig85.a $out/lib/libjbig85.a install -D -m644 libjbig/jbig.h $out/include/jbig.h @@ -30,12 +38,14 @@ stdenv.mkDerivation rec { install -D -m755 pbmtools/pbmtojbg $out/bin/pbmtojbg install -D -m755 pbmtools/jbgtopbm85 $out/bin/jbgtopbm85 install -D -m755 pbmtools/pbmtojbg85 $out/bin/pbmtojbg85 + + runHook postInstall ''; meta = with stdenv.lib; { homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/"; description = "A software implementation of the JBIG1 data compression standard"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libevent/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libevent/default.nix index 880ba746bb..e23c7d55c5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libevent/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libevent/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { and then add or remove events dynamically without having to change the event loop. ''; - homepage = "http://libevent.org/"; + homepage = "https://libevent.org/"; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libguestfs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libguestfs/default.nix index 234e116489..6e6b892c21 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libguestfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libguestfs/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { version = "1.40.2"; src = fetchurl { - url = "http://libguestfs.org/download/1.40-stable/${pname}-${version}.tar.gz"; + url = "https://libguestfs.org/download/1.40-stable/${pname}-${version}.tar.gz"; sha256 = "ad6562c48c38e922a314cb45a90996843d81045595c4917f66b02a6c2dfe8058"; }; @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools for accessing and modifying virtual machine disk images"; license = with licenses; [ gpl2 lgpl21 ]; - homepage = "http://libguestfs.org/"; + homepage = "https://libguestfs.org/"; maintainers = with maintainers; [offline]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix index cd802fde77..c03367da97 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix @@ -1,18 +1,25 @@ -{ stdenv +{ lib +, stdenv , fetchFromGitHub +, fetchpatch +, buildPackages , cmake , glib -, gobject-introspection , icu , libxml2 , ninja , perl , pkgconfig +, libical , python3 , tzdata -, vala +, introspectionSupport ? stdenv.buildPlatform == stdenv.hostPlatform +, gobject-introspection ? null +, vala ? null }: +assert introspectionSupport -> gobject-introspection != null && vala != null; + stdenv.mkDerivation rec { pname = "libical"; version = "3.0.8"; @@ -28,15 +35,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - gobject-introspection ninja perl pkgconfig - vala # Docs building fails: # https://github.com/NixOS/nixpkgs/pull/67204 # previously with https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489 # gtk-doc docbook_xsl docbook_xml_dtd_43 # for docs + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # provides ical-glib-src-generator that runs during build + libical + ] ++ lib.optionals introspectionSupport [ + gobject-introspection + vala ]; installCheckInputs = [ # running libical-glib tests @@ -52,15 +63,24 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DGOBJECT_INTROSPECTION=True" "-DENABLE_GTK_DOC=False" + ] ++ lib.optionals introspectionSupport [ + "-DGOBJECT_INTROSPECTION=True" "-DICAL_GLIB_VAPI=True" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DIMPORT_GLIB_SRC_GENERATOR=${lib.getDev buildPackages.libical}/lib/cmake/LibIcal/GlibSrcGenerator.cmake" ]; patches = [ # Will appear in 3.1.0 # https://github.com/libical/libical/issues/350 ./respect-env-tzdir.patch + # Export src-generator binary for use while cross-compiling + # https://github.com/libical/libical/pull/439 + (fetchpatch { + url = "https://github.com/libical/libical/commit/1197d84b63dce179b55a6293cfd6d0523607baf1.patch"; + sha256 = "18i1khnwmw488s7g5a1kf05sladf8dbyhfc69mbcf6dkc4nnc3dg"; + }) ]; # Using install check so we do not have to manually set diff --git a/third_party/nixpkgs/pkgs/development/libraries/libinsane/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libinsane/default.nix index 0b0f1b36ed..cbc4c001b1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libinsane/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libinsane/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "libinsane"; - version = "1.0.4"; + version = "1.0.7"; outputs = [ "out" "dev" "devdoc" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "1qk0s4m87yqa75h27bl7m03g4gamln43wn4159h7dcnwc36hdzw6"; + sha256 = "03r6niyzfahnlpvhn68h59i6926ciwz88krqbf0akd9f42y9zf2k"; }; nativeBuildInputs = [ meson pkg-config ninja doxygen gtk-doc docbook_xsl gobject-introspection vala ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libisds/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libisds/default.nix index 4ed5a83096..28a8d7d874 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libisds/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libisds/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libisds"; - version = "0.11"; + version = "0.11.1"; src = fetchurl { url = "http://xpisar.wz.cz/${pname}/dist/${pname}-${version}.tar.xz"; - sha256 = "1cy161l7rl25xji2xpb9vjpvg02bc7mwd4fpp2sx9zhpifn5dfbr"; + sha256 = "1n1vl05p78fksv6dm926rngd3wag41gyfbq76ajzcmq08j32y7y1"; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libkml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libkml/default.nix index d619101c23..690d9b9801 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libkml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libkml/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TESTING=ON" + # Darwin tests require rpath for libs in build dir + ] ++ stdenv.lib.optional stdenv.isDarwin [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix index 0728dddcb4..0a9c8e6973 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "0.1.2"; + version = "0.2.0"; pname = "libmicrodns"; src = fetchFromGitHub { owner = "videolabs"; repo = pname; rev = version; - sha256 = "1yb0j0acidp494d28wqhzhrfski2qjb2a5mp5bq5qrpcg38zyz6i"; + sha256 = "05vgka45c1frnv4q7pbz0bggsn5xaykh4xpklh9yb6d6qj7dbx0b"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libminc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libminc/default.nix index 53b6af40b5..ce39285e0d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libminc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libminc/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "libminc"; - version = "2.4.03"; + version = "unstable-2020-07-17"; owner = "BIC-MNI"; src = fetchFromGitHub { inherit owner; repo = pname; - rev = "release-${version}"; - sha256 = "0kpmqs9df836ywsqj749qbsfavf5bnldblxrmnmxqq9pywc8yfrm"; + rev = "ffb5fb234a852ea7e8da8bb2b3b49f67acbe56ca"; + sha256 = "0yr4ksghpvxh9zg0a4p7hvln3qirsi08plvjp5kxx2qiyj96zsdm"; }; postPatch = '' @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib netcdf nifticlib hdf5 ]; + buildInputs = [ zlib nifticlib ]; + propagatedBuildInputs = [ netcdf hdf5 ]; cmakeFlags = [ "-DLIBMINC_MINC1_SUPPORT=ON" @@ -29,17 +30,16 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; checkPhase = '' export LD_LIBRARY_PATH="$(pwd)" # see #22060 - ctest -E 'ezminc_rw_test|minc_conversion' --output-on-failure - # ezminc_rw_test can't find libminc_io.so.5.2.0; minc_conversion hits netcdf compilation issue + ctest -j1 -E 'ezminc_rw_test' --output-on-failure + # -j1: see https://github.com/BIC-MNI/libminc/issues/110 + # ezminc_rw_test: can't find libminc_io.so.5.2.0 ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { - homepage = "https://github.com/${owner}/${pname}"; + homepage = "https://github.com/BIC-MNI/libminc"; description = "Medical imaging library based on HDF5"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; - license = licenses.free; + license = licenses.free; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libopus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libopus/default.nix index 27e9a89fce..9f4d6275ad 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libopus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libopus/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open, royalty-free, highly versatile audio codec"; license = stdenv.lib.licenses.bsd3; - homepage = "http://www.opus-codec.org/"; + homepage = "https://www.opus-codec.org/"; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libopusenc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libopusenc/default.nix index f26349bd48..989dfc517f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libopusenc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libopusenc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Library for encoding .opus audio files and live streams"; license = licenses.bsd3; - homepage = "http://www.opus-codec.org/"; + homepage = "https://www.opus-codec.org/"; platforms = platforms.unix; maintainers = with maintainers; [ pmiddend ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index 5c520e1c9d..11816beee0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.12.1"; + version = "3.13.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "0g3ipl6ynhclmwny54zgdh721v0fs9dzj6j7r8dz91s86jva3chb"; + sha256 = "0nd0hrnp0a9p7hy6l6s45kfd267r7qg91aqn8g2dyam5hngskayk"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqtav/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqtav/default.nix index 43489e8e85..fc577d7e50 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqtav/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqtav/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchFromGitHub, extra-cmake-modules , qtbase, qtmultimedia, qtquick1, qttools , libGL, libX11 -, libass, openal, ffmpeg_3, libuchardet +, libass, openal, ffmpeg, libuchardet , alsaLib, libpulseaudio, libva }: @@ -9,19 +9,19 @@ with lib; mkDerivation rec { pname = "libqtav"; - version = "1.12.0"; + version = "git-2020-09-10"; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ qtbase qtmultimedia qtquick1 libGL libX11 - libass openal ffmpeg_3 libuchardet + libass openal ffmpeg libuchardet alsaLib libpulseaudio libva ]; src = fetchFromGitHub { - sha256 = "03ii9l38l3fsr27g42fx4151ipzkip2kr4akdr8x28sx5r9rr5m2"; - rev = "v${version}"; + sha256 = "0qwrk40dihkbwmm7krz6qaqyn9v3qdjnd2k9b4s3a67x4403pib3"; + rev = "2a470d2a8d2fe22fae969bee5d594909a07b350a"; repo = "QtAV"; owner = "wang-bin"; fetchSubmodules = true; @@ -46,6 +46,5 @@ mkDerivation rec { homepage = "http://www.qtav.org/"; maintainers = [ maintainers.jraygauthier ]; platforms = platforms.linux; - broken = !(lib.versionOlder qtbase.version "5.13"); }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libstrophe/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libstrophe/default.nix index b48bd15909..428e23f33f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libstrophe/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libstrophe/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libstrophe"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "strophe"; repo = pname; rev = version; - sha256 = "1g1l0w9z9hdy5ncdvd9097gi7k7783did6py5h9camlpb2fnk5mk"; + sha256 = "1hizw695fw0cy88h1dpl9pvniapml2zw9yvxck8xvxbqfz54jwja"; }; nativeBuildInputs = [ automake autoconf pkgconfig libtool check ]; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { minimal dependencies and is configurable for various environments. It runs well on both Linux, Unix, and Windows based platforms. ''; - homepage = "http://strophe.im/libstrophe/"; + homepage = "https://strophe.im/libstrophe/"; license = with stdenv.lib.licenses; [ gpl3 mit ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ devhell flosse ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix index e029781220..1839c0ec18 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix @@ -14,24 +14,32 @@ stdenv.mkDerivation rec { separateDebugInfo = true; enableParallelBuilding = true; - - outputs = [ "out" "lib" "dev" "man" ]; - - configurePhase = '' - ./configure \ - --prefix=$out \ - --includedir=$dev/include \ - --libdir=$lib/lib \ - --mandir=$man/share/man \ + # Upstream's configure script is not autoconf generated, but a hand written one. + setOutputFlags = false; + preConfigure = + # We cannot use configureFlags or configureFlagsArray directly, since we + # don't have structuredAttrs yet and using placeholder causes permissions + # denied errors. Using $dev / $man in configureFlags causes bash evaluation + # errors + '' + configureFlagsArray+=( + "--includedir=$dev/include" + "--mandir=$man/share/man" + ) ''; - # Copy the examples into $out. - postInstall = '' - mkdir -p $out/bin - cp ./examples/io_uring-cp examples/io_uring-test $out/bin - cp ./examples/link-cp $out/bin/io_uring-link-cp - cp ./examples/ucontext-cp $out/bin/io_uring-ucontext-cp - ''; + outputs = [ "out" "bin" "dev" "man" ]; + + postInstall = + # Copy the examples into $bin. Most reverse dependency of this package should + # reference only the $out output + '' + mkdir -p $bin/bin + cp ./examples/io_uring-cp examples/io_uring-test $bin/bin + cp ./examples/link-cp $bin/bin/io_uring-link-cp + cp ./examples/ucontext-cp $bin/bin/io_uring-ucontext-cp + '' + ; meta = with stdenv.lib; { description = "Userspace library for the Linux io_uring API"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwps/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwps/default.nix index 5d9b10b096..3d40d204bd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwps/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwps/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libwps"; - version = "0.4.11"; + version = "0.4.12"; src = fetchurl { url = "mirror://sourceforge/libwps/${pname}-${version}.tar.bz2"; - sha256 = "11dg7q6mhvppfzsbzdlxldnsgapvgw17jlj1mca5jy4afn0zvqj8"; + sha256 = "16c6vq6hhi5lcvgyb9dwarr3kz69l1g5fs39b2hwqhkwzx5igpcl"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix index d555ecea06..192e732b5c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libxls"; - version = "1.5.3"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/libxls/libxls/releases/download/v${version}/libxls-${version}.tar.gz"; - sha256 = "0rl513wpq5qh7wkmdk4g9c68rzffv3mcbz48p4xyg4969zrx8lnm"; + sha256 = "1m3acryv0l4zkj0w3h8vf23rfklschqcbaf484qms2lrx8gakvws"; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix index 5b54e0894e..1f2915c507 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchFromGitHub, makeWrapper -, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate -, libvorbis, libxml2, movit, pkgconfig, sox -, gtk2 +, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate, libexif +, libvorbis, libxml2, movit, pkgconfig, sox, fftw, opencv4, SDL2 +, gtk2, genericUpdater, common-updater-scripts, libebur128 }: stdenv.mkDerivation rec { pname = "mlt"; - version = "6.20.0"; + version = "6.22.1"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "14kayzas2wisyw0z27qkcm4qnxbdb7bqa0hg7gaj5kbm3nvsnafk"; + sha256 = "0jxv848ykw0csbnayrd710ylw46m0picfv7rpzsxz1vh4jzs395k"; }; buildInputs = [ SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 - makeWrapper movit pkgconfig sox - gtk2 + makeWrapper movit pkgconfig sox libexif gtk2 fftw libebur128 + opencv4 SDL2 ]; # Mostly taken from: @@ -38,6 +38,12 @@ stdenv.mkDerivation rec { sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g" ''; + passthru.updateScript = genericUpdater { + inherit pname version; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; + rev-prefix = "v"; + }; + meta = with stdenv.lib; { description = "Open source multimedia framework, designed for television broadcasting"; homepage = "https://www.mltframework.org"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix b/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix index 6b41affb12..3dcbda6813 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate , libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg -, fftw, vid-stab, opencv3, ladspa-sdk +, fftw, vid-stab, opencv3, ladspa-sdk, genericUpdater, common-updater-scripts }: let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { pname = "mlt"; - version = "6.20.0"; + version = "6.22.1"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "14kayzas2wisyw0z27qkcm4qnxbdb7bqa0hg7gaj5kbm3nvsnafk"; + sha256 = "0jxv848ykw0csbnayrd710ylw46m0picfv7rpzsxz1vh4jzs395k"; }; buildInputs = [ @@ -57,6 +57,12 @@ stdenv.mkDerivation rec { inherit ffmpeg; }; + passthru.updateScript = genericUpdater { + inherit pname version; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; + rev-prefix = "v"; + }; + meta = with stdenv.lib; { description = "Open source multimedia framework, designed for television broadcasting"; homepage = "https://www.mltframework.org/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix index 11fc8b0db7..0d98142a07 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }: stdenv.mkDerivation rec { - version = "4.9.3"; + version = "4.9.5"; pname = "nco"; nativeBuildInputs = [ flex which ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/nco/nco/archive/${version}.tar.gz"; - sha256 = "0jpv2hw2as5wh06ac4hkhy7964w81pm7kp6nbwhmiyfzjzhwqhjy"; + sha256 = "0xp377rsamn2hwhzaf0ih70wd5274flpz74grys1b7rpbvbyf1bw"; }; prePatch = '' @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { substituteInPlace src/nco/nco_fl_utl.c \ --replace "/bin/mv" "${coreutils}/bin/mv" ''; - + meta = { description = "NetCDF Operator toolkit"; longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix index 2eba3ca8bc..627f003a75 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix @@ -4,20 +4,15 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "0zx9f9h1hqcyh3sf6k0scny2039p1lwdqbwqi8ppwwhjl2fzniv8"; + sha256 = "1h9yc3krhjlyapsjaf6y76546rkqk7ygcjfgm0a9bc0cfvmlb5az"; }; - postPatch = '' - substituteInPlace meson.build --replace \ - "version: '0.2.0'" "version: '${version}'" - ''; - nativeBuildInputs = [ meson pkg-config ninja ]; buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ois/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ois/default.nix index f750e4a685..ee85e64966 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ois/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ois/default.nix @@ -1,41 +1,24 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, libX11, xorgproto -, libXi, libXaw, libXmu, libXt }: - -let - majorVersion = "1"; - minorVersion = "3"; -in +{ stdenv, lib, fetchFromGitHub, cmake, libX11, Cocoa, IOKit, Kernel }: stdenv.mkDerivation rec { pname = "ois"; - version = "${majorVersion}.${minorVersion}"; + version = "1.5"; - src = fetchurl { - url = "mirror://sourceforge/project/wgois/Source%20Release/${version}/ois_v${majorVersion}-${minorVersion}.tar.gz"; - sha256 = "18gs6xxhbqb91x2gm95hh1pmakimqim1k9c65h7ah6g14zc7dyjh"; + src = fetchFromGitHub { + owner = "wgois"; + repo = "OIS"; + rev = "v${version}"; + sha256 = "0g8krgq5bdx2rw7ig0xva4kqv4x815672i7z6lljp3n8847wmypa"; }; - patches = [ - (fetchurl { - url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-games/ois/files/ois-1.3-gcc47.patch"; - sha256 = "026jw06n42bcrmg0sbdhzc4cqxsnf7fw30a2z9cigd9x282zhii8"; - name = "gcc47.patch"; - }) - ]; + nativeBuildInputs = [ cmake ]; - patchFlags = [ "-p0" ]; - - buildInputs = [ - autoconf automake libtool libX11 xorgproto libXi libXaw - libXmu libXt - ]; - - preConfigure = "sh bootstrap"; + buildInputs = [ libX11 ] ++ lib.optionals stdenv.isDarwin [ Cocoa IOKit Kernel ]; meta = with stdenv.lib; { description = "Object-oriented C++ input system"; maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.zlib; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix b/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix index 1fb0f03d30..ad311daf1d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "1.6.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "1rdq2rb4f9xbk2a07fpqgvd9mx1r5gwpm0jr8rra815bzddam8zh"; + sha256 = "1cskqpa14jjgw409wbxw03kpm9a1g6lmmc2fs2916if6xd70xdj3"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/7.3.nix b/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/7.3.nix new file mode 100644 index 0000000000..5f8302aff3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/7.3.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, fetchpatch, cmake, ninja, tcl, tk, + libGL, libGLU, libXext, libXmu, libXi, darwin }: + +stdenv.mkDerivation rec { + pname = "opencascade-occt"; + version = "7.3.0p3"; + commit = "V${builtins.replaceStrings ["."] ["_"] version}"; + + src = fetchurl { + name = "occt-${commit}.tar.gz"; + url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz"; + sha256 = "0k9c3ypcnjcilq1dhsf6xxbd52gyq4h5rchvp30k3c8ph4ris5pz"; + }; + + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ tcl tk libGL libGLU libXext libXmu libXi ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; + + meta = with stdenv.lib; { + description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; + homepage = "https://www.opencascade.org/"; + license = licenses.lgpl21; # essentially... + # The special exception defined in the file OCCT_LGPL_EXCEPTION.txt + # are basically about making the license a little less share-alike. + maintainers = with maintainers; [ amiloradovsky ]; + platforms = platforms.all; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix index 83b1cfc2ad..42ca50ae8f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix @@ -1,19 +1,20 @@ { stdenv, fetchurl, fetchpatch, cmake, ninja, tcl, tk, - libGL, libGLU, libXext, libXmu, libXi }: + libGL, libGLU, libXext, libXmu, libXi, darwin }: stdenv.mkDerivation rec { pname = "opencascade-occt"; - version = "7.3.0p3"; + version = "7.4.0p1"; commit = "V${builtins.replaceStrings ["."] ["_"] version}"; src = fetchurl { name = "occt-${commit}.tar.gz"; url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz"; - sha256 = "0k9c3ypcnjcilq1dhsf6xxbd52gyq4h5rchvp30k3c8ph4ris5pz"; + sha256 = "0b9hs3akx1f3hhg4zdip6qdv04ssqqcf9kk12amkidgvsl73z2hs"; }; nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ tcl tk libGL libGLU libXext libXmu libXi ]; + buildInputs = [ tcl tk libGL libGLU libXext libXmu libXi ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; meta = with stdenv.lib; { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; # essentially... # The special exception defined in the file OCCT_LGPL_EXCEPTION.txt # are basically about making the license a little less share-alike. - maintainers = with maintainers; [ amiloradovsky ]; + maintainers = with maintainers; [ amiloradovsky gebner ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix index cb1bcdd1bf..753f5ae391 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = "http://pointclouds.org/"; + homepage = "https://pointclouds.org/"; broken = stdenv.lib.versionAtLeast qtbase.version "5.15"; description = "Open project for 2D/3D image and point cloud processing"; license = stdenv.lib.licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix b/third_party/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix index d152afd453..d54ee6e563 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, phonon, pkgconfig, vlc +{ stdenv, lib, fetchurl, cmake, phonon, pkgconfig, libvlc , extra-cmake-modules, qttools, qtbase, qtx11extras , debug ? false }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ phonon - vlc + libvlc qtbase qtx11extras ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pkger/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pkger/default.nix index 564efa31b6..8c8fd4f8fd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pkger/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pkger/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "pkger"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "markbates"; repo = "pkger"; rev = "v${version}"; - sha256 = "195ba1avkpm9ssgakngv8j72k7yq2xna3xmm5m8l6c5g7lf91kkp"; + sha256 = "12zcvsd6bv581wwhahp1wy903495s51lw86b99cfihwmxc5qw6ww"; }; vendorSha256 = "1b9gpym6kb4hpdbrixphfh1qylmqr265jrmcd4vxb87ahvrsrvgp"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/precice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/precice/default.nix index 22726858a2..d850142807 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/precice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/precice/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, openmpi, python3, python3Packages, petsc }: +{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, openmpi, python3, petsc }: stdenv.mkDerivation rec { pname = "precice"; - version = "2.0.2"; - # Todo next release switch back to versioning but for python3 support master is needed + version = "2.1.0"; src = fetchFromGitHub { owner = "precice"; repo = pname; rev = "v${version}"; - sha256 = "1s41wv2077d2gqj0wsxls6wkgdk9cgzcbmk2q43ha08ccq5i3dav"; + sha256 = "1268dz39sx3gygnm7vpg59k1wdhy6rhf72i8i0kz4jckll0s9102"; }; cmakeFlags = [ @@ -19,15 +18,17 @@ stdenv.mkDerivation rec { "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}m" ]; + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ "-D_GNU_SOURCE" ]; + nativeBuildInputs = [ cmake gcc ]; - buildInputs = [ boost eigen libxml2 openmpi python3 python3Packages.numpy ]; + buildInputs = [ boost eigen libxml2 openmpi python3 python3.pkgs.numpy ]; enableParallelBuilding = true; meta = { description = "preCICE stands for Precise Code Interaction Coupling Environment"; license = with lib.licenses; [ gpl3 ]; homepage = "https://www.precice.org/"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ Scriptkiddi ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix index ef13111852..192ed56d45 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libupnp"; - version = "1.12.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "mrjimenez"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "17jhbzx8khz5vbl0lhcipjzgg897p1k2lp5wcc3hiddcfyh05pdj"; + sha256 = "1wp9sz2ld4g6ak9v59i3s5mbsraxsphi9k91vw9xgrbzfmg8w0a6"; }; outputs = [ "dev" "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/EBTKS/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/EBTKS/default.nix index f4353f51d6..c60fe31aaa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/EBTKS/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/EBTKS/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libminc ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ]; + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ]; meta = with stdenv.lib; { homepage = "https://github.com/BIC-MNI/${pname}"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bicgl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bicgl/default.nix index 3c9b8f8257..4cc7dcada5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bicgl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bicgl/default.nix @@ -2,21 +2,24 @@ stdenv.mkDerivation rec { pname = "bicgl"; - name = "${pname}-2017-09-10"; + version = "unstable-2018-04-06"; owner = "BIC-MNI"; src = fetchFromGitHub { inherit owner; repo = pname; - rev = "b7f7e52d1039d6202a93d9055f516186033656cc"; + rev = "61a035751c9244fcca1edf94d6566fa2a709ce90"; sha256 = "0lzirdi1mf4yl8srq7vjn746sbydz7h0wjh7wy8gycy6hq04qrg4"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ libminc bicpl freeglut mesa_glu ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBICPL_DIR=${bicpl}/lib" ]; + cmakeFlags = [ + "-DLIBMINC_DIR=${libminc}/lib/cmake" + "-DBICPL_DIR=${bicpl}/lib" + ]; meta = with stdenv.lib; { homepage = "https://github.com/${owner}/${pname}"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix index 0c634c0f26..96199f0478 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "bicpl"; - name = "${pname}-2017-09-10"; + version = "unstable-2017-09-10"; owner = "BIC-MNI"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libminc netpbm ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" ]; + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ]; doCheck = false; # internal_volume_io.h: No such file or directory diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/oobicpl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/oobicpl/default.nix index 8755b7fd2e..e5ecda0390 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/oobicpl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/oobicpl/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "oobicpl"; - name = "${pname}-2016-03-02"; + version = "unstable-2016-03-02"; owner = "BIC-MNI"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libminc bicpl arguments pcre-cpp ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" "-DBICPL_DIR=${bicpl}/lib" "-DARGUMENTS_DIR=${arguments}/lib" "-DOOBICPL_BUILD_SHARED_LIBS=TRUE" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix index 02d51f0c41..0b927bb3ea 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,14 +1,9 @@ { stdenv, fetchFromGitHub, cmake , gfortran, blas, lapack, eigen }: -with stdenv.lib; - -let - version = "3.7.0"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "arpack"; - inherit version; + version = "3.7.0"; src = fetchFromGitHub { owner = "opencollab"; @@ -18,16 +13,18 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ gfortran blas lapack eigen ]; + buildInputs = assert (blas.isILP64 == lapack.isILP64); [ + gfortran + blas + lapack + eigen + ]; doCheck = true; - BLAS_LIBS = "-L${blas}/lib -lblas"; - LAPACK_LIBS = "-L${lapack}/lib -llapack"; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DINTERFACE64=${optionalString blas.isILP64 "1"}" + "-DINTERFACE64=${stdenv.lib.optionalString blas.isILP64 "1"}" ]; preCheck = if stdenv.isDarwin then '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix index c473fcedde..e56952abcb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - version = "1.21"; + version = "1.22"; pname = "cliquer"; # autotoolized version of the original cliquer @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "dimpase"; repo = "autocliquer"; rev = "v${version}"; - sha256 = "180i4qj1a25qfp75ig2d3144xfpb1dgcgpha0iqqghd7di4awg7z"; + sha256 = "00gcmrhi2fjn8b246w5a3b0pl7p6haxy5wjvd9kcqib1xanz59z4"; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix index aac66e4fe0..2c6bc4c871 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.0"; + version = "1.1"; pname = "libbraiding"; src = fetchFromGitHub { owner = "miguelmarco"; repo = "libbraiding"; rev = version; - sha256 = "0l68rikfr7k2l547gb3pp3g8cj5zzxwipm79xrb5r8ffj466ydxg"; + sha256 = "1n1j58y9jaiv0ya0y4fpfb3b05wv0h6k2babpnk2zifjw26xr366"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix index 89d88bdf56..37f875f1bf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix @@ -71,6 +71,13 @@ let NO_AVX512 = true; USE_OPENMP = !stdenv.hostPlatform.isMusl; }; + + powerpc64le-linux = { + BINARY = 64; + TARGET = setTarget "POWER5"; + DYNAMIC_ARCH = true; + USE_OPENMP = !stdenv.hostPlatform.isMusl; + }; }; in diff --git a/third_party/nixpkgs/pkgs/development/libraries/soqt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/soqt/default.nix index 7a4e6c45cf..de11407e12 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/soqt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/soqt/default.nix @@ -1,26 +1,23 @@ -{ fetchhg, stdenv, coin3d, qtbase, cmake, pkgconfig }: +{ fetchurl, stdenv, coin3d, qtbase, cmake, pkgconfig }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "soqt"; - version = "1.6.0a"; + version = "1.6.0"; - src = fetchhg { - url = "https://bitbucket.org/Coin3D/soqt"; - rev = "5f2afb4890e0059eb27e1671f980d10ebfb9e762"; - sha256 = "0j9lsci4cx95v16l0jaky0vzh4lbdliwz7wc17442ihjaqiqmv8m"; - fetchSubrepos = true; + src = fetchurl { + url = "https://github.com/coin3d/soqt/releases/download/SoQt-${version}/soqt-${version}-src.tar.gz"; + sha256 = "07qfljy286vb7y1p93205zn9sp1lpn0rcrqm5010gj87kzsmllwz"; }; buildInputs = [ coin3d qtbase ]; nativeBuildInputs = [ cmake pkgconfig ]; - meta = { - homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home"; - license = stdenv.lib.licenses.gpl2Plus; + meta = with stdenv.lib; { + homepage = "https://github.com/coin3d/soqt"; + license = licenses.bsd3; description = "Glue between Coin high-level 3D visualization library and Qt"; - - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ gebner viric ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/tecla/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tecla/default.nix index 93cf0670dc..a47f39be10 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tecla/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tecla/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "tecla-1.6.3"; src = fetchurl { - url = "http://www.astro.caltech.edu/~mcs/tecla/lib${name}.tar.gz"; + url = "https://www.astro.caltech.edu/~mcs/tecla/lib${name}.tar.gz"; sha256 = "06pfq5wa8d25i9bdjkp4xhms5101dsrbg82riz7rz1a0a32pqxgj"; }; meta = { - homepage = "http://www.astro.caltech.edu/~mcs/tecla/"; + homepage = "https://www.astro.caltech.edu/~mcs/tecla/"; description = "Command-line editing library"; license = "as-is"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/twolame/default.nix b/third_party/nixpkgs/pkgs/development/libraries/twolame/default.nix index 7c44731ef1..cb8ee14535 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/twolame/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/twolame/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { tooLAME by Mike Cheng, which in turn is based upon the ISO dist10 code and portions of LAME. ''; - homepage = "http://www.twolame.org/"; + homepage = "https://www.twolame.org/"; license = with licenses; [ lgpl2Plus ]; platforms = with platforms; unix; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix b/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix index 48ed6cf468..34f5d15859 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix @@ -21,6 +21,8 @@ let (mkFlag custatsSupport "DETAILED_CU_STATS") (mkFlag unittestsSupport "ENABLE_TESTS") (mkFlag werrorSupport "WARNINGS_AS_ERRORS") + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isPower [ + "-DENABLE_ALTIVEC=OFF" ]; version = "3.2"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix index b06edc6327..83b4dda0c6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.7.2"; + version = "1.8.0"; outputs = [ "out" "installedTests" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "0rkwpsmbn3d3spkzc2zsd50l2r8pp4la390zcpsawaav8w7ql7xm"; + sha256 = "1f1f79hy259lm017zaq4rpvys8zkmjspqily4a3lbnm77zk3y079"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix index a1e6afd48b..0d6fd9611c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix @@ -3,7 +3,7 @@ lib.fix (self: let - version = "1.2.28"; + version = "1.2.30"; in stdenv.mkDerivation { pname = "xmlsec"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "1m12caglhyx08g8lh2sl3nkldlpryzdx2d572q73y3m33s0w9vhk"; + sha256 = "1j5bf7ni45jghyrbf7a14wx2pvfara557zyry7g7h8840c5kd11d"; }; patches = [ @@ -29,6 +29,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; doCheck = true; + checkInputs = [ nss.tools ]; # enable deprecated soap headers required by lasso # https://dev.entrouvert.org/issues/18771 diff --git a/third_party/nixpkgs/pkgs/development/libraries/xylib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xylib/default.nix index 70fee9b9ef..2b4cb1d56d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xylib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xylib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "xylib"; - version = "1.5"; + version = "1.6"; src = fetchurl { url = "https://github.com/wojdyr/xylib/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "1r2kx80zhdvz39k6h2fsncm2742xxvxl3z8a3fnr13jl9sl7mnnd"; + sha256 = "1iqfrfrk78mki5csxysw86zm35ag71w0jvim0f12nwq1z8rwnhdn"; }; buildInputs = [ boost zlib bzip2 wxGTK30 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix index 9c9c5a6b00..2fb36c0aea 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, mcpp, bzip2, expat, openssl, lmdb +{ stdenv, lib, fetchFromGitHub, bzip2, expat, openssl, lmdb , darwin, libiconv, Security , cpp11 ? false }: let - zeroc_mcpp = mcpp.overrideAttrs (self: rec { + zeroc_mcpp = stdenv.mkDerivation rec { pname = "zeroc-mcpp"; version = "2.7.2.14"; @@ -15,8 +15,9 @@ let sha256 = "1psryc2ql1cp91xd3f8jz84mdaqvwzkdq2pr96nwn03ds4cd88wh"; }; + configureFlags = [ "--enable-mcpplib" ]; installFlags = [ "PREFIX=$(out)" ]; - }); + }; in stdenv.mkDerivation rec { pname = "zeroc-ice"; @@ -63,7 +64,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://www.zeroc.com/ice.html"; + homepage = "https://www.zeroc.com/ice.html"; description = "The internet communications engine"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix index f9c91c3a8a..5007665856 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix @@ -173,7 +173,7 @@ cjson = buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = with stdenv.lib; { - homepage = "http://www.kyne.com.au/~mark/software/lua-cjson.php"; + homepage = "https://www.kyne.com.au/~mark/software/lua-cjson.php"; description = "A fast JSON encoding/parsing module"; license.fullName = "MIT"; }; @@ -268,7 +268,7 @@ cyrussasl = buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = with stdenv.lib; { - homepage = "http://github.com/JorjBauer/lua-cyrussasl"; + homepage = "https://github.com/JorjBauer/lua-cyrussasl"; description = "Cyrus SASL library for Lua 5.1+"; maintainers = with maintainers; [ vcunat ]; license.fullName = "BSD"; @@ -420,7 +420,7 @@ lgi = buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = with stdenv.lib; { - homepage = "http://github.com/pavouk/lgi"; + homepage = "https://github.com/pavouk/lgi"; description = "Lua bindings to GObject libraries"; license.fullName = "MIT/X11"; }; @@ -546,7 +546,7 @@ lrexlib-gnu = buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = with stdenv.lib; { - homepage = "http://github.com/rrthomas/lrexlib"; + homepage = "https://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (GNU flavour)."; license.fullName = "MIT/X11"; }; @@ -563,7 +563,7 @@ lrexlib-pcre = buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = with stdenv.lib; { - homepage = "http://github.com/rrthomas/lrexlib"; + homepage = "https://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (PCRE flavour)."; maintainers = with maintainers; [ vyp ]; license.fullName = "MIT/X11"; @@ -581,7 +581,7 @@ lrexlib-posix = buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = with stdenv.lib; { - homepage = "http://github.com/rrthomas/lrexlib"; + homepage = "https://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (POSIX flavour)."; license.fullName = "MIT/X11"; }; @@ -625,7 +625,7 @@ lua-cmsgpack = buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = with stdenv.lib; { - homepage = "http://github.com/antirez/lua-cmsgpack"; + homepage = "https://github.com/antirez/lua-cmsgpack"; description = "MessagePack C implementation and bindings for Lua 5.1/5.2/5.3"; license.fullName = "Two-clause BSD"; }; @@ -1109,7 +1109,7 @@ luaposix = buildLuarocksPackage { propagatedBuildInputs = [ bit32 lua ]; meta = with stdenv.lib; { - homepage = "http://github.com/luaposix/luaposix/"; + homepage = "https://github.com/luaposix/luaposix/"; description = "Lua bindings for POSIX"; maintainers = with maintainers; [ vyp lblasc ]; license.fullName = "MIT/X11"; @@ -1253,7 +1253,7 @@ luautf8 = buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = with stdenv.lib; { - homepage = "http://github.com/starwing/luautf8"; + homepage = "https://github.com/starwing/luautf8"; description = "A UTF-8 support module for Lua"; maintainers = with maintainers; [ pstn ]; license.fullName = "MIT"; @@ -1288,7 +1288,7 @@ lua-yajl = buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = with stdenv.lib; { - homepage = "http://github.com/brimworks/lua-yajl"; + homepage = "https://github.com/brimworks/lua-yajl"; description = "Integrate the yajl JSON library with Lua."; maintainers = with maintainers; [ pstn ]; license.fullName = "MIT/X11"; @@ -1340,7 +1340,7 @@ lyaml = buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = with stdenv.lib; { - homepage = "http://github.com/gvvaughan/lyaml"; + homepage = "https://github.com/gvvaughan/lyaml"; description = "libYAML binding for Lua"; maintainers = with maintainers; [ lblasc ]; license.fullName = "MIT/X11"; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/default.nix b/third_party/nixpkgs/pkgs/development/node-packages/default.nix index be1b58acd7..8c44e1001c 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/default.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/default.nix @@ -114,6 +114,20 @@ let buildInputs = [ self.node-pre-gyp ]; }; + mermaid-cli = super."@mermaid-js/mermaid-cli".override ( + if stdenv.isDarwin + then {} + else { + nativeBuildInputs = [ pkgs.makeWrapper ]; + prePatch = '' + export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 + ''; + postInstall = '' + wrapProgram $out/bin/mmdc \ + --set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium.outPath}/bin/chromium + ''; + }); + pnpm = super.pnpm.override { nativeBuildInputs = [ pkgs.makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index ba8488bda2..fb07c50c0c 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -120,6 +120,7 @@ , "mastodon-bot" , "mathjax" , "meat" +, "@mermaid-js/mermaid-cli" , "mirakurun" , "mocha" , "multi-file-swagger" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index 8d56372af2..db8baa5321 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -22,40 +22,13 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@analytics/cookie-utils-0.2.3" = { - name = "_at_analytics_slash_cookie-utils"; - packageName = "@analytics/cookie-utils"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@analytics/cookie-utils/-/cookie-utils-0.2.3.tgz"; - sha512 = "RiMAVpSluRbWb2hlT9wMJ0r2l+MUZzScYjY+w2iWRzjOr9Zzzs4tYzJT6Sd94PDz3LzCuf4aGOwS6pkKXTEBLw=="; - }; - }; - "@analytics/core-0.6.2" = { - name = "_at_analytics_slash_core"; - packageName = "@analytics/core"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@analytics/core/-/core-0.6.2.tgz"; - sha512 = "qXBfef5/HK5RZkGlkVqRKnjFQuPZejU6NLqnzx/DH3EU28w7a7IgUN+qZ2VSWFr3aMtNJ0qVybfHDxcJBtrLtQ=="; - }; - }; - "@analytics/storage-utils-0.2.4" = { - name = "_at_analytics_slash_storage-utils"; - packageName = "@analytics/storage-utils"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@analytics/storage-utils/-/storage-utils-0.2.4.tgz"; - sha512 = "VHRggJbRY8vHIADWVwbq9cZux0L9LdmlN31XA3daVAI4gMkKdQEocxB7KqGDt6SfIJ3NYi/qh1nRJGooYmTBiA=="; - }; - }; - "@angular-devkit/architect-0.1001.2" = { + "@angular-devkit/architect-0.1001.3" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1001.2"; + version = "0.1001.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1001.2.tgz"; - sha512 = "05o12amjZ8NNIFehKm/lFYf12xvCclC7V5tGl/9+V7g/3pQqakwAjCysgb9T+ETffhmKhMnE8XdAJZqF7YrDcw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1001.3.tgz"; + sha512 = "WS5IAN6I73jKapiHKYz3U05Kka4eVRmwCk++GWM2uGChluiZsI87eK8vxMS3KWDIqTnAOuMpDt3XWxlASv1nlQ=="; }; }; "@angular-devkit/core-10.0.7" = { @@ -67,13 +40,13 @@ let sha512 = "pXaZgsQ8LHpRx4QGAUYDE8GwBQLAtoqPh6oUCwRJwBExm5rl13OGPTBWewHiq0ysV/SnFXvOjxwAaHQvC1AgZw=="; }; }; - "@angular-devkit/core-10.1.2" = { + "@angular-devkit/core-10.1.3" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "10.1.2"; + version = "10.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.1.2.tgz"; - sha512 = "LMxesiCuXRe3UzPdRouXsC1W73/q6rVtACVoD5GdzmmnZ7cRh7oiwonqT0lEXIKQikMsZUasUOXHD2HoKV6BoA=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.1.3.tgz"; + sha512 = "Ub31/eqFtSuQy3V+B74Jt0jAUw8fs8sbd0ZL2UHYUJyrwm20iIRam+mOD3Sj8HFrDGLR8m56KsxJ12KvC1oxtQ=="; }; }; "@angular-devkit/core-9.1.12" = { @@ -94,13 +67,13 @@ let sha512 = "eyyYPgpjtr3h7WbnNbkDubJ/p+8TgKU6abWd+NmBfTvyeHrpVFUYZabNRcdXwUDSVzfTQKdmLynIkESj/KROrg=="; }; }; - "@angular-devkit/schematics-10.1.2" = { + "@angular-devkit/schematics-10.1.3" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "10.1.2"; + version = "10.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.1.2.tgz"; - sha512 = "gS5yP8ntw3/v9zBK9kBsp5r4gYlp8cLvJ3oWLZmSvdzzbm/QznPnRKqNm72AptKrlxRFX0xyrJ7vjtLWcssqxA=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.1.3.tgz"; + sha512 = "5+E2bBBsphuz1KfloC5yA+hXSEbxMokkp5UEp+X9VC7zUGTXV8sxuvcbBo+JVutaoNHezJGu2JUx/LqNrKd58w=="; }; }; "@angular-devkit/schematics-9.1.12" = { @@ -229,13 +202,13 @@ let sha512 = "eorTmZW7zc6ZHgGLt3Vrq7mzPuobPeJnyfli50/m/DIQ91slkqjPKUYGcq4paPEz6IWoa7LT2ZwtwA5KzMyTPg=="; }; }; - "@apollo/federation-0.20.0" = { + "@apollo/federation-0.20.2" = { name = "_at_apollo_slash_federation"; packageName = "@apollo/federation"; - version = "0.20.0"; + version = "0.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.20.0.tgz"; - sha512 = "Q2eGSjrArtY04FSVIxUK3/JaVDDw4aJZBRl0+UZ1dwrpk6YtBpydW2u4X6dPTnBqRDpKVGVmc9gkQr8d3LpcKA=="; + url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.20.2.tgz"; + sha512 = "SrwUK0dZdlHLDkv/8K/Q5OK1AE/RypNkLmxhBndlOKAb2e5li6dZy6FJGNbErgHBAJQSx2Xp1gCF5CZONbFxpw=="; }; }; "@apollo/protobufjs-1.0.5" = { @@ -355,15 +328,6 @@ let sha512 = "Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg=="; }; }; - "@babel/generator-7.11.4" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.11.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.4.tgz"; - sha512 = "Rn26vueFx0eOoz7iifCN2UHT6rGtnkSGWSoDRIy8jZN3B91PzeSULbswfLoOWuTuAcNwpG/mxy+uCTDnZ9Mp1g=="; - }; - }; "@babel/generator-7.11.6" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; @@ -1624,13 +1588,13 @@ let sha512 = "W98NvvOe/Med3o66xTO03pd7a2omZebH79PV64gSE+ceDdU8uxQhFTa7ISiD1kseyqyOrMyW5/MNdsGEU02i3Q=="; }; }; - "@fluentui/date-time-utilities-7.8.1" = { + "@fluentui/date-time-utilities-7.9.0" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; - version = "7.8.1"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.8.1.tgz"; - sha512 = "2FsR7scZ6yS9h7MEUAunpLLYpHp4z7+DVgGlIBlNeL7YD5Vl0msj4pn7zRd1pcGfvoQfkWz3+ju3rBBl4LV4wQ=="; + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.9.0.tgz"; + sha512 = "D8p5WWeonqRO1EgIvo7WSlX1rcm87r2VQd62zTJPQImx8rpwc77CRI+iAvfxyVHRZMdt4Qk6Jq99dUaudPWaZw=="; }; }; "@fluentui/dom-utilities-1.1.1" = { @@ -1651,31 +1615,22 @@ let sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ=="; }; }; - "@fluentui/react-7.139.0" = { + "@fluentui/react-7.143.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.139.0"; + version = "7.143.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.139.0.tgz"; - sha512 = "Y3u80PnrK/ZnTlezo+Syfvy8UXkHEpwCHNW8hjezfOkhPVVI8fpmrPeHy2dDnqah5HDbuC6KUU9owWg/UojSCw=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.143.0.tgz"; + sha512 = "5HMFiQ+VszMPlu8zn6hT0pQSqsaPa0Q2T7uQQ0/cXakEMac4Y2iHngspzFIyn1OWS7yT2RU2Y5gSdzJFxobOXA=="; }; }; - "@fluentui/react-focus-7.16.5" = { + "@fluentui/react-focus-7.16.9" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.16.5"; + version = "7.16.9"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.5.tgz"; - sha512 = "FlRqYSzkptXuKvsIiI9m1tf7g5pRcbu9S9rK6c8pHax/kDRsBuDRW2OajxjVYR36B6IyAgYjylWdk6zBJI5oSQ=="; - }; - }; - "@fluentui/react-icons-0.3.4" = { - name = "_at_fluentui_slash_react-icons"; - packageName = "@fluentui/react-icons"; - version = "0.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-icons/-/react-icons-0.3.4.tgz"; - sha512 = "/6xyGL7EQVCn9TP1eV+VjKS0HuC7WGZHs0t604E40LEE1HCIbXx7Jm1KDlMqP36n1W8XVDgyEZlffTmEOVGRkg=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.9.tgz"; + sha512 = "XT+W3+hSQi2PzEi3biNqAcUvBj4sZqLp/ERXD+jIF1Ux+CxdlLtf8WvS36u7/0B6jjvoMaIcpdsqGjqgU+8NGA=="; }; }; "@fluentui/react-window-provider-0.3.3" = { @@ -1687,13 +1642,13 @@ let sha512 = "MVPf2hqOQ17LAZsuvGcr3oOHksAskUm+fCYdXFhbVoAgsCDVTIuH6i8XgHFd6YjBtzjZmI4+k/3NTQfDqBX8EQ=="; }; }; - "@fluentui/theme-0.3.2" = { + "@fluentui/theme-1.2.1" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "0.3.2"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-0.3.2.tgz"; - sha512 = "Yt4VK2NKTc+Sao0+ZguXiQ0ZpN74h+7c+7YAyxaao2R/nwSHSnmH42VVlzBN+aL5kYDrbQ4P9Z8zPIwKEZ1u3A=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.2.1.tgz"; + sha512 = "18biLzW/E48HKgN1e5APP0znhMgUVpXq7h4B0LJjI7TTQZPuPTR96FA/LcHDwcTL3YR1rEMmnGgCFitWtsbA2A=="; }; }; "@graphql-cli/common-4.0.0" = { @@ -1714,94 +1669,94 @@ let sha512 = "oJZb4PScX25ZGObpw9n7/bJBE7R0oF6hJ4ABe+WvMqSCI3kxaReMTgJJNIrxpmbXscxWM8U1ndLefP5IjPcU7Q=="; }; }; - "@graphql-tools/delegate-6.2.3" = { + "@graphql-tools/delegate-6.2.4" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "6.2.3"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.2.3.tgz"; - sha512 = "j4P7RaI5J9AvGcfBDITO6bZDeSvjMgDby2smn3L2dmXpPfMYh00KRRSZjzdMwSkLxi+0octh9buUAeCdvVMkKQ=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.2.4.tgz"; + sha512 = "mXe6DfoWmq49kPcDrpKHgC2DSWcD5q0YCaHHoXYPAOlnLH8VMTY8BxcE8y/Do2eyg+GLcwAcrpffVszWMwqw0w=="; }; }; - "@graphql-tools/graphql-file-loader-6.2.3" = { + "@graphql-tools/graphql-file-loader-6.2.4" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "6.2.3"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.3.tgz"; - sha512 = "9K+foDqfcJXf2jNNOWWZnV+PdxJkKmzAY58qlbFEFfUeRC6ZmOA9B3vTkcFadVdSwIsaWHhaxqHrNAD+OfkAyQ=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.4.tgz"; + sha512 = "IcdUZoOlkCGr0KO8QCO8G031CDDv5dzHBZeN5H1gzE2AVFFwn2AexysrUXBxftm2DQIOuV+Knap7dC4Ol54kNA=="; }; }; - "@graphql-tools/import-6.2.3" = { + "@graphql-tools/import-6.2.4" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.2.3"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.3.tgz"; - sha512 = "2ftXR84aPy2ueAEEGw/yFvYGPbvJYs2m18FEODhAq5z4P285ZlCMluxTUR9yNjumzgQP5Eer4fl64ztsdJvCyg=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.4.tgz"; + sha512 = "Q6fk6hbtDevoEVcgwb3WRn7XOqGY4MnX3Mvc+x8/b8k4RZ4wT+0WSLRDXGAKiVKRxGhgouU2lZVnGE/LDrGSCg=="; }; }; - "@graphql-tools/json-file-loader-6.2.3" = { + "@graphql-tools/json-file-loader-6.2.4" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "6.2.3"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.3.tgz"; - sha512 = "7v445KZLVB3owbibu2HsFmVSsdDOn0NzYSqIXaaIZ7saqoVtG8etSt699kLw5gJM3j0Kjm7XDz9tK60Apes/xg=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.4.tgz"; + sha512 = "1iL6wwZrUt888hExlNEloSpNXuuUFYD2KV2FZ82t6yiq6bO9Iyg12SUuGd5xVXx9jUkdaHRZc0plMyuIA6gTGA=="; }; }; - "@graphql-tools/load-6.2.3" = { + "@graphql-tools/load-6.2.4" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "6.2.3"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.2.3.tgz"; - sha512 = "3wmzrwf7tVY8rDRT2jxfQKlKgSB6P8OordFoOxpk1qNP2vmkUN9tWKxaI1ANkdm+et1D3ovUHeSoW6jKscnUAA=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.2.4.tgz"; + sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/merge-6.2.3" = { + "@graphql-tools/merge-6.2.4" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.2.3"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.3.tgz"; - sha512 = "qSSxdM2AKjnAHuChcnxIfzsGej78B56EE6ZD3tXMtKJOMQMhk4T4yXnKRHEw8fw7ZtNk/KqCmb6LJHy8Ws8frg=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.4.tgz"; + sha512 = "hQbiSzCJgzUYG1Aspj5EAUY9DsbTI2OK30GLBOjUI16DWkoLVXLXy4ljQYJxq6wDc4fqixMOmvxwf8FoJ9okmw=="; }; }; - "@graphql-tools/schema-6.2.3" = { + "@graphql-tools/schema-6.2.4" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "6.2.3"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.2.3.tgz"; - sha512 = "CV5vDfQhXidssLK5hjT55FfwRAvBoGW53lVBl0rbXrbsSX7H9iVHdUf4UaDIlMc6WcnnzOrRiue/khHz3rzDEg=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.2.4.tgz"; + sha512 = "rh+14lSY1q8IPbEv2J9x8UBFJ5NrDX9W5asXEUlPp+7vraLp/Tiox4GXdgyA92JhwpYco3nTf5Bo2JDMt1KnAQ=="; }; }; - "@graphql-tools/url-loader-6.2.3" = { + "@graphql-tools/url-loader-6.2.4" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "6.2.3"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.2.3.tgz"; - sha512 = "cV/VR/lT1bHxwhrZlyG+sevl4zU0zZQHS7+TelTfAdKGrSswEozK98pPjkFP57+6ghitH6XoHUE91hFxtaODsA=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.2.4.tgz"; + sha512 = "T14Ng02H2gzK5IRVNLKHM1ncQ2d+ou6+twGRNat3ETSP6arkS3jg0LPtJfu+8r6Op/4C3EXM6QbdaSNIkvatAQ=="; }; }; - "@graphql-tools/utils-6.2.3" = { + "@graphql-tools/utils-6.2.4" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "6.2.3"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.2.3.tgz"; - sha512 = "eOhZy4y23r6AddokBqvFpQybtHvhTyZCc3VFWn8eIqF92vre90UKHbCX6Cf6VBo6i7l0ZwChPPbUzEiHOk+HJQ=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.2.4.tgz"; + sha512 = "ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg=="; }; }; - "@graphql-tools/wrap-6.2.3" = { + "@graphql-tools/wrap-6.2.4" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "6.2.3"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.2.3.tgz"; - sha512 = "bxMXobcuKy8r7jKefQx5VH3FSyXVHKfDWfJ65Kq4oAC2+d7DUlpr3HZ6BWoMhfgUf6s6PPM26Us00TGsUQlAGg=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.2.4.tgz"; + sha512 = "cyQgpybolF9DjL2QNOvTS1WDCT/epgYoiA8/8b3nwv5xmMBQ6/6nYnZwityCZ7njb7MMyk7HBEDNNlP9qNJDcA=="; }; }; "@gulp-sourcemaps/identity-map-1.0.2" = { @@ -2587,13 +2542,13 @@ let sha512 = "RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A=="; }; }; - "@microsoft/load-themed-styles-1.10.97" = { + "@microsoft/load-themed-styles-1.10.101" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.97"; + version = "1.10.101"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.97.tgz"; - sha512 = "FX8a2rXhYzXJWSoSjbxSyOvOo2SOHUjLG7JRWTf6rwiQDM/8fSTC/7TLkE2BAMg9n4vG+AxrgfN561VPnHQxrw=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.101.tgz"; + sha512 = "TERGxGXEmQ6lIQqgR/1MMMJCMXwk5sTN/Nt4PJnw28ZKa7T6mGAzxRDp6QLCxJCqST1YquTJoayv6ELhQSPFlQ=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -2632,13 +2587,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-4.0.4" = { + "@netlify/build-4.5.2" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "4.0.4"; + version = "4.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-4.0.4.tgz"; - sha512 = "TXVFLp2z96Dl5MfaB0LgTIlD+9IThnjAsYsRrMJZXugOBgsIQzJr/uJql4ISKcK3b33T46amYT6+ULB6ZVJeLw=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-4.5.2.tgz"; + sha512 = "xKhRtqsWSwIFWTZTQCrNu2PBlJ57Lp7VVVwGk6IcJbbIiv5FyfwkjzW7hBcD/b16TFfy2HozLNVJ5KbD/EQ9VA=="; }; }; "@netlify/cache-utils-1.0.3" = { @@ -2659,13 +2614,13 @@ let sha512 = "Z7yzbx5qCX2I5RLlNyo0MMQ6GKJc8o5Nej9yspCavjqgYlUS7VJfbeE67WNxC26FXwDUqq00zJ0MrCS0Un1YOw=="; }; }; - "@netlify/config-2.1.5" = { + "@netlify/config-2.2.1" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "2.1.5"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-2.1.5.tgz"; - sha512 = "bsREmA1xLdThEZZwTcDZuTgu+eUO6bQJ/xLGmrCcerUn90lY7zh/P5w+1p5Kx0ebGeRQxQAmm1L9vQs2wUPcLg=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-2.2.1.tgz"; + sha512 = "kYWXTFs05wQeVCYahPPmf8Pf6guoZJC6hEpxoL2uuA/u9xsIA6hQoO1FjBRARiiFeht1hNzpV1L7UOaC0cMF1Q=="; }; }; "@netlify/functions-utils-1.2.9" = { @@ -2686,22 +2641,22 @@ let sha512 = "rqaCUHlJFYwvcCL8l+wp/YMhGkuXo2ceEf9fpHCN8GFOlU3kSu0NLRlKFohIFk1pdrymG1D3M7Pt+s62EKLjwA=="; }; }; - "@netlify/open-api-0.16.0" = { + "@netlify/open-api-0.16.1" = { name = "_at_netlify_slash_open-api"; packageName = "@netlify/open-api"; - version = "0.16.0"; + version = "0.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-0.16.0.tgz"; - sha512 = "o3QI9hAe6lspQysWrB8CygMO4h+7B4qtPDkacitZ4VPBR26rX2TASq0/x1TNa4TnFG2lNgzkuBWhtXAmd/9tdw=="; + url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-0.16.1.tgz"; + sha512 = "lIU1on/4xF+Gz2bpnLry/3E6Ns3ICGgCP62n3LmL3eSKo94wCqiO/9nyq5NILawYVSRUZeIvEVi5DgnVyLWyww=="; }; }; - "@netlify/plugin-edge-handlers-1.1.0" = { + "@netlify/plugin-edge-handlers-1.6.0" = { name = "_at_netlify_slash_plugin-edge-handlers"; packageName = "@netlify/plugin-edge-handlers"; - version = "1.1.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.1.0.tgz"; - sha512 = "JR7d1u48ne9+Y2bRGYmYvWDaGhkZccZuw12ba63q6EJTHMC+hMp8t+Le1G6Bds+SEEox4npt0VHyHfuWmCcMaA=="; + url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.6.0.tgz"; + sha512 = "pm+XQ926g6J1Tl1dzFkxnUiQmWI/j1PIELuGGk4qPiHdM8kXWCEeRkNPRpDtwDmXJUVSVVmJQVFpX5VXJ3ijWg=="; }; }; "@netlify/run-utils-1.0.1" = { @@ -2857,13 +2812,13 @@ let sha512 = "nFtqjVETliApiRdjbYwKwhlSHx2ZMagyj5b9YbNt0BWeeOVxJd47ZVE2u16vxDHyTOZvk+YLV7INwfAE9a2uow=="; }; }; - "@npmcli/run-script-1.5.0" = { + "@npmcli/run-script-1.6.0" = { name = "_at_npmcli_slash_run-script"; packageName = "@npmcli/run-script"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.5.0.tgz"; - sha512 = "z7AzLmsMtVntMRJt35M5VAjb/jH6yH37Q8Ku011JVR7rEoy+p2a6/NkwqChCRZORlJaS9rwjXmZKM6UmwXLkqA=="; + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.6.0.tgz"; + sha512 = "2BHum2b8MBXkiWGR6c1JOQ+2eAnE8kygwtT8F5bRam7ErDJqxxcHZSksIU6/qxqnA3WuiuyvxNdnptIJr8YQ8Q=="; }; }; "@oclif/color-0.1.2" = { @@ -3136,22 +3091,22 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; - "@prettier/plugin-pug-1.6.1" = { + "@prettier/plugin-pug-1.7.0" = { name = "_at_prettier_slash_plugin-pug"; packageName = "@prettier/plugin-pug"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prettier/plugin-pug/-/plugin-pug-1.6.1.tgz"; - sha512 = "FqFByfSa72q2bxNocGlziXM/wAkhhIG5ecFU6+MddikqWTI+KIoeXRz6QHTtTWjcXqu6svlUNjNLhXMEMh25Hw=="; + url = "https://registry.npmjs.org/@prettier/plugin-pug/-/plugin-pug-1.7.0.tgz"; + sha512 = "iv1m8Qrsd1R+m1t4k2i81m2cDiuteB2z3IMyO792WgctyjSeWselFfwKdwBDO4l+4U+HU9b1MvckDL+aAaD9cg=="; }; }; - "@primer/octicons-10.1.0" = { + "@primer/octicons-11.0.0" = { name = "_at_primer_slash_octicons"; packageName = "@primer/octicons"; - version = "10.1.0"; + version = "11.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@primer/octicons/-/octicons-10.1.0.tgz"; - sha512 = "oXfV0uIe7I4cb3vUzBPlPZGL5SQ3+joyyRcmk28aJiGFySl8brzL0MJC63RahiNEnIFrL3D5BRVgz5ZGGuHCOg=="; + url = "https://registry.npmjs.org/@primer/octicons/-/octicons-11.0.0.tgz"; + sha512 = "aMM2n7dl4ToEqQH9ZWQ8M8alGCoGsRk2k5hT5h3KXd54YFKte1twhJDvyQjIjjxqggNh5NUfyuqTOv6MPCVSKQ=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -3325,13 +3280,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-10.1.2" = { + "@schematics/angular-10.1.3" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "10.1.2"; + version = "10.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.1.2.tgz"; - sha512 = "7BHgSdP4yC0IuoiPGWBGQrwE5ilBhIOGozjKSHx41Utac45YKyXpmjr1Jw+SvFilgsnPEjZwc7VKqgINmeLkqA=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.1.3.tgz"; + sha512 = "X3tNnpfF/jkl1KcyCC8PaOYogQlTZ9s7Yuz0va0DAVOptIqorpf8e6+lY0PPLKshaK9TSiFUcQ8SYYnjAVKcdA=="; }; }; "@schematics/schematics-0.1000.7" = { @@ -3343,13 +3298,13 @@ let sha512 = "mucBf5EkhME9O0TvxPeiUTEuudRvEOSjhF/YFHEp/9NZB1JH9lXtBQ60IN6xtCLEbxJmAzhZSns9QPPrHaZRrw=="; }; }; - "@schematics/update-0.1001.2" = { + "@schematics/update-0.1001.3" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1001.2"; + version = "0.1001.3"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1001.2.tgz"; - sha512 = "Z/P08k4FlbKNmxV5pe34yfKPLI2327CjBg26isO5qpR4nB1FVZkC39YXwFwJod3nU7DE6UMkKcA749k30k2KSg=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1001.3.tgz"; + sha512 = "ah4YHjEXACmpX0i3cAn5OguH5S430HD+zbxlMu4AC93A8W52ll97vqvUVF8NLZ6RKcOV/8tXmzgzvJDe07i8yQ=="; }; }; "@serverless/cli-1.5.2" = { @@ -3370,13 +3325,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.1.3" = { + "@serverless/components-3.2.1" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.1.3"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.1.3.tgz"; - sha512 = "WVPM0lVwzzg1KuCGVWNnps/X4IyLdkFQ34XLLJq6PMtsOxeYs9GMg5j8C9TBrWN2s9eJjUpu2fq0KOt2L/s5yQ=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.2.1.tgz"; + sha512 = "ZINkDIPxW2PTKzNUpB4pqYafZ5j4X7Ijn3PAKDEeguQ91tkz2YDxzbqlws/Yld/87Bpi1iLxEk5mct8QXtbEJQ=="; }; }; "@serverless/core-1.1.2" = { @@ -3406,40 +3361,22 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/inquirer-1.1.2" = { - name = "_at_serverless_slash_inquirer"; - packageName = "@serverless/inquirer"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/inquirer/-/inquirer-1.1.2.tgz"; - sha512 = "2c5A6HSWwXluknPNJ2s+Z4WfBwP7Kn6kgsEKD+5xlXpDpBFsRku/xJyO9eqRCwxTM41stgHNC6TRsZ03+wH/rw=="; - }; - }; - "@serverless/platform-client-1.1.10" = { + "@serverless/platform-client-2.1.0" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "1.1.10"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-1.1.10.tgz"; - sha512 = "vMCYRdDaqQjPDlny3+mVNy0lr1P6RJ7hVkR2w9Bk783ZB894hobtMrTm8V8OQPwOvlAypmLnQsLPXwRNM+AMsw=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-2.1.0.tgz"; + sha512 = "fOBden8RBdu4Ms0jAAk3QKU3h5O34B+GjjfKUKVO8wUMR+oV3bDb2ovICxQkppn+Gzp8iM8z1T6Tv5dSd+ebRg=="; }; }; - "@serverless/platform-client-2.0.2" = { - name = "_at_serverless_slash_platform-client"; - packageName = "@serverless/platform-client"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-2.0.2.tgz"; - sha512 = "3guXwRmHOujBy6Lmf7THtnfJQcLRYzpTRpL1rCxLko7OtIWcOth3TvW2JtWNu6qubauA+5kpLB2rdCaPefZYbQ=="; - }; - }; - "@serverless/platform-client-china-1.1.0" = { + "@serverless/platform-client-china-2.0.0" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "1.1.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.1.0.tgz"; - sha512 = "QVk55zO5wcax3tPFp6IiZwf7yI0wZ64kNuR0eGM31g37AMt2+rBM6plE41zNKADRDBSqOtmnwEbsPiWlxZ/S9A=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.0.tgz"; + sha512 = "9COIKr8TPUM/d8zWgNKYhZWzrL5W56cGJubLii+0Uh+4UzSpZpHdSWpg1TFgG1Gmlqwbfg2OMD8sl8a4EBxjZg=="; }; }; "@serverless/platform-sdk-2.3.2" = { @@ -3469,13 +3406,22 @@ let sha512 = "aI/cpGVUhWbJUR8QDMtPue28EU4ViG/L4/XKuZDfAN2uNQv3NRjwEFIBi/cxyfQnMTYVtMLe9wDjuwzOT4ENzA=="; }; }; - "@serverless/utils-china-0.1.28" = { + "@serverless/utils-2.0.0" = { + name = "_at_serverless_slash_utils"; + packageName = "@serverless/utils"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/utils/-/utils-2.0.0.tgz"; + sha512 = "yZQT2f8LIZZlH2ibAIvK4C/Ks72Y8CIWmGz04XGCLPHa/ANA6KqlXTKV6zWg/n1PDy2yj2zgX+m509VpIZuDeQ=="; + }; + }; + "@serverless/utils-china-1.0.2" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "0.1.28"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.28.tgz"; - sha512 = "nxMBES1wR+U1U8UWaWd7CwKmoY18SRHT6h39ux8YGXgxeRd9pqKB4/TTLX4hHYMsqHteXufpFZQIhl0aGf9oww=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.2.tgz"; + sha512 = "XDrn76CUNd+GPrfD4O02XDbXHz+X+XZ9fLfksJzTTQ6OahUhxfBqbvkHTJQGgW3yRKrnoO+cjI3zKkDjePB9xw=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -3613,6 +3559,15 @@ let sha512 = "YN3a93ttscqFQRUeThrxa7i2SJkFPfYn0VpFqdPB6mIJz2fRVLxUkMtlCbG0aSEUvWiLnGVHN0IYxwWEzhq11w=="; }; }; + "@snyk/java-call-graph-builder-1.14.0" = { + name = "_at_snyk_slash_java-call-graph-builder"; + packageName = "@snyk/java-call-graph-builder"; + version = "1.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.14.0.tgz"; + sha512 = "EuqY22cxCoU+Ze+3KFLR/kFnL2UBOipAUX+39iNXUMTJal3LqN9RIvYGjpUjzecSMRhGyCLRnuizH/NxluhgvA=="; + }; + }; "@snyk/rpm-parser-2.0.0" = { name = "_at_snyk_slash_rpm-parser"; packageName = "@snyk/rpm-parser"; @@ -3757,13 +3712,13 @@ let sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ=="; }; }; - "@tencent-sdk/capi-0.2.17" = { + "@tencent-sdk/capi-1.1.4" = { name = "_at_tencent-sdk_slash_capi"; packageName = "@tencent-sdk/capi"; - version = "0.2.17"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@tencent-sdk/capi/-/capi-0.2.17.tgz"; - sha512 = "DIenMFJXrd4yb35BbW/7LiikCQotbm9HEBG9S4HKV47tcKt6e4nZrNPO3R2hHgQ2jdo0xfqmlUlCP0O4Q3b9pw=="; + url = "https://registry.npmjs.org/@tencent-sdk/capi/-/capi-1.1.4.tgz"; + sha512 = "hFOtXQ8R4vsJkdmavzFwzaD9bbTOmfBJtc48zOQjmHW72E5FilFxhhuGMk45lr9lwEyXd/kYTk8hJDLz+aHCKA=="; }; }; "@textlint/ast-node-types-4.3.4" = { @@ -3937,40 +3892,40 @@ let sha512 = "qZLoYeXSTgQuK1h7QQS16hqLGdmqtRmN8w/rl3Au/l5x/zkHx+a4VHrHyBsi1I1vtK2oBHxSzKIu0R5p6spdOA=="; }; }; - "@types/babel__core-7.1.9" = { + "@types/babel__core-7.1.10" = { name = "_at_types_slash_babel__core"; packageName = "@types/babel__core"; - version = "7.1.9"; + version = "7.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.9.tgz"; - sha512 = "sY2RsIJ5rpER1u3/aQ8OFSI7qGIy8o1NEEbgb2UaJcvOtXOMpd39ko723NBpjQFg9SIX7TXtjejZVGeIMLhoOw=="; + url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.10.tgz"; + sha512 = "x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw=="; }; }; - "@types/babel__generator-7.6.1" = { + "@types/babel__generator-7.6.2" = { name = "_at_types_slash_babel__generator"; packageName = "@types/babel__generator"; - version = "7.6.1"; + version = "7.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz"; - sha512 = "bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew=="; + url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz"; + sha512 = "MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ=="; }; }; - "@types/babel__template-7.0.2" = { + "@types/babel__template-7.0.3" = { name = "_at_types_slash_babel__template"; packageName = "@types/babel__template"; - version = "7.0.2"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz"; - sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg=="; + url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.3.tgz"; + sha512 = "uCoznIPDmnickEi6D0v11SBpW0OuVqHJCa7syXqQHy5uktSCreIlt0iglsCnmvz8yCb38hGcWeseA8cWJSwv5Q=="; }; }; - "@types/babel__traverse-7.0.14" = { + "@types/babel__traverse-7.0.15" = { name = "_at_types_slash_babel__traverse"; packageName = "@types/babel__traverse"; - version = "7.0.14"; + version = "7.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.14.tgz"; - sha512 = "8w9szzKs14ZtBVuP6Wn7nMLRJ0D6dfB0VEBEyRgxrZ/Ln49aNMykrghM2FaNn4FJRzNppCSa0Rv9pBRM5Xc3wg=="; + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.15.tgz"; + sha512 = "Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A=="; }; }; "@types/babylon-6.16.5" = { @@ -4018,15 +3973,6 @@ let sha512 = "6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w=="; }; }; - "@types/chalk-2.2.0" = { - name = "_at_types_slash_chalk"; - packageName = "@types/chalk"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/chalk/-/chalk-2.2.0.tgz"; - sha512 = "1zzPV9FDe1I/WHhRkf9SNgqtRJWZqrBWgu7JGveuHmmyR9CnAPCie2N/x+iHrgnpYBIcCJWHBoMRv2TRWktsvw=="; - }; - }; "@types/chart.js-2.9.23" = { name = "_at_types_slash_chart.js"; packageName = "@types/chart.js"; @@ -4180,13 +4126,22 @@ let sha512 = "dCOT5lcmV/uC2J9k0rPafATeeyz+99xTt54ReX11/LObZgfzJqZNcW27zGhYyX+9iSEGXGt5qLPwRSvBZcLvtQ=="; }; }; - "@types/express-serve-static-core-4.17.12" = { + "@types/express-serve-static-core-4.17.13" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.12"; + version = "4.17.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.12.tgz"; - sha512 = "EaEdY+Dty1jEU7U6J4CUWwxL+hyEGMkO5jan5gplfegUgCUsIUWqXxqw47uGjimeT4Qgkz/XUfwoau08+fgvKA=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.13.tgz"; + sha512 = "RgDi5a4nuzam073lRGKTUIaL3eF2+H7LJvJ8eUnCI0wA6SNjXc44DCmWNiTLs/AZ7QlsFWZiw/gTG3nSQGL0fA=="; + }; + }; + "@types/express-serve-static-core-4.17.9" = { + name = "_at_types_slash_express-serve-static-core"; + packageName = "@types/express-serve-static-core"; + version = "4.17.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.9.tgz"; + sha512 = "DG0BYg6yO+ePW+XoDENYz8zhNGC3jDDEpComMYn7WJc4mY1Us8Rw9ax2YhJXxpyk2SF47PQAoQ0YyVT1a0bEkA=="; }; }; "@types/fancy-log-1.3.0" = { @@ -4594,13 +4549,13 @@ let sha512 = "W+fpe5s91FBGE0pEa0lnqGLL4USgpLgs4nokw16SrBBco/gQxuua7KnArSEOd5iaMqbbSHV10vUDkJYJJqpXKA=="; }; }; - "@types/node-14.11.1" = { + "@types/node-14.11.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.11.1"; + version = "14.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.11.1.tgz"; - sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.11.2.tgz"; + sha512 = "jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA=="; }; }; "@types/node-6.14.12" = { @@ -4639,15 +4594,6 @@ let sha512 = "f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA=="; }; }; - "@types/object-assign-4.0.30" = { - name = "_at_types_slash_object-assign"; - packageName = "@types/object-assign"; - version = "4.0.30"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/object-assign/-/object-assign-4.0.30.tgz"; - sha1 = "8949371d5a99f4381ee0f1df0a9b7a187e07e652"; - }; - }; "@types/parse-json-4.0.0" = { name = "_at_types_slash_parse-json"; packageName = "@types/parse-json"; @@ -4855,13 +4801,13 @@ let sha512 = "I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A=="; }; }; - "@types/uglify-js-3.9.3" = { + "@types/uglify-js-3.11.0" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.9.3"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.9.3.tgz"; - sha512 = "KswB5C7Kwduwjj04Ykz+AjvPcfgv/37Za24O2EDzYNbwyzOo8+ydtvzUfZ5UMguiVu29Gx44l1A6VsPPcmYu9w=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.0.tgz"; + sha512 = "I0Yd8TUELTbgRHq2K65j8rnDPAzAP+DiaF/syLem7yXwYLsHZhPd+AM2iXsWmf9P2F2NlFCgl5erZPQx9IbM9Q=="; }; }; "@types/unist-2.0.3" = { @@ -4936,31 +4882,31 @@ let sha512 = "f5WLMpezwVxCLm1xQe/kdPpQIOmL0TXYx2O15VYfYzc7hTIdxiOoOvez+McSIw3b7z/1zGovew9YSL7+h4h7/Q=="; }; }; - "@types/ws-7.2.6" = { + "@types/ws-7.2.7" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "7.2.6"; + version = "7.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-7.2.6.tgz"; - sha512 = "Q07IrQUSNpr+cXU4E4LtkSIBPie5GLZyyMC1QtQYRLWz701+XcoVygGUZgvLqElq1nU4ICldMYPnexlBsg3dqQ=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-7.2.7.tgz"; + sha512 = "UUFC/xxqFLP17hTva8/lVT0SybLUrfSD9c+iapKb0fEiC8uoDbA+xuZ3pAN603eW+bY8ebSMLm9jXdIPnD0ZgA=="; }; }; - "@types/yargs-13.0.10" = { + "@types/yargs-13.0.11" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "13.0.10"; + version = "13.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.10.tgz"; - sha512 = "MU10TSgzNABgdzKvQVW1nuuT+sgBMWeXNc3XOs5YXV5SDAK+PPja2eUuBNB9iqElu03xyEDqlnGw0jgl4nbqGQ=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz"; + sha512 = "NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ=="; }; }; - "@types/yargs-15.0.5" = { + "@types/yargs-15.0.7" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "15.0.5"; + version = "15.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz"; - sha512 = "Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.7.tgz"; + sha512 = "Gf4u3EjaPNcC9cTu4/j2oN14nSVhr8PQ+BvBcBQHAhDZfl0bVIiLgvnRXv/dn58XhTm9UXvBpvJpDlwV65QxOA=="; }; }; "@types/yargs-parser-15.0.0" = { @@ -5062,22 +5008,22 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@uifabric/foundation-7.9.5" = { + "@uifabric/foundation-7.9.9" = { name = "_at_uifabric_slash_foundation"; packageName = "@uifabric/foundation"; - version = "7.9.5"; + version = "7.9.9"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.5.tgz"; - sha512 = "r4KjYJAjSRgBGqeJXGKogYgzJS55/zcxmU3Gsps0BCMP8SCn55KZ31KiMYmjxoNnJAlGnhIq+h5zUEVRhpHN/Q=="; + url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.9.tgz"; + sha512 = "cpFsDrHIG3f952+WsBCLLPKT+06ywoMBTi0Z42KFBxAeQjFfJFZ4YnHRztXZMrFbwHsvokzV8GmOm+Nc2kectQ=="; }; }; - "@uifabric/icons-7.5.5" = { + "@uifabric/icons-7.5.8" = { name = "_at_uifabric_slash_icons"; packageName = "@uifabric/icons"; - version = "7.5.5"; + version = "7.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.5.tgz"; - sha512 = "lErlirRm3D4Lv63oxa/JFx+JUyHRX/pqNoolLQKlPKqNauHFcrcEEDRuZdtfSOJtF/1a09ZvIyirij3XwZjNBw=="; + url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.8.tgz"; + sha512 = "3YIp2nKHpuKeqPQnyOUPUvoKq18N81t1+2c/NVJXnlSOP4VyEy9PC2JXCmxoZZOdrGKwQ1Is99PfLY0XsIssEQ=="; }; }; "@uifabric/merge-styles-7.19.1" = { @@ -5089,13 +5035,13 @@ let sha512 = "yqUwmk62Kgu216QNPE9vOfS3h0kiSbTvoqM5QcZi+IzpqsBOlzZx3A9Er9UiDaqHRd5lsYF5pO/jeUULmBWF/A=="; }; }; - "@uifabric/react-hooks-7.13.4" = { + "@uifabric/react-hooks-7.13.5" = { name = "_at_uifabric_slash_react-hooks"; packageName = "@uifabric/react-hooks"; - version = "7.13.4"; + version = "7.13.5"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.4.tgz"; - sha512 = "hyL3eQqbS7DrZCpkF1QDrC0TX+dV+yZZr5UgT3wAZMtzEMBFVgaiPHdv0zHgUbiQv5ktbQoY7yQp7clfVN65DA=="; + url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.5.tgz"; + sha512 = "5Ucq3wH5bZud/TCKZE6IS+v1XpaxP65iiSk3ZxPi+RAi5Gt8NeKwmaMZTPWgLrRjkOTwy59jR4dJ6MzZVmSe7A=="; }; }; "@uifabric/set-version-7.0.23" = { @@ -5107,22 +5053,22 @@ let sha512 = "9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA=="; }; }; - "@uifabric/styling-7.16.5" = { + "@uifabric/styling-7.16.9" = { name = "_at_uifabric_slash_styling"; packageName = "@uifabric/styling"; - version = "7.16.5"; + version = "7.16.9"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.5.tgz"; - sha512 = "mJcPam0ivtGfC8NEUQgpJFs8uG4ZRY1ml1RY9rOY6py5pTEno15xaq11yfRxv3ACxkuK9D9qZM23x0q8sWsCdg=="; + url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.9.tgz"; + sha512 = "vouh7WeayCWvjbCo4VlqJfEYRvkRwq2fL9YyicPIJomIvKxs9lmkJJP+drUOxX78TV9DoGIMnbr+DMFpNsGcdA=="; }; }; - "@uifabric/utilities-7.32.2" = { + "@uifabric/utilities-7.32.3" = { name = "_at_uifabric_slash_utilities"; packageName = "@uifabric/utilities"; - version = "7.32.2"; + version = "7.32.3"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.32.2.tgz"; - sha512 = "x47zJIjezkfed17EfNRTr9wP6hHR+i0pBbr3eQYetpcVsAXcbZsd+D6divwy+kQOsdLQ8TozWqoVk3ySe6RfSw=="; + url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.32.3.tgz"; + sha512 = "H0SWX6X0yZAd1XcdS/ZcPLKw3BWnT6/4eavVOD0NdWO+Dd168exfMHmV/nwgJ1yJjsUsG1o7x7x22QPRl6NQ6Q=="; }; }; "@vue/cli-shared-utils-4.5.6" = { @@ -6295,24 +6241,6 @@ let sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; }; }; - "analytics-0.5.5" = { - name = "analytics"; - packageName = "analytics"; - version = "0.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/analytics/-/analytics-0.5.5.tgz"; - sha512 = "43JBzud8n1OoN5TUehHpsp38rDyDteFgS9ZPWLyuj5JGc7JgjLAQNN1BCwyM9js4U7LIRxhEyWXPkifndMsOeA=="; - }; - }; - "analytics-utils-0.2.2" = { - name = "analytics-utils"; - packageName = "analytics-utils"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/analytics-utils/-/analytics-utils-0.2.2.tgz"; - sha512 = "fdbc+MeoNrkwCAbGD/qgedyvRbPnImmWiInAgZ51KpINmKITpdtWV+6riHVA1YBSrb8IyYlfxn98IeWyN9a0+Q=="; - }; - }; "ansi-0.3.1" = { name = "ansi"; packageName = "ansi"; @@ -6682,13 +6610,13 @@ let sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; }; }; - "apollo-2.30.3" = { + "apollo-2.31.0" = { name = "apollo"; packageName = "apollo"; - version = "2.30.3"; + version = "2.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo/-/apollo-2.30.3.tgz"; - sha512 = "5X0a2PaMOYUWhk0DIRzzwu18j6WiVWIvgmciQHY++QV+aKngspXWeqAn+mugSkwkC/GVycl/0Jv/OCdnemE7Og=="; + url = "https://registry.npmjs.org/apollo/-/apollo-2.31.0.tgz"; + sha512 = "galQp/6UAiP+Aa2WtJZPIPPAiQqR6Um/fe0cOC8wu3c1BmXF2fHzjj2NSOv7xqAHZPyBRn/ixIe0aVUy3gcCLw=="; }; }; "apollo-cache-1.3.5" = { @@ -6700,13 +6628,13 @@ let sha512 = "1XoDy8kJnyWY/i/+gLTEbYLnoiVtS8y7ikBr/IfmML4Qb+CM7dEEbIUOjnY716WqmZ/UpXIxTfJsY7rMcqiCXA=="; }; }; - "apollo-cache-control-0.11.1" = { + "apollo-cache-control-0.11.3" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.11.1"; + version = "0.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.1.tgz"; - sha512 = "6iHa8TkcKt4rx5SKRzDNjUIpCQX+7/FlZwD7vRh9JDnM4VH8SWhpj8fUR3CiEY8Kuc4ChXnOY8bCcMju5KPnIQ=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.3.tgz"; + sha512 = "21GCeC9AIIa22uD0Vtqn/N0D5kOB4rY/Pa9aQhxVeLN+4f8Eu4nmteXhFypUD0LL1/58dmm8lS5embsfoIGjEA=="; }; }; "apollo-cache-inmemory-1.6.6" = { @@ -6727,49 +6655,49 @@ let sha512 = "jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA=="; }; }; - "apollo-codegen-core-0.37.9" = { + "apollo-codegen-core-0.38.0" = { name = "apollo-codegen-core"; packageName = "apollo-codegen-core"; - version = "0.37.9"; + version = "0.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.37.9.tgz"; - sha512 = "FfsLh/DZkwH1fb5mNaVonBVk9JdJp3D/Bj1AGthw9ldZmd/3s79YfsYXqOsCNJM1TZt6K/du08NMHSLS86YQBA=="; + url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.38.0.tgz"; + sha512 = "NZnmS1qWFSlYaraxyi9q4uVFDGktr3IgQmgGI5Jj7iBY5iFTNJIIDXb2ufB8UvLBF3eKqHR9VxpQIAi4wfo8+w=="; }; }; - "apollo-codegen-flow-0.35.9" = { + "apollo-codegen-flow-0.36.0" = { name = "apollo-codegen-flow"; packageName = "apollo-codegen-flow"; - version = "0.35.9"; + version = "0.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.35.9.tgz"; - sha512 = "+9gJLQfSy04Y4DwPpicGLpKQ1GORo07sxQWKqJWMtVRj4exKMFXieNawDUKErvxqiwDKXcBO9B1q5MF8BcwWlA=="; + url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.36.0.tgz"; + sha512 = "OJ3aRqxbI63NnUrUrPaindeXCI9bOCGmIHoENGGXwNrtS229lUJ9b6rTelqyfAwKau8AysJQoMfAclula3Br7A=="; }; }; - "apollo-codegen-scala-0.36.9" = { + "apollo-codegen-scala-0.37.0" = { name = "apollo-codegen-scala"; packageName = "apollo-codegen-scala"; - version = "0.36.9"; + version = "0.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.36.9.tgz"; - sha512 = "t1ew6IXsFL+sNvyy/kS0VWv8t1WjxC46lt1ISt5v5bgDVyGo2g+cH93SSeEFUjtv+hK3TyqSO1fM0SLHAy8oJA=="; + url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.37.0.tgz"; + sha512 = "Wsvd/eF6XBnzJvl1AceiAXw3pFwGYWyKXWbCzneuNHggf3ONc09V0zPQ2dqcsMnslIn6y+HnZav9rQB/iJNNEQ=="; }; }; - "apollo-codegen-swift-0.37.9" = { + "apollo-codegen-swift-0.38.0" = { name = "apollo-codegen-swift"; packageName = "apollo-codegen-swift"; - version = "0.37.9"; + version = "0.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.37.9.tgz"; - sha512 = "4N8s2yni41/jjbfsyoJ4yxbW8XbL6HbUbxRgvbmckGtoOjQS06PYUD56IibQWbsaBs8gEpu5Z/rE/dL2Y6hZug=="; + url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.38.0.tgz"; + sha512 = "kUoDUOOY3h7fUg4hpNNZrQl+bfPzwxN49pl8lrGoEB8uvgaCBj5C77NbHTISomSk1OzdT8uVlm4l4oJiMsT28g=="; }; }; - "apollo-codegen-typescript-0.37.9" = { + "apollo-codegen-typescript-0.38.0" = { name = "apollo-codegen-typescript"; packageName = "apollo-codegen-typescript"; - version = "0.37.9"; + version = "0.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.37.9.tgz"; - sha512 = "DFBa8vUbiVmd/kGG/mjq6umwWxFRYtzllmt2fwHIVCi9z4vDD8Y+6p9acwOxqjqKCVaJshRQCh94zGuW0gY6vA=="; + url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.38.0.tgz"; + sha512 = "sEAIoE38ASFtqU7bhj31vtSRLKix5H8ltwvU9MRMbpgWfos/r29krKrNSJi8DeouC1/QSQAOaFzsghCMe5fkrQ=="; }; }; "apollo-datasource-0.7.2" = { @@ -6781,24 +6709,6 @@ let sha512 = "ibnW+s4BMp4K2AgzLEtvzkjg7dJgCaw9M5b5N0YKNmeRZRnl/I/qBTQae648FsRKgMwTbRQIvBhQ0URUFAqFOw=="; }; }; - "apollo-engine-reporting-2.3.0" = { - name = "apollo-engine-reporting"; - packageName = "apollo-engine-reporting"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-2.3.0.tgz"; - sha512 = "SbcPLFuUZcRqDEZ6mSs8uHM9Ftr8yyt2IEu0JA8c3LNBmYXSLM7MHqFe80SVcosYSTBgtMz8mLJO8orhYoSYZw=="; - }; - }; - "apollo-engine-reporting-protobuf-0.5.2" = { - name = "apollo-engine-reporting-protobuf"; - packageName = "apollo-engine-reporting-protobuf"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.2.tgz"; - sha512 = "4wm9FR3B7UvJxcK/69rOiS5CAJPEYKufeRWb257ZLfX7NGFTMqvbc1hu4q8Ch7swB26rTpkzfsftLED9DqH9qg=="; - }; - }; "apollo-env-0.6.5" = { name = "apollo-env"; packageName = "apollo-env"; @@ -6808,15 +6718,6 @@ let sha512 = "jeBUVsGymeTHYWp3me0R2CZRZrFeuSZeICZHCeRflHTfnQtlmbSXdy5E0pOyRM9CU4JfQkKDC98S1YglQj7Bzg=="; }; }; - "apollo-graphql-0.5.0" = { - name = "apollo-graphql"; - packageName = "apollo-graphql"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.5.0.tgz"; - sha512 = "YSdF/BKPbsnQpxWpmCE53pBJX44aaoif31Y22I/qKpB6ZSGzYijV5YBoCL5Q15H2oA/v/02Oazh9lbp4ek3eig=="; - }; - }; "apollo-graphql-0.6.0" = { name = "apollo-graphql"; packageName = "apollo-graphql"; @@ -6826,13 +6727,13 @@ let sha512 = "BxTf5LOQe649e9BNTPdyCGItVv4Ll8wZ2BKnmiYpRAocYEXAVrQPWuSr3dO4iipqAU8X0gvle/Xu9mSqg5b7Qg=="; }; }; - "apollo-language-server-1.23.4" = { + "apollo-language-server-1.24.0" = { name = "apollo-language-server"; packageName = "apollo-language-server"; - version = "1.23.4"; + version = "1.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.23.4.tgz"; - sha512 = "PaA25SsAQ30iXfR0noESlNYDNb4RH5S7tjVxBTj53VRArp/gQDWJM6eDvFbH5RH3vXXpfHRVna6YfymDfTPdqg=="; + url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.24.0.tgz"; + sha512 = "n1o1QmQ6hQcl5Rx+K23yO9MrDcF94Xygychn1pxJG5xKEZ8kkKxqNqjUhjFxIN908LJ4yuFjTW6OEtEym4haxg=="; }; }; "apollo-link-1.2.14" = { @@ -6907,6 +6808,15 @@ let sha512 = "mjSFPlQxmoLArpHBeUb2Xj+2HDYeTaJqFGOqQ+I8NVJxgL9lJe84PDWcPah/yMLv3rB7QgBDSuZ0xoRFBPlySw=="; }; }; + "apollo-reporting-protobuf-0.6.0" = { + name = "apollo-reporting-protobuf"; + packageName = "apollo-reporting-protobuf"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.6.0.tgz"; + sha512 = "AFLQIuO0QhkoCF+41Be/B/YU0C33BZ0opfyXorIjM3MNNiEDSyjZqmUozlB3LqgfhT9mn2IR5RSsA+1b4VovDQ=="; + }; + }; "apollo-server-caching-0.5.2" = { name = "apollo-server-caching"; packageName = "apollo-server-caching"; @@ -6916,13 +6826,13 @@ let sha512 = "HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ=="; }; }; - "apollo-server-core-2.17.0" = { + "apollo-server-core-2.18.1" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.17.0"; + version = "2.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.17.0.tgz"; - sha512 = "rjAkBbKSrGLDfg/g5bohnPlQahmkAxgEBuMDVsoF3aa+RaEPXPUMYrLbOxntl0LWeLbPiMa/IyFF43dvlGqV7w=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.18.1.tgz"; + sha512 = "Bv08AyJ3WSms59loE31haVRBctDn6MGyjtaPnfLlQV5//wMdwS5MXX8RcMCmXxv0Utp5TlhoD+pHLO5Ool+LRw=="; }; }; "apollo-server-env-2.4.5" = { @@ -6943,40 +6853,40 @@ let sha512 = "FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ=="; }; }; - "apollo-server-express-2.17.0" = { + "apollo-server-express-2.18.1" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.17.0"; + version = "2.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.17.0.tgz"; - sha512 = "PonpWOuM1DH3Cz0bu56Tusr3GXOnectC6AD/gy2GXK0v84E7tKTuxEY3SgsgxhvfvvhfwJbXTyIogL/wezqnCw=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.18.1.tgz"; + sha512 = "qAkSlhKSvPx7sWT+Thk7bfHqjWNNm+uP66zNZlnsvKlR4++84KfcFrij3MaCm67mu4h0MBv2dvlsoOrXehrYtg=="; }; }; - "apollo-server-plugin-base-0.9.1" = { + "apollo-server-plugin-base-0.10.1" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.9.1"; + version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.9.1.tgz"; - sha512 = "kvrX4Z3FdpjrZdHkyl5iY2A1Wvp4b6KQp00DeZqss7GyyKNUBKr80/7RQgBLEw7EWM7WB19j459xM/TjvW0FKQ=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.1.tgz"; + sha512 = "XChCBDNyfByWqVXptsjPwrwrCj5cxMmNbchZZi8KXjtJ0hN2C/9BMNlInJd6bVGXvUbkRJYUakfKCfO5dZmwIg=="; }; }; - "apollo-server-types-0.5.1" = { + "apollo-server-types-0.6.0" = { name = "apollo-server-types"; packageName = "apollo-server-types"; - version = "0.5.1"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.5.1.tgz"; - sha512 = "my2cPw+DAb2qVnIuBcsRKGyS28uIc2vjFxa1NpRoJZe9gK0BWUBk7wzXnIzWy3HZ5Er11e/40MPTUesNfMYNVA=="; + url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.0.tgz"; + sha512 = "usqXaz81bHxD2IZvKEQNnLpSbf2Z/BmobXZAjEefJEQv1ItNn+lJNUmSSEfGejHvHlg2A7WuAJKJWyDWcJrNnA=="; }; }; - "apollo-tracing-0.11.2" = { + "apollo-tracing-0.11.4" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.11.2"; + version = "0.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.11.2.tgz"; - sha512 = "QjmRd2ozGD+PfmF6U9w/w6jrclYSBNczN6Bzppr8qA5somEGl5pqdprIZYL28H0IapZiutA3x6p6ZVF/cVX8wA=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.11.4.tgz"; + sha512 = "zBu/SwQlXfbdpcKLzWARGVjrEkIZUW3W9Mb4CCIzv07HbBQ8IQpmf9w7HIJJefC7rBiBJYg6JBGyuro3N2lxCA=="; }; }; "apollo-upload-client-11.0.0" = { @@ -8239,13 +8149,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.756.0" = { + "aws-sdk-2.763.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.756.0"; + version = "2.763.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.756.0.tgz"; - sha512 = "Hk6DzcsXq1WRg+UVHDH56iQz31kDtg/NRqtJL1A0BrZ/PtNSLTHsQQllpcAi09UxLDMzBoDXymZ8kYg0Migq8w=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.763.0.tgz"; + sha512 = "uHb+yfsH21wR8ZInj/GQwxCmWJjrL3sOwqwZ2lf9hDxh1P0lsMKDjf0e+8ICgRBY4x28XNWXs3/O15EID6Rsqw=="; }; }; "aws-sign2-0.6.0" = { @@ -8860,6 +8770,15 @@ let sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154"; }; }; + "base64-arraybuffer-0.1.4" = { + name = "base64-arraybuffer"; + packageName = "base64-arraybuffer"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz"; + sha1 = "9818c79e059b1355f97e0428a017c838e90ba812"; + }; + }; "base64-arraybuffer-0.1.5" = { name = "base64-arraybuffer"; packageName = "base64-arraybuffer"; @@ -9472,13 +9391,13 @@ let sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; }; - "blueimp-md5-2.17.0" = { + "blueimp-md5-2.18.0" = { name = "blueimp-md5"; packageName = "blueimp-md5"; - version = "2.17.0"; + version = "2.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.17.0.tgz"; - sha512 = "x5PKJHY5rHQYaADj6NwPUR2QRCUVSggPzrUKkeENpj871o9l9IefJbO2jkT5UvYykeOK9dx0VmkIo6dZ+vThYw=="; + url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.18.0.tgz"; + sha512 = "vE52okJvzsVWhcgUHOv+69OG3Mdg151xyn41aVQN/5W5S+S43qZhxECtYLAEHMSFWX6Mv5IZrzj3T5+JqXfj5Q=="; }; }; "bn.js-4.11.9" = { @@ -9940,13 +9859,13 @@ let sha512 = "yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA=="; }; }; - "browserslist-4.14.3" = { + "browserslist-4.14.5" = { name = "browserslist"; packageName = "browserslist"; - version = "4.14.3"; + version = "4.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.3.tgz"; - sha512 = "GcZPC5+YqyPO4SFnz48/B0YaCwS47Q9iPChRGi6t7HhflKBcINzFrJvRfC+jp30sRMKxF+d4EHGs27Z0XP1NaQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz"; + sha512 = "Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA=="; }; }; "bser-2.1.1" = { @@ -10705,13 +10624,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001133" = { + "caniuse-lite-1.0.30001140" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001133"; + version = "1.0.30001140"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001133.tgz"; - sha512 = "s3XAUFaC/ntDb1O3lcw9K8MPeOW7KO3z9+GzAoBxfz1B0VdacXPMKgFUtG4KIsgmnbexmi013s9miVu4h+qMHw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001140.tgz"; + sha512 = "xFtvBtfGrpjTOxTpjP5F2LmN04/ZGfYV8EQzUIC/RmKpdrmzJrjqlJ4ho7sGuAMPko2/Jl08h7x9uObCfBFaAA=="; }; }; "canvas-2.6.1" = { @@ -11704,15 +11623,6 @@ let sha512 = "/1owvF0SZ5Gn54cgrikJ0QskgTzeg30HGjkmjFoaHDJzAqFpuX1DBpFR8aLvsE1J5s9MgeYRENQK4BFwOag5VA=="; }; }; - "cli-ux-5.4.10" = { - name = "cli-ux"; - packageName = "cli-ux"; - version = "5.4.10"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.4.10.tgz"; - sha512 = "s48Efw04VtGyQEwXDrERobMc2DF2DyYQ+2nmNsM7clxOVDtbRI9OjbXRwPeS6G2aFuHy0bB8GUq5MzkmkYt7yw=="; - }; - }; "cli-ux-5.5.0" = { name = "cli-ux"; packageName = "cli-ux"; @@ -11866,6 +11776,15 @@ let sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; }; }; + "cliui-7.0.1" = { + name = "cliui"; + packageName = "cliui"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-7.0.1.tgz"; + sha512 = "rcvHOWyGyid6I1WjT/3NatKj2kDt9OdSHSXpyLXaMWFbKpGACNW8pRhhdPUq9MWUOdwn8Rz9AVETjF4105rZZQ=="; + }; + }; "clivas-0.1.4" = { name = "clivas"; packageName = "clivas"; @@ -14351,13 +14270,13 @@ let sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; }; }; - "d3-array-2.7.1" = { + "d3-array-2.8.0" = { name = "d3-array"; packageName = "d3-array"; - version = "2.7.1"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/d3-array/-/d3-array-2.7.1.tgz"; - sha512 = "dYWhEvg1L2+osFsSqNHpXaPQNugLT4JfyvbLE046I2PDcgYGFYc0w24GSJwbmcjjZYOPC3PNP2S782bWUM967Q=="; + url = "https://registry.npmjs.org/d3-array/-/d3-array-2.8.0.tgz"; + sha512 = "6V272gsOeg7+9pTW1jSYOR1QE37g95I3my1hBmY+vOUNHRrk9yt4OTz/gK7PMkVAVDrYYq4mq3grTiZ8iJdNIw=="; }; }; "d3-color-2.0.0" = { @@ -14468,13 +14387,13 @@ let sha512 = "b0Ed2t1UUalJpc3qXzKi+cPGxeXRr4KU9YSlocN74aTzp6R/Ud43t79yLLqxHRWZfsvWXmbDWPpoENK1K539xw=="; }; }; - "d3-scale-3.2.2" = { + "d3-scale-3.2.3" = { name = "d3-scale"; packageName = "d3-scale"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.2.tgz"; - sha512 = "3Mvi5HfqPFq0nlyeFlkskGjeqrR/790pINMHc4RXKJ2E6FraTd3juaRIRZZHyMAbi3LjAMW0EH4FB1WgoGyeXg=="; + url = "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.3.tgz"; + sha512 = "8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g=="; }; }; "d3-shape-2.0.0" = { @@ -14774,13 +14693,13 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "dayjs-1.8.36" = { + "dayjs-1.9.1" = { name = "dayjs"; packageName = "dayjs"; - version = "1.8.36"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.36.tgz"; - sha512 = "3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.9.1.tgz"; + sha512 = "01NCTBg8cuMJG1OQc6PR7T66+AFYiPwgDvdJmvJBn29NGzIG+DIFxPLNjHzwz3cpFIvG+NcwIjP9hSaPVoOaDg=="; }; }; "deasync-0.1.15" = { @@ -15395,6 +15314,15 @@ let sha512 = "wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA=="; }; }; + "del-6.0.0" = { + name = "del"; + packageName = "del"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/del/-/del-6.0.0.tgz"; + sha512 = "1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ=="; + }; + }; "del-cli-3.0.1" = { name = "del-cli"; packageName = "del-cli"; @@ -15737,6 +15665,15 @@ let sha512 = "SrsUCfCaDTF64QVMHMidRal+kmkbIc5zP8cxxZPsomWx9vuEUjBlSJNhf7/ypE5cLdJJDI4qzKDmyzqQ+iz/xg=="; }; }; + "devtools-protocol-0.0.799653" = { + name = "devtools-protocol"; + packageName = "devtools-protocol"; + version = "0.0.799653"; + src = fetchurl { + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.799653.tgz"; + sha512 = "t1CcaZbvm8pOlikqrsIM9GOa7Ipp07+4h/q9u0JXBWjPCjHdBl9KkddX87Vv9vBHoBGtwV79sYQNGnQM6iS5gg=="; + }; + }; "dezalgo-1.0.3" = { name = "dezalgo"; packageName = "dezalgo"; @@ -16322,13 +16259,13 @@ let sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA=="; }; }; - "domhandler-3.0.0" = { + "domhandler-3.2.0" = { name = "domhandler"; packageName = "domhandler"; - version = "3.0.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-3.0.0.tgz"; - sha512 = "eKLdI5v9m67kbXQbJSNn1zjh0SDzvzWVWtX+qEI3eMjZw8daH9k8rlj1FZY9memPwjiskQFbe7vHVVJIAqoEhw=="; + url = "https://registry.npmjs.org/domhandler/-/domhandler-3.2.0.tgz"; + sha512 = "FnT5pxGpykNI10uuwyqae65Ysw7XBQJKDjDjlHgE/rsNtjr1FyGNVNQCVlM5hwcq9wkyWSqB+L5Z+Qa4khwLuA=="; }; }; "domino-2.1.6" = { @@ -16376,13 +16313,13 @@ let sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; }; }; - "domutils-2.3.0" = { + "domutils-2.4.1" = { name = "domutils"; packageName = "domutils"; - version = "2.3.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-2.3.0.tgz"; - sha512 = "xWC75PM3QF6MjE5e58OzwTX0B/rPQnlqH0YyXB/c056RtVJA+eu60da2I/bdnEHzEYC00g8QaZUlAbqOZVbOsw=="; + url = "https://registry.npmjs.org/domutils/-/domutils-2.4.1.tgz"; + sha512 = "AA5r2GD1Dljhxc+k4zD2HYQaDkDPBhTqmqF55wLNlxfhFQlqaYME8Jhmo2nKNBb+CNfPXE8SAjtF6SsZ0cza/w=="; }; }; "dot-case-3.0.3" = { @@ -16817,13 +16754,13 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.570" = { + "electron-to-chromium-1.3.576" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.570"; + version = "1.3.576"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.570.tgz"; - sha512 = "Y6OCoVQgFQBP5py6A/06+yWxUZHDlNr/gNDGatjH8AZqXl8X0tE4LfjLJsXGz/JmWJz8a6K7bR1k+QzZ+k//fg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.576.tgz"; + sha512 = "uSEI0XZ//5ic+0NdOqlxp0liCD44ck20OAGyLMSymIWTEAtHKVJi6JM18acOnRgUgX7Q65QqnI+sNncNvIy8ew=="; }; }; "elegant-spinner-1.0.1" = { @@ -17115,13 +17052,13 @@ let sha1 = "1c5a65d5c5af6d04b44c22c3dbcd95c39ed1c989"; }; }; - "engine.io-client-3.4.3" = { + "engine.io-client-3.4.4" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "3.4.3"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.3.tgz"; - sha512 = "0NGY+9hioejTEJCaSJZfWZLk4FPI9dN+1H1C4+wj2iuFba47UgZbJzfWs4aNFajnX/qAaYKbe2lLTfEEWzCmcw=="; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.4.tgz"; + sha512 = "iU4CRr38Fecj8HoZEnFtm2EiKGbYZcPn3cHxqNGl/tmdWRf60KhK+9vE0JeSjgnlS/0oynEfLgKbT9ALpim0sQ=="; }; }; "engine.io-parser-1.0.6" = { @@ -17133,13 +17070,13 @@ let sha1 = "d38813143a411cb3b914132ab05bf99e6f7a248e"; }; }; - "engine.io-parser-2.2.0" = { + "engine.io-parser-2.2.1" = { name = "engine.io-parser"; packageName = "engine.io-parser"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.0.tgz"; - sha512 = "6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w=="; + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.1.tgz"; + sha512 = "x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg=="; }; }; "enhanced-resolve-2.3.0" = { @@ -17691,6 +17628,15 @@ let sha512 = "K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig=="; }; }; + "eslint-7.10.0" = { + name = "eslint"; + packageName = "eslint"; + version = "7.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-7.10.0.tgz"; + sha512 = "BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA=="; + }; + }; "eslint-7.9.0" = { name = "eslint"; packageName = "eslint"; @@ -17718,13 +17664,13 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.0.0-beta.3" = { + "eslint-plugin-vue-7.0.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.0.0-beta.3"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.0.0-beta.3.tgz"; - sha512 = "/p23IRPN9gFNN7dzesrctt06Kvs9E3VRB8BGIAPSEaQNk5yhlKUzntPARjUpsTWW+DQg0mqglZptfkUJK4+4EQ=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.0.0.tgz"; + sha512 = "SFcM8ZMdVRUQKrAryl6Q5razrJtloATUOKTZoK/8yvQig1c1L3VRoMLL9AXiV3VNsKXolkk6yeMIiqGf33/Iew=="; }; }; "eslint-scope-3.7.3" = { @@ -18708,6 +18654,15 @@ let sha512 = "xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA=="; }; }; + "extract-zip-2.0.1" = { + name = "extract-zip"; + packageName = "extract-zip"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz"; + sha512 = "GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg=="; + }; + }; "extsprintf-1.0.0" = { name = "extsprintf"; packageName = "extsprintf"; @@ -20076,13 +20031,13 @@ let sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; - "fp-ts-2.8.2" = { + "fp-ts-2.8.3" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.8.2.tgz"; - sha512 = "YKLBW75Rp+L9DuY1jr7QO6mZLTmJjy7tOqSAMcB2q2kBomqLjBMyV7dotpcnZmUYY6khMsfgYWtPbUDOFcNmkA=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.8.3.tgz"; + sha512 = "oGD3BTSzFCPs9alaI/2gh0SCNKyhPXkpeIBvkXNvnoczHfDAUd2HHtotCdLO0hOTTTTx8VKA0mhhR7LUNo+cKg=="; }; }; "fragment-cache-0.2.1" = { @@ -20850,13 +20805,13 @@ let sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; }; }; - "getmac-5.15.0" = { + "getmac-5.16.0" = { name = "getmac"; packageName = "getmac"; - version = "5.15.0"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/getmac/-/getmac-5.15.0.tgz"; - sha512 = "+XN9PwRDWkZ1xFaQR5GOAPDqlK+eNi5M0QBfqeeJvFJaDrwZzplYg1N8uoOZSB9RtDoPcG58Xq2dOYnbZ23N2Q=="; + url = "https://registry.npmjs.org/getmac/-/getmac-5.16.0.tgz"; + sha512 = "6uY8p55XkkxO7gwLw5IKii29OLOe6qSh8zWFRXJUtf6uGwlGztUZ30xWtQgCAGhOP2aR3Rb5h+TFrG/RKIooAA=="; }; }; "getpass-0.1.6" = { @@ -20985,13 +20940,13 @@ let sha512 = "8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg=="; }; }; - "git-rev-sync-2.0.0" = { + "git-rev-sync-2.1.0" = { name = "git-rev-sync"; packageName = "git-rev-sync"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/git-rev-sync/-/git-rev-sync-2.0.0.tgz"; - sha512 = "vnHFv2eocTmt/wHqZm3ksxtVshK4vptT0cEoumk6hAYRFx3do6Qo7xHBTBCv29+r3ZZCQOQ1i328MUCsYF7AUw=="; + url = "https://registry.npmjs.org/git-rev-sync/-/git-rev-sync-2.1.0.tgz"; + sha512 = "qZWv4D3GBm9sHEq5Jvc2rGuwQbz52mJoNAhe/zZS+rlwft7n8BGAG0QCgXt6m+jxn82IwlpOT3UXY81LkFJufA=="; }; }; "git-semver-tags-2.0.3" = { @@ -21030,15 +20985,6 @@ let sha512 = "kbuvus1dWQB2sSW4cbfTeGpCMd8ge9jx9RKnhXhuJ7tnvT+NIrTVfYZxjtflZddQYcmdOTlkAcjmx7bor+15AQ=="; }; }; - "git-url-parse-11.1.3" = { - name = "git-url-parse"; - packageName = "git-url-parse"; - version = "11.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.1.3.tgz"; - sha512 = "GPsfwticcu52WQ+eHp0IYkAyaOASgYdtsQDIt4rUp6GbiNt1P9ddrh3O0kQB0eD4UJZszVqNT3+9Zwcg40fywA=="; - }; - }; "git-url-parse-11.2.0" = { name = "git-url-parse"; packageName = "git-url-parse"; @@ -21048,6 +20994,15 @@ let sha512 = "KPoHZg8v+plarZvto4ruIzzJLFQoRx+sUs5DQSr07By9IBKguVd+e6jwrFR6/TP6xrCJlNV1tPqLO1aREc7O2g=="; }; }; + "git-url-parse-11.3.0" = { + name = "git-url-parse"; + packageName = "git-url-parse"; + version = "11.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.3.0.tgz"; + sha512 = "i3XNa8IKmqnUqWBcdWBjOcnyZYfN3C1WRvnKI6ouFWwsXCZEnlgbwbm55ZpJ3OJMhfEP/ryFhqW8bBhej3C5Ug=="; + }; + }; "gitconfiglocal-1.0.0" = { name = "gitconfiglocal"; packageName = "gitconfiglocal"; @@ -21751,13 +21706,13 @@ let sha512 = "MBY0wEjvcgJtZUyoqpPvOE1e5qPI0hJaa1gKTqjonSFiCsNHX2lykNjpOPcodmAgH1V06ELxhGnm9kcVzqvi/g=="; }; }; - "graphql-extensions-0.12.4" = { + "graphql-extensions-0.12.5" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.12.4"; + version = "0.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.4.tgz"; - sha512 = "GnR4LiWk3s2bGOqIh6V1JgnSXw2RCH4NOgbCFEWvB6JqWHXTlXnLZ8bRSkCiD4pltv7RHUPWqN/sGh8R6Ae/ag=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.5.tgz"; + sha512 = "mGyGaktGpK3TVBtM0ZoyPX6Xk0mN9GYX9DRyFzDU4k4A2w93nLX7Ebcp+9/O5nHRmgrc0WziYYSmoWq2WNIoUQ=="; }; }; "graphql-subscriptions-1.1.0" = { @@ -22345,13 +22300,13 @@ let sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1"; }; }; - "hasha-5.2.0" = { + "hasha-5.2.1" = { name = "hasha"; packageName = "hasha"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz"; - sha512 = "2W+jKdQbAdSIrggA8Q35Br8qKadTrqCTC8+XZvBWepKDK6m9XkX6Iz1a2yh2KP01kzAR/dpuMeUnocoLYDcskw=="; + url = "https://registry.npmjs.org/hasha/-/hasha-5.2.1.tgz"; + sha512 = "x15jnRSHTi3VmH+oHtVb9kgU/HuKOK8mjK8iCL3dPQXh4YJlUb9YSI8ZLiiqLAIvY2wuDIlZYZppy8vB2XISkQ=="; }; }; "hasher-1.2.0" = { @@ -23102,13 +23057,13 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; - "http-signature-1.3.4" = { + "http-signature-1.3.5" = { name = "http-signature"; packageName = "http-signature"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.4.tgz"; - sha512 = "CbG3io8gUSIxNNSgq+XMjgpTMzAeVRipxVXjuGrDhH5M1a2kZ03w20s8FCLR1NjnnJj10KbvabvckmtQcYNb9g=="; + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.5.tgz"; + sha512 = "NwoTQYSJoFt34jSBbwzDHDofoA61NGXzu6wXh95o1Ry62EnmKjXb/nR/RknLeZ3G/uGwrlKNY2z7uPt+Cdl7Tw=="; }; }; "http-status-1.4.2" = { @@ -24443,13 +24398,13 @@ let sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="; }; }; - "is-callable-1.2.1" = { + "is-callable-1.2.2" = { name = "is-callable"; packageName = "is-callable"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz"; - sha512 = "wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg=="; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz"; + sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="; }; }; "is-canonical-base64-1.1.1" = { @@ -26288,13 +26243,13 @@ let sha1 = "13f14ce02eed4e981297b64eb9e3b932e2dd13dc"; }; }; - "json-pointer-0.6.0" = { + "json-pointer-0.6.1" = { name = "json-pointer"; packageName = "json-pointer"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-pointer/-/json-pointer-0.6.0.tgz"; - sha1 = "8e500550a6aac5464a473377da57aa6cc22828d7"; + url = "https://registry.npmjs.org/json-pointer/-/json-pointer-0.6.1.tgz"; + sha512 = "3OvjqKdCBvH41DLpV4iSt6v2XhZXV1bPB4OROuknvUXI7ZQNofieCPkmE26stEJ9zdQuvIxDHCuYhfgxFAAs+Q=="; }; }; "json-refs-2.1.7" = { @@ -28503,6 +28458,15 @@ let sha1 = "78b41eafe1405fa966459ea4193fd502d084524b"; }; }; + "lodash.forown-4.4.0" = { + name = "lodash.forown"; + packageName = "lodash.forown"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.forown/-/lodash.forown-4.4.0.tgz"; + sha1 = "85115cf04f73ef966eced52511d3893cc46683af"; + }; + }; "lodash.get-4.4.2" = { name = "lodash.get"; packageName = "lodash.get"; @@ -30042,13 +30006,13 @@ let sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw=="; }; }; - "marked-1.1.1" = { + "marked-1.2.0" = { name = "marked"; packageName = "marked"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-1.1.1.tgz"; - sha512 = "mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw=="; + url = "https://registry.npmjs.org/marked/-/marked-1.2.0.tgz"; + sha512 = "tiRxakgbNPBr301ihe/785NntvYyhxlqcL3YaC8CaxJQh7kiaEtrN9B/eK2I2943Yjkh5gw25chYFDQhOMCwMA=="; }; }; "marked-terminal-4.1.0" = { @@ -30690,13 +30654,13 @@ let sha1 = "401fdec7ec21cdb9e03cd3d3021398da21b27085"; }; }; - "metals-languageclient-0.3.1" = { + "metals-languageclient-0.3.2" = { name = "metals-languageclient"; packageName = "metals-languageclient"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.3.1.tgz"; - sha512 = "+bxUq6HmdHlqEBIyCyr41KsoLJLQ4DRBn9sVXPhZUlhoA/pBMNSq4LVlLUEnBvRYMhxwbAGV6XYuUMKd0vMokA=="; + url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.3.2.tgz"; + sha512 = "qpog+/luf+h3i6zvgDu05SMmDqEsPMYbcamy+odlysA9iT31k8j0mknR2uGAQ1ZLL4oWYCSct+2/zpxrYLiDng=="; }; }; "metalsmith-2.3.0" = { @@ -30897,6 +30861,15 @@ let sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; }; }; + "mime-db-1.45.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.45.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz"; + sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w=="; + }; + }; "mime-types-2.1.18" = { name = "mime-types"; packageName = "mime-types"; @@ -31464,15 +31437,6 @@ let sha512 = "Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg=="; }; }; - "moment-2.27.0" = { - name = "moment"; - packageName = "moment"; - version = "2.27.0"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz"; - sha512 = "al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="; - }; - }; "moment-2.28.0" = { name = "moment"; packageName = "moment"; @@ -31482,6 +31446,15 @@ let sha512 = "Z5KOjYmnHyd/ukynmFd/WwyXHd7L4J9vTI/nn5Ap9AVUgaAE15VvQ9MOGmJJygEUklupqIrFnor/tjTwRU+tQw=="; }; }; + "moment-2.29.0" = { + name = "moment"; + packageName = "moment"; + version = "2.29.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz"; + sha512 = "z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA=="; + }; + }; "moment-2.7.0" = { name = "moment"; packageName = "moment"; @@ -32455,13 +32428,13 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; - "netlify-4.5.1" = { + "netlify-4.6.0" = { name = "netlify"; packageName = "netlify"; - version = "4.5.1"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-4.5.1.tgz"; - sha512 = "Ke6lXulj8Jd4qzAmHv5VHvqAWoV+EkQUKiBDvpZuUAGA12UDRP4vl7gvJkxmwZ5Z/trIOgiOC9n8y/NHlvFbXA=="; + url = "https://registry.npmjs.org/netlify/-/netlify-4.6.0.tgz"; + sha512 = "wmx0bs64TQH1DtJs+5NyYUy9f+VvrBRRpGXNgzFYyaVsect/lxycdkDZwWQFrcvTlCf9lGHlRu2Gr0uC6+/k6Q=="; }; }; "netlify-redirect-parser-2.5.0" = { @@ -32879,13 +32852,13 @@ let sha512 = "WH0WKGi+a4i4DUt2mHnvocex/xPLp9pYt5R6M2JdFB7pJ7Z34hveZ4nDTGTiLXCkitA9T8HFZjhinBCiVHYcWw=="; }; }; - "node-gyp-6.1.0" = { + "node-gyp-7.1.0" = { name = "node-gyp"; packageName = "node-gyp"; - version = "6.1.0"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-6.1.0.tgz"; - sha512 = "h4A2zDlOujeeaaTx06r4Vy+8MZ1679lU+wbCKDS4ZtvY2A37DESo37oejIw0mtmR3+rvNwts5B6Kpt1KrNYdNw=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.0.tgz"; + sha512 = "rjlHQlnl1dqiDZxZYiKqQdrjias7V+81OVR5PTzZioCBtWkNdrKy06M05HLKxy/pcKikKRCabeDRoZaEc6nIjw=="; }; }; "node-gyp-build-3.7.0" = { @@ -33743,13 +33716,13 @@ let sha512 = "LP5F1dhjULEJV5oGRg6ROztH2FddzttrrUEwq5J2GB2Zy938mg0vwt1+Rthn/qqDHtj4Qgq21duNGHh+Ew1wUg=="; }; }; - "oas-resolver-2.5.0" = { + "oas-resolver-2.5.1" = { name = "oas-resolver"; packageName = "oas-resolver"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.0.tgz"; - sha512 = "69OF0iCTDXXp3ttAEPUcCz/eSJd6eyrWAIrPit2wnL7Q4Ti82Q2dXQVMdz5S+JPCgtZOETnTgPs/EsMuH2vIzg=="; + url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.1.tgz"; + sha512 = "MdMY8YAnCdFTAt5+CTC/aYEOSIFt+ICOWxQvKKxsIHjc0/0tG6V4DzbkHW9SWWqUmDPiHDxJsi79kjsE/1PJ5g=="; }; }; "oas-schema-walker-1.1.5" = { @@ -34122,13 +34095,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.139.0" = { + "office-ui-fabric-react-7.143.0" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.139.0"; + version = "7.143.0"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.139.0.tgz"; - sha512 = "kqt3LUKUJfPie/32bmWxMcn3VdZoH5yiicdOj8B/huu1WPDDmhM+UlsUX2AmLeAEmqkH8XZxlgpmym96dhstaA=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.143.0.tgz"; + sha512 = "wXYvx0/tPKCQB1l1E8dUCE9udsx+M5TWKoM0sTKoKnBM0qf8q1FvROA+ZEoQ9tlEEohmRpxxiRdrZjCDyV/U3Q=="; }; }; "omggif-1.0.10" = { @@ -34374,6 +34347,15 @@ let sha512 = "xbYCJib4spUdmcs0g/2mK1nKo/jO2T7INClWd/beL7PFkXRWgr8B23ssDHX/USPn2M2IjDR5UdpYs6I67SnTSA=="; }; }; + "open-7.3.0" = { + name = "open"; + packageName = "open"; + version = "7.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-7.3.0.tgz"; + sha512 = "mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw=="; + }; + }; "openapi-default-setter-2.1.0" = { name = "openapi-default-setter"; packageName = "openapi-default-setter"; @@ -35859,6 +35841,15 @@ let sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; }; }; + "parseqs-0.0.6" = { + name = "parseqs"; + packageName = "parseqs"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz"; + sha512 = "jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w=="; + }; + }; "parserlib-1.1.1" = { name = "parserlib"; packageName = "parserlib"; @@ -35886,6 +35877,15 @@ let sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a"; }; }; + "parseuri-0.0.6" = { + name = "parseuri"; + packageName = "parseuri"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz"; + sha512 = "AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow=="; + }; + }; "parseurl-1.3.3" = { name = "parseurl"; packageName = "parseurl"; @@ -36922,13 +36922,13 @@ let sha512 = "03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw=="; }; }; - "postcss-7.0.34" = { + "postcss-7.0.35" = { name = "postcss"; packageName = "postcss"; - version = "7.0.34"; + version = "7.0.35"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.34.tgz"; - sha512 = "H/7V2VeNScX9KE83GDrDZNiGT1m2H+UTnlinIzhjlLX9hfMUn1mHNnGeX81a1c8JSBdBvqk7c2ZOG6ZPn5itGw=="; + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz"; + sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; }; }; "postcss-calc-7.0.4" = { @@ -37039,13 +37039,13 @@ let sha512 = "7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA=="; }; }; - "postcss-load-config-2.1.1" = { + "postcss-load-config-2.1.2" = { name = "postcss-load-config"; packageName = "postcss-load-config"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.1.tgz"; - sha512 = "D2ENobdoZsW0+BHy4x1CAkXtbXtYWYRIxL/JbtRBqrRGOPtJ2zoga/bEZWhV/ShWB5saVxJMzbMdSyA/vv4tXw=="; + url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz"; + sha512 = "/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw=="; }; }; "postcss-markdown-0.36.0" = { @@ -37327,6 +37327,15 @@ let sha512 = "LpmQjfRWyabc+fRygxZjpRxfhRf9u/fdlKf4VHG4TSPbV2XNsuISzYW1KL+1aQzx53CAppa1bKG4APIB/DOXXw=="; }; }; + "postcss-reporter-7.0.1" = { + name = "postcss-reporter"; + packageName = "postcss-reporter"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.1.tgz"; + sha512 = "R9AK80KIqqMb+lwGRBcRkXS7r96VCTxrZvvrfibyA/dWjqctwx7leHMCC05A9HbW8PnChwOWwrmISwp5HQu5wg=="; + }; + }; "postcss-resolve-nested-selector-0.1.1" = { name = "postcss-resolve-nested-selector"; packageName = "postcss-resolve-nested-selector"; @@ -37408,13 +37417,13 @@ let sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg=="; }; }; - "postcss-selector-parser-6.0.3" = { + "postcss-selector-parser-6.0.4" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; - version = "6.0.3"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.3.tgz"; - sha512 = "0ClFaY4X1ra21LRqbW6y3rUbWcxnSVkDFG57R7Nxus9J9myPFlv+jYDMohzpkBx0RrjjiqjtycpchQ+PLGmZ9w=="; + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz"; + sha512 = "gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw=="; }; }; "postcss-svgo-4.0.2" = { @@ -38146,13 +38155,13 @@ let sha512 = "pb8kTchL+1Ceg4lFd5XUpK8PdWacbvV5SK2ULH2ebrYtl4GjJmS24m6CKME67jzV53tbJxHlnNOSqQHbTsR9JQ=="; }; }; - "protocol-buffers-encodings-1.1.0" = { + "protocol-buffers-encodings-1.1.1" = { name = "protocol-buffers-encodings"; packageName = "protocol-buffers-encodings"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/protocol-buffers-encodings/-/protocol-buffers-encodings-1.1.0.tgz"; - sha512 = "SmjEuAf3hc3h3rWZ6V1YaaQw2MNJWK848gLJgzx/sefOJdNLujKinJVXIS0q2cBQpQn2Q32TinawZyDZPzm4kQ=="; + url = "https://registry.npmjs.org/protocol-buffers-encodings/-/protocol-buffers-encodings-1.1.1.tgz"; + sha512 = "5aFshI9SbhtcMiDiZZu3g2tMlZeS5lhni//AGJ7V34PQLU5JA91Cva7TIs6inZhYikS3OpnUzAUuL6YtS0CyDA=="; }; }; "protocols-1.4.8" = { @@ -39019,6 +39028,15 @@ let sha512 = "hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA=="; }; }; + "puppeteer-5.3.1" = { + name = "puppeteer"; + packageName = "puppeteer"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-5.3.1.tgz"; + sha512 = "YTM1RaBeYrj6n7IlRXRYLqJHF+GM7tasbvrNFx6w1S16G76NrPq7oYFKLDO+BQsXNtS8kW2GxWCXjIMPvfDyaQ=="; + }; + }; "purgecss-2.3.0" = { name = "purgecss"; packageName = "purgecss"; @@ -39361,6 +39379,15 @@ let sha512 = "hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ=="; }; }; + "ramda-0.27.1" = { + name = "ramda"; + packageName = "ramda"; + version = "0.27.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ramda/-/ramda-0.27.1.tgz"; + sha512 = "PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw=="; + }; + }; "randexp-0.4.6" = { name = "randexp"; packageName = "randexp"; @@ -39604,22 +39631,22 @@ let sha512 = "81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag=="; }; }; - "react-dropdown-1.8.0" = { + "react-dropdown-1.9.0" = { name = "react-dropdown"; packageName = "react-dropdown"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-dropdown/-/react-dropdown-1.8.0.tgz"; - sha512 = "B1vkFk2vkUOf5JFd+Gk8yJdZkSoE4F689Lb93vc0pLcu6cabqlGMYgIzLJuzT+BMy7guk+OXbLDs0pMX8BvEbw=="; + url = "https://registry.npmjs.org/react-dropdown/-/react-dropdown-1.9.0.tgz"; + sha512 = "BDApCUhs0qHqnFW3b54SuqI200FOOsmiy0dejdmtdTn/MMY11jcou3CLX1oT2Qa1PdN7viTyAGT8YCpK5qb9xg=="; }; }; - "react-hot-loader-4.12.21" = { + "react-hot-loader-4.13.0" = { name = "react-hot-loader"; packageName = "react-hot-loader"; - version = "4.12.21"; + version = "4.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.12.21.tgz"; - sha512 = "Ynxa6ROfWUeKWsTHxsrL2KMzujxJVPjs385lmB2t5cHUxdoRPGind9F00tOkdc1l5WBleOF4XEAMILY1KPIIDA=="; + url = "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.13.0.tgz"; + sha512 = "JrLlvUPqh6wIkrK2hZDfOyq/Uh/WeVEr8nc7hkn2/3Ul0sx1Kr5y4kOGNacNRoj7RhwLNcQ3Udf1KJXrqc0ZtA=="; }; }; "react-is-16.13.1" = { @@ -39901,13 +39928,13 @@ let sha512 = "+oZJurc4hXpaaqsN68GoZGQAQIA3qr09Or4fqEsargABnbe5Aau8hFn6ISVleT3cpY/0n/8drn7huyyEvTbghA=="; }; }; - "readdir-glob-1.0.0" = { + "readdir-glob-1.1.0" = { name = "readdir-glob"; packageName = "readdir-glob"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.0.0.tgz"; - sha512 = "km0DIcwQVZ1ZUhXhMWpF74/Wm5aFEd5/jDiVWF1Hkw2myPQovG8vCQ8+FQO2KXE9npQQvCnAMZhhWuUee4WcCQ=="; + url = "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.0.tgz"; + sha512 = "KgT0oXPIDQRRRYFf+06AUaodICTep2Q5635BORLzTEzp7rEqcR14a47j3Vzm3ix7FeI1lp8mYyG7r8lTB06Pyg=="; }; }; "readdir-scoped-modules-1.1.0" = { @@ -41359,13 +41386,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.28.1" = { + "rollup-2.28.2" = { name = "rollup"; packageName = "rollup"; - version = "2.28.1"; + version = "2.28.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.28.1.tgz"; - sha512 = "DOtVoqOZt3+FjPJWLU8hDIvBjUylc9s6IZvy76XklxzcLvAQLtVAG/bbhsMhcWnYxC0TKKcf1QQ/tg29zeID0Q=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.28.2.tgz"; + sha512 = "8txbsFBFLmm9Xdt4ByTOGa9Muonmc8MfNjnGAR8U8scJlF1ZW7AgNZa7aqBXaKtlvnYP/ab++fQIq9dB9NWUbg=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -41413,6 +41440,15 @@ let sha512 = "/5bxtUPkDHyBJAKketb4NfaeZjL5yLZdeUihSfbF2PQMz+rSTEb8ARKoOl3UBT4m7/X+QOXJo3sLTcq+yMMYTA=="; }; }; + "rollup-plugin-terser-7.0.2" = { + name = "rollup-plugin-terser"; + packageName = "rollup-plugin-terser"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz"; + sha512 = "w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ=="; + }; + }; "rollup-pluginutils-2.8.2" = { name = "rollup-pluginutils"; packageName = "rollup-pluginutils"; @@ -42628,15 +42664,6 @@ let sha1 = "3596e6307a781544f591f37da618360f31db57b1"; }; }; - "shelljs-0.7.7" = { - name = "shelljs"; - packageName = "shelljs"; - version = "0.7.7"; - src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz"; - sha1 = "b2f5c77ef97148f4b4f6e22682e10bba8667cff1"; - }; - }; "shelljs-0.7.8" = { name = "shelljs"; packageName = "shelljs"; @@ -43105,6 +43132,15 @@ let sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; }; }; + "slug-3.3.5" = { + name = "slug"; + packageName = "slug"; + version = "3.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/slug/-/slug-3.3.5.tgz"; + sha512 = "d/9yTbJDtSIhJThaNRP/U5uxwCl0mWIlV42JmKSfvg8t7DiVt69G8rAWTc0FWhaQOier0fiNAWVs7ctvVhK1RA=="; + }; + }; "slugify-1.4.5" = { name = "slugify"; packageName = "slugify"; @@ -43231,22 +43267,22 @@ let sha512 = "wwrMIEDozfLJ8LmakCsCC1FQ0siIX5icCQPCbUKKgRbeVsZ27NjPJs37BpTXX4rcHkaWpe8TbH3yOtp23qmszg=="; }; }; - "snyk-cpp-plugin-1.5.0" = { + "snyk-cpp-plugin-2.0.0" = { name = "snyk-cpp-plugin"; packageName = "snyk-cpp-plugin"; - version = "1.5.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-1.5.0.tgz"; - sha512 = "nBZ0cBmpT4RVJUFzYydQJOxwjcdXk7NtRJE1UIIOafQa2FcvIl3GBezfrCJ6pu61svOAf5r8Qi/likx6F15K1A=="; + url = "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-2.0.0.tgz"; + sha512 = "/xcDy8H5wxhk+4E9e8zDDGfcNo5g+zpwy585sCDkH5KpHdZHmguPi0GmZ9ZCBTuGIodeTIqsDqkBiA1WXSH7+w=="; }; }; - "snyk-docker-plugin-3.21.0" = { + "snyk-docker-plugin-3.24.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "3.21.0"; + version = "3.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.21.0.tgz"; - sha512 = "A7oJS3QGR7bwm1qeeczCb8PDfi8go1KM6VWph/drJHBQ7JxVKKLb3j4AzrMmIM96mGZFbmyNOL4pznwumaOM8g=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.24.0.tgz"; + sha512 = "ZKYNZkfCv90/SzBvZcQlEbfJ5ctOvfltZ5Km/z6N5IF+Peetos6VRwxcX8Jenq204ec0bTnBQ0h0OpTIGkMQnQ=="; }; }; "snyk-go-parser-1.4.1" = { @@ -43267,13 +43303,13 @@ let sha512 = "FAM56z3bl1iuxeqkCEA/jyZ2hpwkQK8xQxQbhR+QppEK5lole7w1PQyWYgZAJ9oRY/BU32zdRAJwGuZbhk7G2Q=="; }; }; - "snyk-gradle-plugin-3.6.3" = { + "snyk-gradle-plugin-3.7.0" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.6.3"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.6.3.tgz"; - sha512 = "j/eQSLSsK3DHmvVX2fNig4+ugYrKlCOV8Xvo6OYFkNzhMpdyNFiGWTS1uyP1HH75Gyc78MaLANMgjlSYePukzQ=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.7.0.tgz"; + sha512 = "j2HJCX0RCvRsYLvF+MkA5io175QIWh6jVjHNXRYOL6ls0ZOhn0BLLs1Ilm8WkT+jTmaZt+Wnh8wBHDMhKlGcew=="; }; }; "snyk-module-1.9.1" = { @@ -43321,6 +43357,15 @@ let sha512 = "0zbmtidYLI2ia/DQD4rZm2YKrhfHLvHlVBdF2cMAGPwhOoKW5ovG9eBO4wNQdvjxNi7b4VeUyAj8SfuhjDraDQ=="; }; }; + "snyk-nodejs-lockfile-parser-1.29.0" = { + name = "snyk-nodejs-lockfile-parser"; + packageName = "snyk-nodejs-lockfile-parser"; + version = "1.29.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.29.0.tgz"; + sha512 = "pQL5fe0lypifou0QAvirTsj0Ez7zHjwBUUq9U5ManMfPqFt89nwIK/5/xW0o3OiFM56Iu3uLUQXM/BhYqBokzQ=="; + }; + }; "snyk-nuget-plugin-1.19.3" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; @@ -43483,13 +43528,13 @@ let sha1 = "2609601f59e6a7fab436a53be3d333fbbfcbd30a"; }; }; - "socket.io-parser-3.3.0" = { + "socket.io-parser-3.3.1" = { name = "socket.io-parser"; packageName = "socket.io-parser"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.0.tgz"; - sha512 = "hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng=="; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.1.tgz"; + sha512 = "1QLvVAe8dTz+mKmZ07Swxt+LAo4Y1ff50rlyoEx00TQmDFVQYPfcqGvIDJLGaBdhdNCecXtyKpD+EgKGcmmbuQ=="; }; }; "socket.io-parser-3.4.1" = { @@ -43654,13 +43699,13 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; - "sonic-boom-1.1.0" = { + "sonic-boom-1.3.0" = { name = "sonic-boom"; packageName = "sonic-boom"; - version = "1.1.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.1.0.tgz"; - sha512 = "JyOf+Xt7GBN4tAic/DD1Bitw6OMgSHAnswhPeOiLpfRoSjPNjEIi73UF3OxHzhSNn9WavxGuCZzprFCGFSNwog=="; + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.3.0.tgz"; + sha512 = "4nX6OYvOYr6R76xfQKi6cZpTO3YSWe/vd+QdIfoH0lBy0MnPkeAbb2rRWgmgADkXUeCKPwO1FZAKlAVWAadELw=="; }; }; "sorcery-0.10.0" = { @@ -45085,24 +45130,6 @@ let sha512 = "ztP79ug6S+I7td0Nd2GBeIKCm+vA54c+e60FY87metz5n/l6ydPELd2lxsljz8OpIhsRM9HkIiAwz85+S5G5/A=="; }; }; - "stream.finished-1.2.0" = { - name = "stream.finished"; - packageName = "stream.finished"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream.finished/-/stream.finished-1.2.0.tgz"; - sha512 = "xSp45f/glqd035qAtFUxAGvhotjY/EfqDNV+rQW8o7ffligiOjPaguTEvRzeQAhiQMCdkPEBrp5++S/rQyavWQ=="; - }; - }; - "stream.pipeline-shim-1.1.0" = { - name = "stream.pipeline-shim"; - packageName = "stream.pipeline-shim"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream.pipeline-shim/-/stream.pipeline-shim-1.1.0.tgz"; - sha512 = "pSi/SZZDbSA5l3YYjSmJadCoD74/qSe79r9ZVR21lD4bpf+khn5Umi6AlfJrD8I0KQfGSqm/7Yp48dmithM+Vw=="; - }; - }; "streamroller-2.2.4" = { name = "streamroller"; packageName = "streamroller"; @@ -46616,6 +46643,15 @@ let sha512 = "WrH/pui8YCwmeiAoxV+lpRH9HpRtgBhSR2ViBPgpGb/wnYDzp21R4MN45fsCGvLROvY67o3byhJRYRONJyImVQ=="; }; }; + "tempy-0.7.1" = { + name = "tempy"; + packageName = "tempy"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tempy/-/tempy-0.7.1.tgz"; + sha512 = "vXPxwOyaNVi9nyczO16mxmHGpl6ASC5/TVhRRHpqeYHvKQm58EaWNvZXxAhR0lYYnBOQFjXjhzeLsaXdjxLjRg=="; + }; + }; "term-canvas-0.0.5" = { name = "term-canvas"; packageName = "term-canvas"; @@ -46670,6 +46706,15 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; + "terser-5.3.3" = { + name = "terser"; + packageName = "terser"; + version = "5.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/terser/-/terser-5.3.3.tgz"; + sha512 = "vRQDIlD+2Pg8YMwVK9kMM3yGylG95EIwzBai1Bw7Ot4OBfn3VP1TZn3EWx4ep2jERN/AmnVaTiGuelZSN7ds/A=="; + }; + }; "terser-webpack-plugin-1.4.5" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; @@ -47165,6 +47210,15 @@ let sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ=="; }; }; + "tmp-promise-3.0.2" = { + name = "tmp-promise"; + packageName = "tmp-promise"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.2.tgz"; + sha512 = "OyCLAKU1HzBjL6Ev3gxUeraJNlbNingmi8IrHHEsYH8LTmEuhvYfqvhn2F/je+mjf4N58UmZ96OMEy1JanSCpA=="; + }; + }; "tmpl-1.0.4" = { name = "tmpl"; packageName = "tmpl"; @@ -47822,13 +47876,13 @@ let sha512 = "I9Nmly0ufJoZRMuAT9d5ijsC2B7oSPvUnOJt/GhgoATlPGYfa17VicDKPcqwUCrHpOkCxr/ybLYwbnS4cOxmvQ=="; }; }; - "ts-log-2.1.4" = { + "ts-log-2.2.3" = { name = "ts-log"; packageName = "ts-log"; - version = "2.1.4"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ts-log/-/ts-log-2.1.4.tgz"; - sha512 = "P1EJSoyV+N3bR/IWFeAqXzKPZwHpnLY6j7j58mAvewHRipo+BQM2Y1f9Y9BjEQznKwgqqZm7H8iuixmssU7tYQ=="; + url = "https://registry.npmjs.org/ts-log/-/ts-log-2.2.3.tgz"; + sha512 = "XvB+OdKSJ708Dmf9ore4Uf/q62AYDTzFcAdxc8KNML1mmAWywRFVt/dn1KYJH8Agt5UJNujfM3znU5PxgAzA2w=="; }; }; "ts-node-8.10.2" = { @@ -48182,6 +48236,15 @@ let sha512 = "n+UXrN8i5ioo7kqT/nF8xsEzLaqFra7k32SEsSPwvXVGyAcRgV/FUQN/sgfptJTR1oRmmq7z4IXMFSM7im7C9A=="; }; }; + "type-fest-0.16.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz"; + sha512 = "eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg=="; + }; + }; "type-fest-0.3.1" = { name = "type-fest"; packageName = "type-fest"; @@ -48344,6 +48407,15 @@ let sha512 = "+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ=="; }; }; + "ua-parser-js-0.7.22" = { + name = "ua-parser-js"; + packageName = "ua-parser-js"; + version = "0.7.22"; + src = fetchurl { + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.22.tgz"; + sha512 = "YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q=="; + }; + }; "uc.micro-1.0.6" = { name = "uc.micro"; packageName = "uc.micro"; @@ -48371,13 +48443,13 @@ let sha512 = "Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA=="; }; }; - "uglify-js-3.10.4" = { + "uglify-js-3.11.0" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.10.4"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.4.tgz"; - sha512 = "kBFT3U4Dcj4/pJ52vfjCSfyLyvG9VYYuGYPmrPvAxRw/i7xHiT4VvCev+uiEMcEEiu6UNB6KgWmGtSUYIWScbw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.0.tgz"; + sha512 = "e1KQFRCpOxnrJsJVqDUCjURq+wXvIn7cK2sRAx9XL3HYLL9aezOP4Pb1+Y3/o693EPk111Yj2Q+IUXxcpHlygQ=="; }; }; "uglify-js-3.4.10" = { @@ -49316,6 +49388,15 @@ let sha512 = "9y+Kds0+LoLG6yN802wVXoIfxYEwh3FlZwzMwpCZp62S2i1/Jzeqb9Eeeju3NSHccGGasfGlK5/vEHbAifYRDg=="; }; }; + "update-notifier-4.1.3" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz"; + sha512 = "Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A=="; + }; + }; "upnp-device-client-1.0.2" = { name = "upnp-device-client"; packageName = "upnp-device-client"; @@ -49532,15 +49613,6 @@ let sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; }; }; - "uslug-1.0.4" = { - name = "uslug"; - packageName = "uslug"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/uslug/-/uslug-1.0.4.tgz"; - sha1 = "b9a22f0914e0a86140633dacc302e5f4fa450677"; - }; - }; "ut_metadata-3.5.1" = { name = "ut_metadata"; packageName = "ut_metadata"; @@ -49919,6 +49991,15 @@ let sha1 = "d826b89f7490732fabc0c0ed693ed475dcb29ebf"; }; }; + "varint-5.0.2" = { + name = "varint"; + packageName = "varint"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/varint/-/varint-5.0.2.tgz"; + sha512 = "lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow=="; + }; + }; "vary-1.1.2" = { name = "vary"; packageName = "vary"; @@ -49973,265 +50054,274 @@ let sha1 = "cfde751860a15822db3b132bc59b116a4adaf01b"; }; }; - "vega-5.15.0" = { + "vega-5.16.1" = { name = "vega"; packageName = "vega"; - version = "5.15.0"; + version = "5.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega/-/vega-5.15.0.tgz"; - sha512 = "uygUtkZJm3/HNvNGLQSugZld4qvaiOMtH34tOGuS/MSGj7MaP0CLoFrthlas30lyMPQ42UfzX8tk5X+I91dFKQ=="; + url = "https://registry.npmjs.org/vega/-/vega-5.16.1.tgz"; + sha512 = "bqovD23iKvIgFnTkP9WqapJbaejhgdED6YjAVWIwG8hsDq5Lf/ZNstJJWPiSDu3j785GQU/o6ZU3RXywdH4dJA=="; }; }; - "vega-canvas-1.2.4" = { + "vega-canvas-1.2.5" = { name = "vega-canvas"; packageName = "vega-canvas"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/vega-canvas/-/vega-canvas-1.2.4.tgz"; - sha512 = "BI44AIAa13xSindGXMQm0FAhI2zx3F3conFmXhey63hqGsfvH/19nv+A0PEvSVa/lK4iPneMTpw583iffDiq3w=="; + url = "https://registry.npmjs.org/vega-canvas/-/vega-canvas-1.2.5.tgz"; + sha512 = "6+jFEd6s7G088npH0+YuN1JTRxMYsjb1uXbwqcJ8zSP7gFR4f3tg/yA/BHU0+JbvLnxnScr61HYpDXAQ59YW3w=="; }; }; - "vega-crossfilter-4.0.4" = { + "vega-crossfilter-4.0.5" = { name = "vega-crossfilter"; packageName = "vega-crossfilter"; - version = "4.0.4"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.0.4.tgz"; - sha512 = "mXKhHxkgxJPwtTrMgK3Uw1bStfD+rmfKXsUvdIh1ZwmpheGOQM2Uflo3tQNh9j9wqu8xHywCcddohKpSRBt8HQ=="; + url = "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.0.5.tgz"; + sha512 = "yF+iyGP+ZxU7Tcj5yBsMfoUHTCebTALTXIkBNA99RKdaIHp1E690UaGVLZe6xde2n5WaYpho6I/I6wdAW3NXcg=="; }; }; - "vega-dataflow-5.7.2" = { + "vega-dataflow-5.7.3" = { name = "vega-dataflow"; packageName = "vega-dataflow"; - version = "5.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-dataflow/-/vega-dataflow-5.7.2.tgz"; - sha512 = "O6CEchGAQtEhDKfI3UHWVUbUcXSMsq5JrefvvB2hldx3XbHkEQioXtgAnK6OosyKpB1dJlVvFRMR40pwdNO1hw=="; - }; - }; - "vega-encode-4.8.2" = { - name = "vega-encode"; - packageName = "vega-encode"; - version = "4.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-encode/-/vega-encode-4.8.2.tgz"; - sha512 = "+PEimVqZysvLEScU/EJrpElBrNMcDHeVGmMhLkswxfVrFix4ialV3/iGB9Wcr5g1pOQcsBdNn7qUy2bjvAvIvA=="; - }; - }; - "vega-event-selector-2.0.5" = { - name = "vega-event-selector"; - packageName = "vega-event-selector"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-event-selector/-/vega-event-selector-2.0.5.tgz"; - sha512 = "bRm02Fnd+YrZDni0yr5y9Co1Z1zrjd7hkwY+gi/Y7zDFOxnESGrbYtpHvWT8fL9AqmYU3wDpsJZGyP4htRUNAQ=="; - }; - }; - "vega-expression-2.7.0" = { - name = "vega-expression"; - packageName = "vega-expression"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-expression/-/vega-expression-2.7.0.tgz"; - sha512 = "fMnHtcFfVAxuwjsKGh0qqP8OJNVABGIg0aSp33Jxh1D86LwDwaRe+EtwF1fv8YKD2AEiBl4UObC68QMT56MekQ=="; - }; - }; - "vega-force-4.0.6" = { - name = "vega-force"; - packageName = "vega-force"; - version = "4.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-force/-/vega-force-4.0.6.tgz"; - sha512 = "acB5DshAhSbaxKAk/DgzUK4ondTAZbD3tRY4Cy0NmZL+6QqM3RRePM1PQBAFAQMp9kXT9X/fh8tOlMKx/rwQnQ=="; - }; - }; - "vega-format-1.0.3" = { - name = "vega-format"; - packageName = "vega-format"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-format/-/vega-format-1.0.3.tgz"; - sha512 = "hZpYZM/KRNnd+qmJ5oCGHvOzlxga9d2anqw+ji/jbA41piMzsyAa2f8CAoHpXgzsZNkGp+BL2Oya+251uZOjQw=="; - }; - }; - "vega-functions-5.7.3" = { - name = "vega-functions"; - packageName = "vega-functions"; version = "5.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.7.3.tgz"; - sha512 = "9X9bKhKZvglfRaFIDg2yRyBzayabsQHRAyVk0bJBU04mgfj6myKRhO6JF4av+LgNHyJFsOPeJxkiOYZ3x6Z6rg=="; + url = "https://registry.npmjs.org/vega-dataflow/-/vega-dataflow-5.7.3.tgz"; + sha512 = "2ipzKgQUmbSXcQBH+9XF0BYbXyZrHvjlbJ8ifyRWYQk78w8kMvE6wy/rcdXYK6iVZ6aAbEDDT7jTI+rFt3tGLA=="; }; }; - "vega-geo-4.3.6" = { + "vega-encode-4.8.3" = { + name = "vega-encode"; + packageName = "vega-encode"; + version = "4.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-encode/-/vega-encode-4.8.3.tgz"; + sha512 = "JoRYtaV2Hs8spWLzTu/IjR7J9jqRmuIOEicAaWj6T9NSZrNWQzu2zF3IVsX85WnrIDIRUDaehXaFZvy9uv9RQg=="; + }; + }; + "vega-event-selector-2.0.6" = { + name = "vega-event-selector"; + packageName = "vega-event-selector"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-event-selector/-/vega-event-selector-2.0.6.tgz"; + sha512 = "UwCu50Sqd8kNZ1X/XgiAY+QAyQUmGFAwyDu7y0T5fs6/TPQnDo/Bo346NgSgINBEhEKOAMY1Nd/rPOk4UEm/ew=="; + }; + }; + "vega-expression-3.0.0" = { + name = "vega-expression"; + packageName = "vega-expression"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-expression/-/vega-expression-3.0.0.tgz"; + sha512 = "/ObjIOK94MB+ziTuh8HZt2eWlKUPT/piRJLal5tx5QL1sQbfRi++7lHKTaKMLXLqc4Xqp9/DewE3PqQ6tYzaUA=="; + }; + }; + "vega-force-4.0.7" = { + name = "vega-force"; + packageName = "vega-force"; + version = "4.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-force/-/vega-force-4.0.7.tgz"; + sha512 = "pyLKdwXSZ9C1dVIqdJOobvBY29rLvZjvRRTla9BU/nMwAiAGlGi6WKUFdRGdneyGe3zo2nSZDTZlZM/Z5VaQNA=="; + }; + }; + "vega-format-1.0.4" = { + name = "vega-format"; + packageName = "vega-format"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-format/-/vega-format-1.0.4.tgz"; + sha512 = "oTAeub3KWm6nKhXoYCx1q9G3K43R6/pDMXvqDlTSUtjoY7b/Gixm8iLcir5S9bPjvH40n4AcbZsPmNfL/Up77A=="; + }; + }; + "vega-functions-5.8.0" = { + name = "vega-functions"; + packageName = "vega-functions"; + version = "5.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.8.0.tgz"; + sha512 = "xaUqWZHEX+EuJuKfN0Biux3rrCHDEHmMbW7LHYyyEqguR0i6+zhtOSUEWmYqDfzB/+BlIwCk5Vif6q6/mzJxbQ=="; + }; + }; + "vega-geo-4.3.7" = { name = "vega-geo"; packageName = "vega-geo"; - version = "4.3.6"; + version = "4.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/vega-geo/-/vega-geo-4.3.6.tgz"; - sha512 = "miRnxnf3KSgmHMR0H8y3NSg58BnijVtxg508PDrw3T4ARRYxGf5yglcEYFcc06iRYTV3B43pOg0Se5dLowmTEw=="; + url = "https://registry.npmjs.org/vega-geo/-/vega-geo-4.3.7.tgz"; + sha512 = "5HC1D9Z/WYuM1Gmlk8PxuRKgeN8snNWsfKO4E9PTmR7wo7tuU/2SGlRoE27aTsgwMMpBIrpRbSgKtgh5l/fMUQ=="; }; }; - "vega-hierarchy-4.0.8" = { + "vega-hierarchy-4.0.9" = { name = "vega-hierarchy"; packageName = "vega-hierarchy"; - version = "4.0.8"; + version = "4.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/vega-hierarchy/-/vega-hierarchy-4.0.8.tgz"; - sha512 = "8O2asfoAEaW8Hfu/06m6t5BErrNo0OJzU8XyKon8aeGY2YbQMKT7fiEzUrzDC39Zb2suThuzBOjpcwiu7rh/Hg=="; + url = "https://registry.npmjs.org/vega-hierarchy/-/vega-hierarchy-4.0.9.tgz"; + sha512 = "4XaWK6V38/QOZ+vllKKTafiwL25m8Kd+ebHmDV+Q236ONHmqc/gv82wwn9nBeXPEfPv4FyJw2SRoqa2Jol6fug=="; }; }; - "vega-loader-4.3.2" = { + "vega-label-1.0.0" = { + name = "vega-label"; + packageName = "vega-label"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-label/-/vega-label-1.0.0.tgz"; + sha512 = "hCdm2pcHgkKgxnzW9GvX5JmYNiUMlOXOibtMmBzvFBQHX3NiV9giQ5nsPiQiFbV08VxEPtM+VYXr2HyrIcq5zQ=="; + }; + }; + "vega-loader-4.3.3" = { name = "vega-loader"; packageName = "vega-loader"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/vega-loader/-/vega-loader-4.3.2.tgz"; - sha512 = "g+hd4xCxGP4zlSdvvprDrHTulUN1xB1k63ooqtCzhps3fji7N8DQ3RWPTJZLyuwYpjxim3BYrp4aJk3OHElcaA=="; + url = "https://registry.npmjs.org/vega-loader/-/vega-loader-4.3.3.tgz"; + sha512 = "ZcAMi6C7yfbA3gpxDnFe3PvsP/jcDwUjgPIpZ2IYsaQS+JijZAj5g3i4mpQCao0Atc+C/g7htg0Ir3twFLPjkQ=="; }; }; - "vega-parser-6.0.4" = { + "vega-parser-6.1.0" = { name = "vega-parser"; packageName = "vega-parser"; - version = "6.0.4"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.0.4.tgz"; - sha512 = "AxFvM0JgS/hyqlIdcN1B74PRO5cpU9SRRh8wBfirHRkFWPxqfP2EeFmQxisGV5wSqAUVTqqqk0suWQuU3YHPcQ=="; + url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.1.0.tgz"; + sha512 = "u14bHXV8vtcuMIJkMNoDAJ4Xu3lwKIkep+YEkPumWvlwl3fClWy26EAcwTneeM3rXu2F6ZJI6W3ddu/If8u13w=="; }; }; - "vega-projection-1.4.4" = { + "vega-projection-1.4.5" = { name = "vega-projection"; packageName = "vega-projection"; - version = "1.4.4"; + version = "1.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/vega-projection/-/vega-projection-1.4.4.tgz"; - sha512 = "v1Tx/8khpOmzpscXkxq2+MGjs7jG3A8yFfQJ8kTh8eIko0f5V+QLujTfEvdllYXw6f3DE6K2fYInb71B0GAjIw=="; + url = "https://registry.npmjs.org/vega-projection/-/vega-projection-1.4.5.tgz"; + sha512 = "85kWcPv0zrrNfxescqHtSYpRknilrS0K3CVRZc7IYQxnLtL1oma9WEbrSr1LCmDoCP5hl2Z1kKbomPXkrQX5Ag=="; }; }; - "vega-regression-1.0.8" = { + "vega-regression-1.0.9" = { name = "vega-regression"; packageName = "vega-regression"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/vega-regression/-/vega-regression-1.0.8.tgz"; - sha512 = "NdLoDctaxtCKP4udGg2SmplyK8098L8EAFEy/TEECx0wbRcBzPs2e/U4uCShzoPHILFULdOqs+sq/xwhp9X3lA=="; + url = "https://registry.npmjs.org/vega-regression/-/vega-regression-1.0.9.tgz"; + sha512 = "KSr3QbCF0vJEAWFVY2MA9X786oiJncTTr3gqRMPoaLr/Yo3f7OPKXRoUcw36RiWa0WCOEMgTYtM28iK6ZuSgaA=="; }; }; - "vega-runtime-6.1.2" = { + "vega-runtime-6.1.3" = { name = "vega-runtime"; packageName = "vega-runtime"; - version = "6.1.2"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/vega-runtime/-/vega-runtime-6.1.2.tgz"; - sha512 = "baaMe8PKynJlJfpcZR4jHDSbTM9TYzU4x/XLphQ/6lZnF9WMH+gGOVlVRWZCLH4K0sgCxBMKC/THOpRFkO6jJA=="; + url = "https://registry.npmjs.org/vega-runtime/-/vega-runtime-6.1.3.tgz"; + sha512 = "gE+sO2IfxMUpV0RkFeQVnHdmPy3K7LjHakISZgUGsDI/ZFs9y+HhBf8KTGSL5pcZPtQsZh3GBQ0UonqL1mp9PA=="; }; }; - "vega-scale-7.1.0" = { + "vega-scale-7.1.1" = { name = "vega-scale"; packageName = "vega-scale"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-scale/-/vega-scale-7.1.0.tgz"; - sha512 = "8QgHarFLgnX60DL9h91GNSzvXtBVUfCx57+XKUlCROfHti4KASTRMicBgfJ3lwJBACNefpEW+9ut+1iuIHONwQ=="; + url = "https://registry.npmjs.org/vega-scale/-/vega-scale-7.1.1.tgz"; + sha512 = "yE0to0prA9E5PBJ/XP77TO0BMkzyUVyt7TH5PAwj+CZT7PMsMO6ozihelRhoIiVcP0Ae/ByCEQBUQkzN5zJ0ZA=="; }; }; - "vega-scenegraph-4.9.1" = { + "vega-scenegraph-4.9.2" = { name = "vega-scenegraph"; packageName = "vega-scenegraph"; - version = "4.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.9.1.tgz"; - sha512 = "4OyFlMXwecM7C18zrXeBgckzLaFncLdnj1ExcF3dFfsgPLBSRW2x+eCRQZmD12UHoLFGuehB5s3YNfoQtCP5YA=="; - }; - }; - "vega-selections-5.1.3" = { - name = "vega-selections"; - packageName = "vega-selections"; - version = "5.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.1.3.tgz"; - sha512 = "fy+EBPA3pA3i4IeQ2EUHQI83RZMCS4ZoXu1RI1Oa/CFLu8iXxwraRaD9sUH93GPj4pU22g4ywjbHzsrZ7x4ONg=="; - }; - }; - "vega-statistics-1.7.8" = { - name = "vega-statistics"; - packageName = "vega-statistics"; - version = "1.7.8"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.7.8.tgz"; - sha512 = "JkxS7hkFLOMBgEOfITQ1kisLGuWtJ0gAhxQ1OmuIx5Un9yyFY3+hk8HSgeZHwIPktsV+2Bx5aPUHES85YzBD/Q=="; - }; - }; - "vega-time-2.0.3" = { - name = "vega-time"; - packageName = "vega-time"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-time/-/vega-time-2.0.3.tgz"; - sha512 = "LXsB5Ej56jcDRvoWHp1YegNuZSD+cFWGBEWobRXbigmRNDfa4HGmzUon46G+KBj+VeRRGeu5Zq4LSG2goWmIYw=="; - }; - }; - "vega-transforms-4.9.2" = { - name = "vega-transforms"; - packageName = "vega-transforms"; version = "4.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.9.2.tgz"; - sha512 = "vDI8jJOlnswSuEf6BekI04jWNttgOLzDRONaWZGTH8X5yI3GgkB4Ts45U0LayRExQSq7gxt95k/02jXGGzOTpA=="; + url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.9.2.tgz"; + sha512 = "epm1CxcB8AucXQlSDeFnmzy0FCj+HV2k9R6ch2lfLRln5lPLEfgJWgFcFhVf5jyheY0FSeHH52Q5zQn1vYI1Ow=="; }; }; - "vega-typings-0.18.2" = { + "vega-selections-5.1.4" = { + name = "vega-selections"; + packageName = "vega-selections"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.1.4.tgz"; + sha512 = "L7CHwcIjVf90GoW2tS2x5O496O5Joaerp5A1KM6VJ1uo4z6KfqxY6M/328a/uaAs0LC5qbQgXT3htFbtUrPW/A=="; + }; + }; + "vega-statistics-1.7.9" = { + name = "vega-statistics"; + packageName = "vega-statistics"; + version = "1.7.9"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.7.9.tgz"; + sha512 = "T0sd2Z08k/mHxr1Vb4ajLWytPluLFYnsYqyk4SIS5czzUs4errpP2gUu63QJ0B7CKNu33vnS9WdOMOo/Eprr/Q=="; + }; + }; + "vega-time-2.0.4" = { + name = "vega-time"; + packageName = "vega-time"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-time/-/vega-time-2.0.4.tgz"; + sha512 = "U314UDR9+ZlWrD3KBaeH+j/c2WSMdvcZq5yJfFT0yTg1jsBKAQBYFGvl+orackD8Zx3FveHOxx3XAObaQeDX+Q=="; + }; + }; + "vega-transforms-4.9.3" = { + name = "vega-transforms"; + packageName = "vega-transforms"; + version = "4.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.9.3.tgz"; + sha512 = "PdqQd5oPlRyD405M2w+Sz9Bo+i7Rwi8o03SVK7RaeQsJC2FffKGJ6acIaSEgOq+yD1Q2k/1SePmCXcmLUlIiEA=="; + }; + }; + "vega-typings-0.19.1" = { name = "vega-typings"; packageName = "vega-typings"; - version = "0.18.2"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.18.2.tgz"; - sha512 = "t7PAmcqPUmSV44l2NVJOoblhomPlgjO7rxAUs/HXnmyVbGHI+6ulUPjGBWWZU1ebu09T+SYazAwjr6lAd2CHgQ=="; + url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.19.1.tgz"; + sha512 = "OSyNYwMJ8FayTTNU/gohprbt1EFQBpoiMPP9p2vqo1O9z45XVnotQ92jYHAhraI6gWiMIIfo4OjPbSe/GX7etg=="; }; }; - "vega-util-1.15.1" = { + "vega-util-1.15.3" = { name = "vega-util"; packageName = "vega-util"; - version = "1.15.1"; + version = "1.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/vega-util/-/vega-util-1.15.1.tgz"; - sha512 = "kEbRQiVUP42dyou2LF8I+3TlBtk4TODTlnLzdSoI//uahXvDnz1ulfprWljfcHPbVjziObaFNWkpT56oSMTx+g=="; + url = "https://registry.npmjs.org/vega-util/-/vega-util-1.15.3.tgz"; + sha512 = "NCbfCPMVgdP4geLrFtCDN9PTEXrgZgJBBLvpyos7HGv2xSe9bGjDCysv6qcueHrc1myEeCQzrHDFaShny6wXDg=="; }; }; - "vega-view-5.8.2" = { + "vega-view-5.9.0" = { name = "vega-view"; packageName = "vega-view"; - version = "5.8.2"; + version = "5.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-view/-/vega-view-5.8.2.tgz"; - sha512 = "d+u5FGs3t7LUVRoGimvroHkbO2orrtJMUt2P8UVu4alMdDcgZUSmwOZWc/gMkBGlWD8P9q7832xTWdJ3gSXL4A=="; + url = "https://registry.npmjs.org/vega-view/-/vega-view-5.9.0.tgz"; + sha512 = "HqRFuqO2OwoPHHK+CVt8vB8fu2L8GjQerLpmEpglWtCPDns5+gn5B6F7M8Ah8v24WlfqW7cLrY81t9OloPZOyw=="; }; }; - "vega-view-transforms-4.5.7" = { + "vega-view-transforms-4.5.8" = { name = "vega-view-transforms"; packageName = "vega-view-transforms"; - version = "4.5.7"; + version = "4.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/vega-view-transforms/-/vega-view-transforms-4.5.7.tgz"; - sha512 = "dcrEHJL/+KPAe7Eq4Me7rq5+O13yWL1X/n3Fu6xKGL2TnBSBy4WVla+WFBdD82GRIU0Fi5DFkL/dE3cTeitvag=="; + url = "https://registry.npmjs.org/vega-view-transforms/-/vega-view-transforms-4.5.8.tgz"; + sha512 = "966m7zbzvItBL8rwmF2nKG14rBp7q+3sLCKWeMSUrxoG+M15Smg5gWEGgwTG3A/RwzrZ7rDX5M1sRaAngRH25g=="; }; }; - "vega-voronoi-4.1.4" = { + "vega-voronoi-4.1.5" = { name = "vega-voronoi"; packageName = "vega-voronoi"; - version = "4.1.4"; + version = "4.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.1.4.tgz"; - sha512 = "z5aAprA9XbdKZ2oAs1tWR9Cw+W9LQJZCn9kH+x6VmnqiVhCbMZPDoZK9sIgso163RDF9Fdu+0zLXX58l+AjzWA=="; + url = "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.1.5.tgz"; + sha512 = "950IkgCFLj0zG33EWLAm1hZcp+FMqWcNQliMYt+MJzOD5S4MSpZpZ7K4wp2M1Jktjw/CLKFL9n38JCI0i3UonA=="; }; }; - "vega-wordcloud-4.1.2" = { + "vega-wordcloud-4.1.3" = { name = "vega-wordcloud"; packageName = "vega-wordcloud"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/vega-wordcloud/-/vega-wordcloud-4.1.2.tgz"; - sha512 = "LZzqaRuE0bR9x9e9dLax6GYnUO+MtJhGx5fRk4F0Q8+X2f0u/BfOyMG459tnbyZQIy9SP8ZBLBlkp+ujmK8XXQ=="; + url = "https://registry.npmjs.org/vega-wordcloud/-/vega-wordcloud-4.1.3.tgz"; + sha512 = "is4zYn9FMAyp9T4SAcz2P/U/wqc0Lx3P5YtpWKCbOH02a05vHjUQrQ2TTPOuvmMfAEDCSKvbMSQIJMOE018lJA=="; }; }; "vendors-1.0.4" = { @@ -50468,13 +50558,13 @@ let sha1 = "b0455b38fc5e0cf30d4325132e461970c2091cde"; }; }; - "vinyl-2.2.0" = { + "vinyl-2.2.1" = { name = "vinyl"; packageName = "vinyl"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz"; - sha512 = "MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg=="; + url = "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz"; + sha512 = "LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw=="; }; }; "vinyl-file-3.0.0" = { @@ -50531,13 +50621,13 @@ let sha512 = "DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow=="; }; }; - "vls-0.5.3" = { + "vls-0.5.4" = { name = "vls"; packageName = "vls"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/vls/-/vls-0.5.3.tgz"; - sha512 = "NQKKl3JgiFuo52ra5gjlo5E/TztchkYRaKEWrBlMACNnnDlKkyFPRkQO/tE7A25Hs+y0t/HoOTsMGnAmhQY7Fg=="; + url = "https://registry.npmjs.org/vls/-/vls-0.5.4.tgz"; + sha512 = "BAdsW9uYaMIEQcAK3cZsuoA+jMapOxc3RFNqiZtRDunbkv+sWrCs4xrydiPIiLHY7Pi8I/yNqBPlR/8LDlFmhA=="; }; }; "vm-browserify-1.1.2" = { @@ -50567,13 +50657,13 @@ let sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; }; }; - "vsce-1.79.5" = { + "vsce-1.80.0" = { name = "vsce"; packageName = "vsce"; - version = "1.79.5"; + version = "1.80.0"; src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-1.79.5.tgz"; - sha512 = "KZFOthGwxWFwoGqwrkzfTfyCZGuniTofnJ1a/dCzQ2HP93u1UuCKrTQyGT+SuGHu8sNqdBYNe0hb9GC3qCN7fg=="; + url = "https://registry.npmjs.org/vsce/-/vsce-1.80.0.tgz"; + sha512 = "pnJT0LttCd5k1fJRsTOer8NvgesMYxLZYTUwuVWVOgONK9w+U5Yf32rtm4cX374TsHZbBwUr6ZFLP36wyDD8/g=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -50585,13 +50675,13 @@ let sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg=="; }; }; - "vscode-css-languageservice-4.1.0" = { + "vscode-css-languageservice-4.3.3" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "4.1.0"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.1.0.tgz"; - sha512 = "iTX3dTp0Y0RFWhIux5jasI8r9swdiWVB1Z3OrZ10iDHxzkETjVPxAQ5BEQU4ag0Awc8TTg1C7sJriHQY2LO14g=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.3.3.tgz"; + sha512 = "b2b+0oHvPmBHygDtOXX3xBvpQCa6eIQSvXnGDNSDmIC1894ZTJ2yX10vjplOO/PvV7mwhyvGPwHyY4X2HGxtKw=="; }; }; "vscode-css-languageservice-4.3.4" = { @@ -50603,22 +50693,22 @@ let sha512 = "/0HCaxiSL0Rmm3sJ+iyZekljKEYKo1UHSzX4UFOo5VDLgRhKomJf7g1p8glcbCHXB/70IcH8IhKnwlTznf8RPQ=="; }; }; - "vscode-debugadapter-testsupport-1.41.0" = { + "vscode-debugadapter-testsupport-1.42.0" = { name = "vscode-debugadapter-testsupport"; packageName = "vscode-debugadapter-testsupport"; - version = "1.41.0"; + version = "1.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.41.0.tgz"; - sha512 = "3aEDm+B6trSxUJWETbNBM5qbEAUbzPpLZ9YT9ez+C1ITG4uaioc8GIQtkVk1kpxP++WPWo0LVjYY8CbVRCRapg=="; + url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.42.0.tgz"; + sha512 = "5miGnlsT1VLeXcu04AR+LvD4lwTRlEMAj0nyLgVlMdHzH4RDbX2M2/nXSpRbcsdEHcXoRQlfkAXhM4ZQQ4BUBw=="; }; }; - "vscode-debugprotocol-1.41.0" = { + "vscode-debugprotocol-1.42.0" = { name = "vscode-debugprotocol"; packageName = "vscode-debugprotocol"; - version = "1.41.0"; + version = "1.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.41.0.tgz"; - sha512 = "Sxp7kDDuhpEZiDaIfhM0jLF3RtMqvc6CpoESANE77t351uezsd/oDoqALLcOnmmsDzTgQ3W0sCvM4gErnjDFpA=="; + url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.42.0.tgz"; + sha512 = "nVsfVCat9FZlOso5SYB1LQQiFGifTyOALpkpJdudDlRXGTpI3mSFiDYXWaoFm7UcfqTOzn1SC7Hqw4d89btT0w=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -50648,13 +50738,13 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-json-languageservice-3.8.4" = { + "vscode-json-languageservice-3.9.0" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "3.8.4"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.4.tgz"; - sha512 = "njDG0+YJvYNKXH+6plQGZMxgbifATFrRpC6Qnm/SAn4IW8bMHxsYunsxrjtpqK42CVSz6Lr7bpbTEZbVuOmFLw=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.9.0.tgz"; + sha512 = "J+2rbntYRLNL9wk0D2iovWo1df3JwYM+5VvWl1omNUgw+XbgpNBwpFZ/TsC1pTCdmpu5RMatXooplXZ8l/Irsg=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -50774,6 +50864,15 @@ let sha512 = "DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ=="; }; }; + "vscode-languageserver-7.0.0-next.7" = { + name = "vscode-languageserver"; + packageName = "vscode-languageserver"; + version = "7.0.0-next.7"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0-next.7.tgz"; + sha512 = "6La+usoCF0OnCYIbOLBTmqgzaZSAyIBpnsLjS/g7AnI8Pv9v6yzC38VhTvBoip4/ZBwf1U8vpdwatD/qCSKeWA=="; + }; + }; "vscode-languageserver-protocol-3.14.1" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -52503,6 +52602,15 @@ let sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; }; }; + "y18n-5.0.1" = { + name = "y18n"; + packageName = "y18n"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-5.0.1.tgz"; + sha512 = "/jJ831jEs4vGDbYPQp4yGKDYPSCCEQ45uZWJHE1AoYBzqdZi8+LDWas0z4HrmJXmKdpFsTiowSHXdxyFhpmdMg=="; + }; + }; "yaeti-0.0.6" = { name = "yaeti"; packageName = "yaeti"; @@ -52584,13 +52692,13 @@ let sha1 = "87cfa5a9613f48e26005420d6a8ee0da6fe8daec"; }; }; - "yaml-language-server-0.10.1" = { + "yaml-language-server-0.11.1" = { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.10.1"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.10.1.tgz"; - sha512 = "R9SEt/nWTuZ8weB040L7yyaIVARlZ0ian1Kv6ptu4+xyVlIMobTZXaBTtgyhlMWqcQ3BpsAZu4q/2plRVG3tLQ=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.11.1.tgz"; + sha512 = "N3Tu3g4O6ZWV7W0LVsNk62DtKJDQkbnPZRDd7ntaAeEl8QkxL1vnMunI26uzDU4PwwG4tPJ8g/VRS6U+fVp/6A=="; }; }; "yamljs-0.3.0" = { @@ -52665,6 +52773,15 @@ let sha512 = "aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A=="; }; }; + "yargs-16.0.3" = { + name = "yargs"; + packageName = "yargs"; + version = "16.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-16.0.3.tgz"; + sha512 = "6+nLw8xa9uK1BOEOykaiYAJVh6/CjxWXK/q9b5FpRgNslt8s22F2xMBqVIKgCRjNgGvGPBy8Vog7WN7yh4amtA=="; + }; + }; "yargs-3.10.0" = { name = "yargs"; packageName = "yargs"; @@ -52827,6 +52944,15 @@ let sha512 = "qZV14lK9MWsGCmcr7u5oXGH0dbGqZAIxTDrWXZDo5zUr6b6iUmelNKO6x6R1dQT24AH3LgRxJpr8meWy2unolA=="; }; }; + "yarn-1.22.10" = { + name = "yarn"; + packageName = "yarn"; + version = "1.22.10"; + src = fetchurl { + url = "https://registry.npmjs.org/yarn/-/yarn-1.22.10.tgz"; + sha512 = "IanQGI9RRPAN87VGTF7zs2uxkSyQSrSPsju0COgbsKQOOXr5LtcVPeyXWgwVa0ywG3d8dg6kSYKGBuYK021qeA=="; + }; + }; "yarn-1.22.4" = { name = "yarn"; packageName = "yarn"; @@ -52836,15 +52962,6 @@ let sha512 = "oYM7hi/lIWm9bCoDMEWgffW8aiNZXCWeZ1/tGy0DWrN6vmzjCXIKu2Y21o8DYVBUtiktwKcNoxyGl/2iKLUNGA=="; }; }; - "yarn-1.22.5" = { - name = "yarn"; - packageName = "yarn"; - version = "1.22.5"; - src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.22.5.tgz"; - sha512 = "5uzKXwdMc++mYktXqkfpNYT9tY8ViWegU58Hgbo+KXzrzzhEyP1Ip+BTtXloLrXNcNlxFJbLiFKGaS9vK9ym6Q=="; - }; - }; "yauzl-2.10.0" = { name = "yauzl"; packageName = "yauzl"; @@ -53049,17 +53166,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "10.1.2"; + version = "10.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-10.1.2.tgz"; - sha512 = "dBcqFTuT71CCkH4BoV2cN5RP5k8ggzOBijNNtwkQv7N4gNcdcczhoPtEa2v4Oo8mPcTwxf/C3RXZ+NicdROJOw=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-10.1.3.tgz"; + sha512 = "wj+ZcTLRzM94asLUZRO5U96CLEsnWosa3Iqub+1AH1/C8Wv2w/2njUKDM7ifQeebYzjPb5EcN4EIAGcHAGyeWw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1001.2" - sources."@angular-devkit/core-10.1.2" - sources."@angular-devkit/schematics-10.1.2" - sources."@schematics/angular-10.1.2" - sources."@schematics/update-0.1001.2" + sources."@angular-devkit/architect-0.1001.3" + sources."@angular-devkit/core-10.1.3" + sources."@angular-devkit/schematics-10.1.3" + sources."@schematics/angular-10.1.3" + sources."@schematics/update-0.1001.3" sources."@types/color-name-1.1.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" @@ -53182,7 +53299,7 @@ in sources."ini-1.3.5" sources."inquirer-7.3.3" sources."ip-1.1.5" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-date-object-1.0.2" sources."is-docker-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -53598,7 +53715,7 @@ in sources."inherits-2.0.4" sources."is-absolute-1.0.0" sources."is-buffer-1.1.6" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-glob-3.1.0" @@ -53734,7 +53851,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.10.4" + sources."uglify-js-3.11.0" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -53742,7 +53859,7 @@ in sources."util-deprecate-1.0.2" sources."value-or-function-3.0.0" sources."varint-0.0.3" - sources."vinyl-2.2.0" + sources."vinyl-2.2.1" (sources."vinyl-fs-3.0.3" // { dependencies = [ sources."readable-stream-2.3.7" @@ -53774,10 +53891,10 @@ in "@bitwarden/cli" = nodeEnv.buildNodePackage { name = "_at_bitwarden_slash_cli"; packageName = "@bitwarden/cli"; - version = "1.12.0"; + version = "1.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.12.0.tgz"; - sha512 = "bUyvGm6DOiyLxKwUcGe/ItuSu1/iAHp31hw/c04f4QWyTk2znuyDK/KD6Jn7xqIj1+zRuCVSgUPvRH9R+bfpKg=="; + url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.12.1.tgz"; + sha512 = "H1KuRpjyqNTzqQZZg3tTVmm+cDDDm23AcLvbA59A4EqfxMkVZ6gT+FqUtWEuQ7AFO28W56wdilYGSf9tQ6ySgA=="; }; dependencies = [ sources."abab-2.0.5" @@ -53977,11 +54094,11 @@ in sources."@types/color-name-1.1.1" sources."@types/json-schema-7.0.6" sources."@types/json5-0.0.29" - sources."@types/node-14.11.1" + sources."@types/node-14.11.2" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" - (sources."@types/uglify-js-3.9.3" // { + (sources."@types/uglify-js-3.11.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -54709,7 +54826,7 @@ in }; dependencies = [ sources."@akryum/winattr-3.0.0" - sources."@apollo/federation-0.20.0" + sources."@apollo/federation-0.20.2" (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ sources."@types/node-10.17.35" @@ -54729,12 +54846,11 @@ in }) (sources."@babel/core-7.11.6" // { dependencies = [ - sources."@babel/generator-7.11.6" sources."@babel/types-7.11.5" sources."semver-5.7.1" ]; }) - (sources."@babel/generator-7.11.4" // { + (sources."@babel/generator-7.11.6" // { dependencies = [ sources."@babel/types-7.11.5" ]; @@ -54870,7 +54986,6 @@ in sources."@babel/template-7.10.4" (sources."@babel/traverse-7.11.5" // { dependencies = [ - sources."@babel/generator-7.11.6" sources."@babel/types-7.11.5" ]; }) @@ -54984,7 +55099,7 @@ in sources."@types/cors-2.8.7" sources."@types/ejs-2.7.0" sources."@types/express-4.17.7" - sources."@types/express-serve-static-core-4.17.12" + sources."@types/express-serve-static-core-4.17.9" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.3" (sources."@types/graphql-upload-8.0.4" // { @@ -55008,7 +55123,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.1" + sources."@types/node-14.11.2" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -55019,7 +55134,7 @@ in sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.5" sources."@types/through-0.0.30" - sources."@types/ws-7.2.6" + sources."@types/ws-7.2.7" sources."@types/zen-observable-0.8.1" sources."@vue/cli-shared-utils-4.5.6" (sources."@vue/cli-ui-4.5.6" // { @@ -55090,18 +55205,17 @@ in sources."to-regex-range-2.1.1" ]; }) - (sources."apollo-2.30.3" // { + (sources."apollo-2.31.0" // { dependencies = [ - sources."apollo-graphql-0.6.0" sources."mkdirp-1.0.4" sources."strip-ansi-5.2.0" ]; }) sources."apollo-cache-1.3.5" - sources."apollo-cache-control-0.11.1" + sources."apollo-cache-control-0.11.3" sources."apollo-cache-inmemory-1.6.6" sources."apollo-client-2.6.10" - (sources."apollo-codegen-core-0.37.9" // { + (sources."apollo-codegen-core-0.38.0" // { dependencies = [ (sources."recast-0.20.3" // { dependencies = [ @@ -55112,24 +55226,14 @@ in sources."tslib-2.0.1" ]; }) - sources."apollo-codegen-flow-0.35.9" - sources."apollo-codegen-scala-0.36.9" - sources."apollo-codegen-swift-0.37.9" - sources."apollo-codegen-typescript-0.37.9" + sources."apollo-codegen-flow-0.36.0" + sources."apollo-codegen-scala-0.37.0" + sources."apollo-codegen-swift-0.38.0" + sources."apollo-codegen-typescript-0.38.0" sources."apollo-datasource-0.7.2" - (sources."apollo-engine-reporting-2.3.0" // { - dependencies = [ - sources."uuid-8.3.0" - ]; - }) - sources."apollo-engine-reporting-protobuf-0.5.2" sources."apollo-env-0.6.5" - sources."apollo-graphql-0.5.0" - (sources."apollo-language-server-1.23.4" // { - dependencies = [ - sources."apollo-graphql-0.6.0" - ]; - }) + sources."apollo-graphql-0.6.0" + sources."apollo-language-server-1.24.0" sources."apollo-link-1.2.14" sources."apollo-link-context-1.0.20" sources."apollo-link-error-1.1.13" @@ -55138,14 +55242,19 @@ in sources."apollo-link-persisted-queries-0.2.2" sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.20" + sources."apollo-reporting-protobuf-0.6.0" sources."apollo-server-caching-0.5.2" - sources."apollo-server-core-2.17.0" + (sources."apollo-server-core-2.18.1" // { + dependencies = [ + sources."uuid-8.3.0" + ]; + }) sources."apollo-server-env-2.4.5" sources."apollo-server-errors-2.4.2" - sources."apollo-server-express-2.17.0" - sources."apollo-server-plugin-base-0.9.1" - sources."apollo-server-types-0.5.1" - sources."apollo-tracing-0.11.2" + sources."apollo-server-express-2.18.1" + sources."apollo-server-plugin-base-0.10.1" + sources."apollo-server-types-0.6.0" + sources."apollo-tracing-0.11.4" sources."apollo-upload-client-11.0.0" sources."apollo-utilities-1.3.4" (sources."archive-type-4.0.0" // { @@ -55231,7 +55340,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.14.3" + sources."browserslist-4.14.5" sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -55258,7 +55367,7 @@ in sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001133" + sources."caniuse-lite-1.0.30001140" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -55312,7 +55421,7 @@ in sources."strip-ansi-3.0.1" ]; }) - (sources."cli-ux-5.4.10" // { + (sources."cli-ux-5.5.0" // { dependencies = [ sources."ansi-escapes-4.3.1" sources."ansi-styles-4.2.1" @@ -55466,7 +55575,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.570" + sources."electron-to-chromium-1.3.576" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -55591,13 +55700,13 @@ in sources."git-clone-0.1.0" sources."git-config-path-1.0.1" sources."git-parse-1.0.4" - (sources."git-rev-sync-2.0.0" // { + (sources."git-rev-sync-2.1.0" // { dependencies = [ sources."graceful-fs-4.1.15" ]; }) sources."git-up-4.0.2" - sources."git-url-parse-11.1.3" + sources."git-url-parse-11.2.0" sources."glob-7.1.5" sources."glob-parent-5.1.1" sources."glob-to-regexp-0.3.0" @@ -55651,7 +55760,7 @@ in sources."ts-invariant-0.3.3" ]; }) - sources."graphql-extensions-0.12.4" + sources."graphql-extensions-0.12.5" sources."graphql-subscriptions-1.1.0" sources."graphql-tag-2.11.0" sources."graphql-tools-4.0.8" @@ -55738,7 +55847,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-ci-1.2.1" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" @@ -55918,7 +56027,7 @@ in ]; }) sources."mkdirp-0.5.5" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."nan-2.14.1" @@ -56062,7 +56171,7 @@ in ]; }) sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.34" // { + (sources."postcss-7.0.35" // { dependencies = [ sources."source-map-0.6.1" sources."supports-color-6.1.0" @@ -56073,7 +56182,7 @@ in sources."postcss-modules-local-by-default-3.0.3" sources."postcss-modules-scope-2.2.0" sources."postcss-modules-values-3.0.0" - sources."postcss-selector-parser-6.0.3" + sources."postcss-selector-parser-6.0.4" sources."postcss-value-parser-4.1.0" sources."prepend-http-1.0.4" sources."prismjs-1.21.0" @@ -56206,7 +56315,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.7.2" - sources."shelljs-0.7.7" + sources."shelljs-0.8.4" sources."shellwords-0.1.1" sources."shortid-2.2.15" sources."signal-exit-3.0.3" @@ -56519,7 +56628,7 @@ in sources."camelcase-5.3.1" ]; }) - sources."yarn-1.22.5" + sources."yarn-1.22.10" sources."yauzl-2.10.0" sources."yn-3.1.1" sources."zen-observable-0.8.15" @@ -56871,7 +56980,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.1" + sources."@types/node-14.11.2" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -57120,7 +57229,7 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.44.0" + sources."mime-db-1.45.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -57921,15 +58030,16 @@ in coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-go/-/coc-go-0.11.0.tgz"; - sha512 = "W27x1U6WlKiFKsiTRxc5neFFJKx1AXFYZ8OxELX4tubCptNa64RTBqSTk9Iv0zHFwEs1xLJ56CE7NO3wTmKVKw=="; + url = "https://registry.npmjs.org/coc-go/-/coc-go-0.12.0.tgz"; + sha512 = "1H9GKq8S1nqv6R3Y2ws+mK+GdVGu3SRsr5uEyRR1KGyfGCDjHyUJY9r4ISlD7DqQ0aq3ukphyv/vhi9uDlkvmA=="; }; dependencies = [ sources."isexe-2.0.0" sources."node-fetch-2.6.1" sources."tslib-2.0.1" + sources."vscode-uri-2.1.2" sources."which-2.0.2" ]; buildInputs = globalBuildInputs; @@ -58017,10 +58127,10 @@ in coc-jest = nodeEnv.buildNodePackage { name = "coc-jest"; packageName = "coc-jest"; - version = "1.0.4"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-jest/-/coc-jest-1.0.4.tgz"; - sha512 = "cqNvWTS27HrT3+zthsb7zPokPwvrCJkGnmQkktfDDnUET5d6lbMhJaqZ8DlYxKKtoaPZ5QzwnaoowChhh8M9WA=="; + url = "https://registry.npmjs.org/coc-jest/-/coc-jest-1.1.1.tgz"; + sha512 = "9Gkw9wznxtYIiPbgORZqwN5sjHQQYe2rZBvYNPMX2AVlF++OuTXUfy4Aidw6hstbzxKR8JEnjez7JiVaUF6M/A=="; }; buildInputs = globalBuildInputs; meta = { @@ -58070,10 +58180,10 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.4.tgz"; - sha512 = "EaDdMssH8XCpXq4rTQOkl8BhiB5eR+pAlV4mARs+jsB6wvJVd6U3Ba6nKuTB7n7HbHbn3tWZWLhclpqByi5G8g=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.5.tgz"; + sha512 = "KZVd2kmQjUQVLEHM9c2aXxP4AbM8sRybPtdAR6lWfIK3VGj67O2PIoG30Ro17d7BgcASVBp2Ad86azK9Op8uDw=="; }; dependencies = [ sources."@chemzqm/neovim-5.2.6" @@ -58119,7 +58229,7 @@ in sources."fb-watchman-2.0.1" sources."flatted-2.0.2" sources."follow-redirects-1.13.0" - sources."fp-ts-2.8.2" + sources."fp-ts-2.8.3" sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -58142,7 +58252,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.5" sources."int64-buffer-0.1.10" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-date-object-1.0.2" sources."is-docker-2.1.1" sources."is-negative-zero-2.0.0" @@ -58163,7 +58273,7 @@ in }) sources."lodash-4.17.20" sources."log4js-6.3.0" - sources."metals-languageclient-0.3.1" + sources."metals-languageclient-0.3.2" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-3.1.3" @@ -58347,7 +58457,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001133" + sources."caniuse-lite-1.0.30001140" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -58444,7 +58554,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.570" + sources."electron-to-chromium-1.3.576" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -59284,10 +59394,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.8.0"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.8.0.tgz"; - sha512 = "kX/mSezjGZKy1hM3l+qrqLt4sQfS1GvtzwQQ1iqS4s+1YAwViRFLx/E1RFJRElQZ4WPvvRiu+d0OeiGbKQaMAg=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.8.2.tgz"; + sha512 = "eTRAjbX2HgnqR+iu+xE41osKxlodln4aLSki2+sRc2dulIvCtB0y9E7u3auX6Y8au6IKfnjmn/GLNAWIz4oPQw=="; }; buildInputs = globalBuildInputs; meta = { @@ -59320,10 +59430,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.2.0.tgz"; - sha512 = "uWY5BquBQaQ9UD8PyjhbkbyQFsoc545A/eyquPJ9G3TF8VaXCBSGiVkzGIBT4It6ldN9vc/VQEVsRpEvtO6TTw=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.2.1.tgz"; + sha512 = "iMAZLafpYJYtf+jMIoUlNqYjZkxFEflbG1aW7XiesC0c+TY8HYglN3/CnuoKu0bwWcxoktUhiRqDixuw36VRSQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -59383,7 +59493,7 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.1" + sources."@types/node-14.11.2" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -59426,7 +59536,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.14.3" + sources."browserslist-4.14.5" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" @@ -59434,7 +59544,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001133" + sources."caniuse-lite-1.0.30001140" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -59494,7 +59604,7 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.570" + sources."electron-to-chromium-1.3.576" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -59715,7 +59825,7 @@ in sources."picomatch-2.2.2" sources."pify-4.0.1" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.34" // { + (sources."postcss-7.0.35" // { dependencies = [ sources."source-map-0.6.1" sources."supports-color-6.1.0" @@ -60085,7 +60195,7 @@ in }) sources."@nodelib/fs.stat-1.1.3" sources."@nodelib/fs.walk-1.2.4" - sources."@prettier/plugin-pug-1.6.1" + sources."@prettier/plugin-pug-1.7.0" sources."@sindresorhus/is-0.14.0" sources."@sorg/log-2.2.0" sources."@starptech/expression-parser-0.10.0" @@ -60113,7 +60223,7 @@ in sources."@types/json-schema-7.0.6" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.11.1" + sources."@types/node-14.11.2" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" @@ -60339,7 +60449,7 @@ in sources."enquirer-2.3.6" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.9.0" // { + (sources."eslint-7.10.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" @@ -60360,7 +60470,7 @@ in sources."which-2.0.2" ]; }) - (sources."eslint-plugin-vue-7.0.0-beta.3" // { + (sources."eslint-plugin-vue-7.0.0" // { dependencies = [ sources."semver-7.3.2" ]; @@ -61054,14 +61164,22 @@ in }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" - sources."vls-0.5.3" - sources."vscode-css-languageservice-4.1.0" - sources."vscode-emmet-helper-2.0.0" - sources."vscode-jsonrpc-5.0.1" - sources."vscode-languageserver-6.1.1" - sources."vscode-languageserver-protocol-3.15.3" + sources."vls-0.5.4" + (sources."vscode-css-languageservice-4.3.3" // { + dependencies = [ + sources."vscode-languageserver-types-3.16.0-next.2" + ]; + }) + (sources."vscode-emmet-helper-2.0.0" // { + dependencies = [ + sources."vscode-languageserver-types-3.15.1" + ]; + }) + sources."vscode-jsonrpc-6.0.0-next.5" + sources."vscode-languageserver-7.0.0-next.7" + sources."vscode-languageserver-protocol-3.16.0-next.7" sources."vscode-languageserver-textdocument-1.0.1" - sources."vscode-languageserver-types-3.15.1" + sources."vscode-languageserver-types-3.16.0-next.3" sources."vscode-nls-4.1.2" sources."vscode-uri-2.1.2" sources."vscode-web-custom-data-0.3.1" @@ -61149,10 +61267,10 @@ in coc-yaml = nodeEnv.buildNodePackage { name = "coc-yaml"; packageName = "coc-yaml"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.0.5.tgz"; - sha512 = "BMtE+UB9mmChn9bD6Nd7fuWVgEPwaa48QQLyE0nxQK2PXozLsPpRx7micYNpMB/LUh786oe/Gn1NPVwzNE2iEw=="; + url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.1.0.tgz"; + sha512 = "z35izd8vv80UcyoIs2Yw6Q/8qoe9U321StT76JKIDSLRXLqY27Q6wS8RpVCWsPb6aXxmPRMt2sjnjF8DExpaMQ=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -61169,7 +61287,7 @@ in sources."prettier-2.0.5" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - (sources."vscode-json-languageservice-3.8.4" // { + (sources."vscode-json-languageservice-3.9.0" // { dependencies = [ sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-nls-5.0.0" @@ -61191,7 +61309,7 @@ in sources."vscode-nls-4.1.2" sources."vscode-uri-2.1.2" sources."yaml-ast-parser-custom-tags-0.0.43" - sources."yaml-language-server-0.10.1" + sources."yaml-language-server-0.11.1" ]; buildInputs = globalBuildInputs; meta = { @@ -61205,10 +61323,10 @@ in coc-yank = nodeEnv.buildNodePackage { name = "coc-yank"; packageName = "coc-yank"; - version = "1.1.5"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.1.5.tgz"; - sha512 = "HITJR6Cjah8xJwPBqWFQCj0vAWu29IrPWuEdZBnGo+qqasGoVSjurGnrRrmZZADuMWh/Z+2z4V7J8DoVejs40Q=="; + url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.1.7.tgz"; + sha512 = "5WCpa1k96mlhcC8acPqljkDhmoVFfFzTRi2bO+QJDakgQfZxN5UqMcVrnh4ZDKFQuE09zEpn8quwEjvU1W5VMQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -61665,7 +61783,7 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-7.2.1" + sources."open-7.3.0" sources."os-homedir-1.0.2" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -61799,7 +61917,7 @@ in sources."unique-string-2.0.0" sources."universalify-1.0.0" sources."unpipe-1.0.0" - sources."update-notifier-4.1.1" + sources."update-notifier-4.1.3" sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" sources."utils-merge-1.0.1" @@ -61868,7 +61986,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.11.1" + sources."@types/node-14.11.2" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -62236,7 +62354,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-14.11.1" + sources."@types/node-14.11.2" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -62570,7 +62688,7 @@ in (sources."append-tree-2.4.4" // { dependencies = [ sources."process-nextick-args-1.0.7" - sources."varint-5.0.0" + sources."varint-5.0.2" ]; }) sources."arr-diff-4.0.0" @@ -62813,7 +62931,7 @@ in sources."hypercore-crypto-1.0.0" (sources."hypercore-protocol-6.12.0" // { dependencies = [ - sources."varint-5.0.0" + sources."varint-5.0.2" ]; }) sources."hyperdrive-9.16.0" @@ -62968,7 +63086,7 @@ in sources."process-nextick-args-2.0.1" sources."progress-string-1.2.2" sources."prompt-1.0.0" - (sources."protocol-buffers-encodings-1.1.0" // { + (sources."protocol-buffers-encodings-1.1.1" // { dependencies = [ sources."varint-5.0.0" ]; @@ -63020,7 +63138,7 @@ in sources."signal-exit-3.0.3" (sources."signed-varint-2.0.1" // { dependencies = [ - sources."varint-5.0.0" + sources."varint-5.0.2" ]; }) sources."simple-concat-1.0.1" @@ -63228,28 +63346,77 @@ in diagnostic-languageserver = nodeEnv.buildNodePackage { name = "diagnostic-languageserver"; packageName = "diagnostic-languageserver"; - version = "1.7.1"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.7.1.tgz"; - sha512 = "iq4RE35kISxPucmRfZhpIJr9xWi2EOGraD4rX0/5Tk3dIUbsLHeUzX5eVQeVL7Kw4QiBsbMO4W2TgV18VyiUYA=="; + url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.8.0.tgz"; + sha512 = "UnQGWIszi+uXkZ/pYUDLKuftSOSIvc/ZBSp/W6OF/Qyr2SsEaSD6TuaIo7TiH1MGQX1b2EW9P1WlE+16Ft4MiA=="; }; dependencies = [ + sources."@nodelib/fs.scandir-2.1.3" + sources."@nodelib/fs.stat-2.0.3" + sources."@nodelib/fs.walk-1.2.4" + sources."aggregate-error-3.1.0" + sources."array-union-2.1.0" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."clean-stack-2.2.0" sources."commander-5.1.0" + sources."concat-map-0.0.1" + sources."crypto-random-string-2.0.0" + sources."del-6.0.0" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.4" + sources."fastq-1.8.0" + sources."fill-range-7.0.1" sources."find-up-4.1.0" + sources."fs.realpath-1.0.0" + sources."glob-7.1.6" + sources."glob-parent-5.1.1" + sources."globby-11.0.1" + sources."graceful-fs-4.2.4" + sources."ignore-5.1.8" + sources."indent-string-4.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."is-path-cwd-2.2.0" + sources."is-path-inside-3.0.2" + sources."is-stream-2.0.0" sources."locate-path-5.0.0" sources."lodash-4.17.20" + sources."merge2-1.4.1" + sources."micromatch-4.0.2" + sources."minimatch-3.0.4" + sources."once-1.4.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" + sources."p-map-4.0.0" sources."p-try-2.2.0" sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."path-type-4.0.0" + sources."picomatch-2.2.2" + sources."reusify-1.0.4" + sources."rimraf-3.0.2" + sources."run-parallel-1.1.9" sources."rxjs-6.6.3" + sources."slash-3.0.0" + sources."temp-dir-2.0.0" + sources."tempy-0.7.1" + sources."to-regex-range-5.0.1" sources."tslib-1.13.0" + sources."type-fest-0.16.0" + sources."unique-string-2.0.0" sources."vscode-jsonrpc-5.0.1" sources."vscode-languageserver-6.1.1" sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.15.1" sources."vscode-uri-2.1.2" + sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -63295,10 +63462,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.33.3"; + version = "6.33.4"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.33.3.tgz"; - sha512 = "m/zeWqH/JXZvR/7D2j0TjK2jyDf8SFeAi0IWW92+elx28krC66lvzhVgoNiG8PpCLuT6rZk1yLhYAjMVEB4YyA=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.33.4.tgz"; + sha512 = "DrZNU3pm9PCWpP8yOut7XP0UTpu+bIzfvR4FCFbefN/kI87e9BNQ44rcZIf6R3B9KhVzKhByCw7mzkTwk+oy7g=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -63307,7 +63474,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.756.0" + sources."aws-sdk-2.763.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.1" sources."base64-js-1.3.1" @@ -63486,7 +63653,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-14.11.1" + sources."@types/node-14.11.2" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -63800,14 +63967,13 @@ in sources."@babel/code-frame-7.10.4" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@fluentui/date-time-utilities-7.8.1" + sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.139.0" - sources."@fluentui/react-focus-7.16.5" - sources."@fluentui/react-icons-0.3.4" + sources."@fluentui/react-7.143.0" + sources."@fluentui/react-focus-7.16.9" sources."@fluentui/react-window-provider-0.3.3" - sources."@fluentui/theme-0.3.2" + sources."@fluentui/theme-1.2.1" (sources."@gulp-sourcemaps/identity-map-1.0.2" // { dependencies = [ sources."normalize-path-2.1.1" @@ -63819,7 +63985,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.97" + sources."@microsoft/load-themed-styles-1.10.101" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -63833,7 +63999,7 @@ in sources."@types/connect-3.4.33" sources."@types/engine.io-3.1.4" sources."@types/express-4.17.7" - sources."@types/express-serve-static-core-4.17.12" + sources."@types/express-serve-static-core-4.17.13" sources."@types/fancy-log-1.3.0" sources."@types/glob-7.1.3" sources."@types/hls.js-0.13.0" @@ -63860,13 +64026,13 @@ in sources."@types/sqlite3-3.1.6" sources."@types/tough-cookie-4.0.0" sources."@types/url-join-4.0.0" - sources."@uifabric/foundation-7.9.5" - sources."@uifabric/icons-7.5.5" + sources."@uifabric/foundation-7.9.9" + sources."@uifabric/icons-7.5.8" sources."@uifabric/merge-styles-7.19.1" - sources."@uifabric/react-hooks-7.13.4" + sources."@uifabric/react-hooks-7.13.5" sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.16.5" - sources."@uifabric/utilities-7.32.2" + sources."@uifabric/styling-7.16.9" + sources."@uifabric/utilities-7.32.3" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -63996,7 +64162,7 @@ in sources."define-property-1.0.0" ]; }) - sources."base64-arraybuffer-0.1.5" + sources."base64-arraybuffer-0.1.4" sources."base64-js-1.3.1" sources."base64id-2.0.0" sources."basic-auth-2.0.1" @@ -64247,14 +64413,15 @@ in sources."ms-2.1.2" ]; }) - (sources."engine.io-client-3.4.3" // { + (sources."engine.io-client-3.4.4" // { dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.2" + sources."debug-3.1.0" + sources."parseqs-0.0.6" + sources."parseuri-0.0.6" sources."ws-6.1.4" ]; }) - sources."engine.io-parser-2.2.0" + sources."engine.io-parser-2.2.1" sources."enhanced-resolve-4.3.0" sources."errno-0.1.7" sources."error-ex-1.3.2" @@ -64518,7 +64685,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -64686,7 +64853,7 @@ in ]; }) sources."mkdirp-1.0.4" - sources."moment-2.28.0" + sources."moment-2.29.0" (sources."morgan-1.10.0" // { dependencies = [ sources."depd-2.0.0" @@ -64781,7 +64948,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.139.0" + sources."office-ui-fabric-react-7.143.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -65054,12 +65221,14 @@ in sources."socket.io-adapter-1.1.2" (sources."socket.io-client-2.3.0" // { dependencies = [ + sources."base64-arraybuffer-0.1.5" sources."component-emitter-1.2.1" sources."debug-4.1.1" sources."isarray-2.0.1" sources."ms-2.1.2" - (sources."socket.io-parser-3.3.0" // { + (sources."socket.io-parser-3.3.1" // { dependencies = [ + sources."component-emitter-1.3.0" sources."debug-3.1.0" sources."ms-2.0.0" ]; @@ -65189,7 +65358,7 @@ in sources."semver-6.3.0" ]; }) - sources."ts-log-2.1.4" + sources."ts-log-2.2.3" sources."tslib-1.13.0" (sources."tslint-6.1.2" // { dependencies = [ @@ -65248,7 +65417,7 @@ in sources."value-or-function-3.0.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."vinyl-2.2.0" + sources."vinyl-2.2.1" sources."vinyl-fs-3.0.3" (sources."vinyl-sourcemap-1.1.0" // { dependencies = [ @@ -65357,10 +65526,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.9.0"; + version = "7.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.9.0.tgz"; - sha512 = "V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.10.0.tgz"; + sha512 = "BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -65546,7 +65715,7 @@ in sources."emoji-regex-7.0.3" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.9.0" + sources."eslint-7.10.0" sources."eslint-scope-5.1.1" sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" @@ -66184,7 +66353,7 @@ in sources."is-arguments-1.0.4" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -66530,7 +66699,7 @@ in sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - sources."moment-2.28.0" + sources."moment-2.29.0" sources."moo-0.5.1" sources."ms-2.1.2" sources."multicb-1.2.2" @@ -66933,7 +67102,7 @@ in sources."type-fest-0.11.0" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" - (sources."update-notifier-4.1.1" // { + (sources."update-notifier-4.1.3" // { dependencies = [ sources."chalk-3.0.0" ]; @@ -66985,33 +67154,33 @@ in sources."@exodus/schemasafe-1.0.0-rc.2" sources."@graphql-cli/common-4.0.0" sources."@graphql-cli/init-4.0.0" - sources."@graphql-tools/delegate-6.2.3" - (sources."@graphql-tools/graphql-file-loader-6.2.3" // { + sources."@graphql-tools/delegate-6.2.4" + (sources."@graphql-tools/graphql-file-loader-6.2.4" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/import-6.2.3" // { + (sources."@graphql-tools/import-6.2.4" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/json-file-loader-6.2.3" // { + (sources."@graphql-tools/json-file-loader-6.2.4" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - sources."@graphql-tools/load-6.2.3" - sources."@graphql-tools/merge-6.2.3" - sources."@graphql-tools/schema-6.2.3" - (sources."@graphql-tools/url-loader-6.2.3" // { + sources."@graphql-tools/load-6.2.4" + sources."@graphql-tools/merge-6.2.4" + sources."@graphql-tools/schema-6.2.4" + (sources."@graphql-tools/url-loader-6.2.4" // { dependencies = [ sources."cross-fetch-3.0.6" sources."node-fetch-2.6.1" ]; }) - sources."@graphql-tools/utils-6.2.3" - sources."@graphql-tools/wrap-6.2.3" + sources."@graphql-tools/utils-6.2.4" + sources."@graphql-tools/wrap-6.2.4" sources."@kwsites/exec-p-0.4.0" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" @@ -67019,7 +67188,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.11.1" + sources."@types/node-14.11.2" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.1.0" @@ -67212,7 +67381,7 @@ in sources."is-arrayish-0.2.1" sources."is-bigint-1.0.0" sources."is-boolean-object-1.0.1" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-date-object-1.0.2" sources."is-docker-2.1.1" sources."is-extglob-2.1.1" @@ -67303,7 +67472,7 @@ in sources."number-is-nan-1.0.1" sources."oas-kit-common-1.0.8" sources."oas-linter-3.2.0" - sources."oas-resolver-2.5.0" + sources."oas-resolver-2.5.1" sources."oas-schema-walker-1.1.5" sources."oas-validator-3.4.0" sources."oauth-sign-0.9.0" @@ -68075,7 +68244,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -68317,7 +68486,7 @@ in sources."v8flags-3.2.0" sources."validate-npm-package-license-3.0.4" sources."value-or-function-3.0.0" - sources."vinyl-2.2.0" + sources."vinyl-2.2.1" sources."vinyl-fs-3.0.3" (sources."vinyl-sourcemap-1.1.0" // { dependencies = [ @@ -68483,7 +68652,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -68748,7 +68917,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.10.4" + sources."uglify-js-3.11.0" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -68986,7 +69155,7 @@ in sources."minimist-1.2.5" ]; }) - sources."moment-2.28.0" + sources."moment-2.29.0" sources."mv-2.1.1" sources."nan-2.14.1" sources."ncp-2.0.0" @@ -69047,10 +69216,10 @@ in insect = nodeEnv.buildNodePackage { name = "insect"; packageName = "insect"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/insect/-/insect-5.4.0.tgz"; - sha512 = "l4g7U75E+WgrgNGH774djfTyp5Aw+2jJokYe9iCunSAbi/w+nRGHqTJfwbODLwiJQTnbXkM42FxgPRA29Ce7Bg=="; + url = "https://registry.npmjs.org/insect/-/insect-5.5.0.tgz"; + sha512 = "Oac190s8AGYOYDvAP7PLNFm3gA+dtSoHl5yYGf9sgvMB+I8bRPfSNI6q4kra1QubpN5+/ARfGjGjAFUu10QsIg=="; }; dependencies = [ sources."@types/jquery-3.5.1" @@ -69308,7 +69477,7 @@ in }) sources."once-1.4.0" sources."onetime-2.0.1" - sources."open-7.2.1" + sources."open-7.3.0" sources."optionator-0.8.3" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -69906,10 +70075,10 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.1.8"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.1.8.tgz"; - sha512 = "oBMVeCZP/gQ66imuK65rQIXDl5NrpyMPoPGqzcBxsIyTKHV3w5nAYvB+TQUO1fHNw61EsaRhGVMCrO139kkdQw=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.2.2.tgz"; + sha512 = "cJ5dFzh620xT02z0nW5T9YTA4cIrvLOPoths3hHaazhBCpm4m+GIV9YdwKZsb+QQ4+Wrsh4T39X3O6ncwL4RmQ=="; }; dependencies = [ sources."@cronvel/get-pixels-3.4.0" @@ -69958,7 +70127,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.756.0" // { + (sources."aws-sdk-2.763.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -70200,8 +70369,8 @@ in dependencies = [ sources."dom-serializer-1.1.0" sources."domelementtype-2.0.2" - sources."domhandler-3.0.0" - sources."domutils-2.3.0" + sources."domhandler-3.2.0" + sources."domutils-2.4.1" sources."entities-2.0.3" ]; }) @@ -70365,7 +70534,7 @@ in }) sources."mkdirp-0.5.5" sources."mkdirp-classic-0.5.3" - sources."moment-2.28.0" + sources."moment-2.29.0" sources."ms-2.0.0" sources."multiparty-4.2.2" sources."nan-2.14.1" @@ -70425,7 +70594,7 @@ in sources."object.pick-1.3.0" sources."omggif-1.0.10" sources."once-1.4.0" - sources."open-7.2.1" + sources."open-7.3.0" sources."optionator-0.8.3" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -70531,6 +70700,7 @@ in sources."is-fullwidth-code-point-2.0.0" ]; }) + sources."slug-3.3.5" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -70678,7 +70848,6 @@ in sources."union-value-1.0.1" sources."uniq-1.0.1" sources."universalify-0.1.2" - sources."unorm-1.6.0" sources."unpack-string-0.0.2" (sources."unset-value-1.0.0" // { dependencies = [ @@ -70700,7 +70869,6 @@ in sources."url-0.10.3" sources."url-parse-1.4.7" sources."use-3.1.1" - sources."uslug-1.0.4" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."valid-url-1.0.9" @@ -71255,7 +71423,7 @@ in sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" sources."unpipe-1.0.0" - sources."update-notifier-4.1.1" + sources."update-notifier-4.1.3" sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" sources."utils-merge-1.0.1" @@ -71316,10 +71484,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-5.2.2.tgz"; - sha512 = "rB3Ua5yDxmIupTj67r3Q8itz7TxJzRE6DmVcOfV20D509Uu9AoBKlVwbZhND4kcm6BqLfbHtv4DZC9QJfrUY+w=="; + url = "https://registry.npmjs.org/karma/-/karma-5.2.3.tgz"; + sha512 = "tHdyFADhVVPBorIKCX8A37iLHxc6RBRphkSoQ+MLKdAtFn1k97tD8WUGi1KlEtDZKL3hui0qhsY9HXUfSNDYPQ=="; }; dependencies = [ sources."@types/color-name-1.1.1" @@ -71332,7 +71500,7 @@ in sources."async-limiter-1.0.1" sources."backo2-1.0.2" sources."balanced-match-1.0.0" - sources."base64-arraybuffer-0.1.5" + sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" sources."better-assert-1.0.2" sources."binary-extensions-2.1.0" @@ -71371,15 +71539,16 @@ in sources."ms-2.1.2" ]; }) - (sources."engine.io-client-3.4.3" // { + (sources."engine.io-client-3.4.4" // { dependencies = [ sources."component-emitter-1.3.0" - sources."debug-4.1.1" - sources."ms-2.1.2" + sources."debug-3.1.0" + sources."parseqs-0.0.6" + sources."parseuri-0.0.6" sources."ws-6.1.4" ]; }) - sources."engine.io-parser-2.2.0" + sources."engine.io-parser-2.2.1" sources."ent-2.2.0" sources."escape-html-1.0.3" sources."eventemitter3-4.0.7" @@ -71462,10 +71631,12 @@ in sources."socket.io-adapter-1.1.2" (sources."socket.io-client-2.3.0" // { dependencies = [ + sources."base64-arraybuffer-0.1.5" sources."debug-4.1.1" sources."ms-2.1.2" - (sources."socket.io-parser-3.3.0" // { + (sources."socket.io-parser-3.3.1" // { dependencies = [ + sources."component-emitter-1.3.0" sources."debug-3.1.0" sources."ms-2.0.0" ]; @@ -71494,7 +71665,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."type-is-1.6.18" - sources."ua-parser-js-0.7.21" + sources."ua-parser-js-0.7.22" sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."utils-merge-1.0.1" @@ -71559,7 +71730,7 @@ in sources."inherits-2.0.4" sources."is-absolute-1.0.0" sources."is-buffer-1.1.6" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-glob-3.1.0" @@ -71616,7 +71787,7 @@ in sources."unique-stream-2.3.1" sources."util-deprecate-1.0.2" sources."value-or-function-3.0.0" - sources."vinyl-2.2.0" + sources."vinyl-2.2.1" sources."vinyl-fs-3.0.3" sources."vinyl-sourcemap-1.1.0" sources."wrappy-1.0.2" @@ -71755,7 +71926,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.28.0" + sources."moment-2.29.0" sources."mute-stream-0.0.8" (sources."nconf-0.10.0" // { dependencies = [ @@ -72031,7 +72202,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.11.1" + sources."@types/node-14.11.2" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -72369,7 +72540,7 @@ in ]; }) sources."git-up-4.0.2" - sources."git-url-parse-11.2.0" + sources."git-url-parse-11.3.0" sources."gitconfiglocal-1.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.1" @@ -72435,7 +72606,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" @@ -72839,7 +73010,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."uglify-js-3.10.4" + sources."uglify-js-3.11.0" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -73340,7 +73511,7 @@ in sources."isobject-3.0.1" ]; }) - sources."base64-arraybuffer-0.1.5" + sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" @@ -73409,14 +73580,15 @@ in sources."ms-2.1.2" ]; }) - (sources."engine.io-client-3.4.3" // { + (sources."engine.io-client-3.4.4" // { dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.2" + sources."debug-3.1.0" + sources."parseqs-0.0.6" + sources."parseuri-0.0.6" sources."ws-6.1.4" ]; }) - sources."engine.io-parser-2.2.0" + sources."engine.io-parser-2.2.1" sources."entities-1.1.2" sources."escape-html-1.0.3" sources."etag-1.8.1" @@ -73720,12 +73892,14 @@ in sources."socket.io-adapter-1.1.2" (sources."socket.io-client-2.3.0" // { dependencies = [ + sources."base64-arraybuffer-0.1.5" sources."component-emitter-1.2.1" sources."debug-4.1.1" sources."isarray-2.0.1" sources."ms-2.1.2" - (sources."socket.io-parser-3.3.0" // { + (sources."socket.io-parser-3.3.1" // { dependencies = [ + sources."component-emitter-1.3.0" sources."debug-3.1.0" sources."ms-2.0.0" ]; @@ -73932,10 +74106,10 @@ in ]; }) sources."@jest/types-25.5.0" - sources."@types/babel__core-7.1.9" - sources."@types/babel__generator-7.6.1" - sources."@types/babel__template-7.0.2" - sources."@types/babel__traverse-7.0.14" + sources."@types/babel__core-7.1.10" + sources."@types/babel__generator-7.6.2" + sources."@types/babel__template-7.0.3" + sources."@types/babel__traverse-7.0.15" sources."@types/color-name-1.1.1" sources."@types/estree-0.0.45" sources."@types/graceful-fs-4.1.3" @@ -73943,10 +74117,10 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.6" - sources."@types/node-14.11.1" + sources."@types/node-14.11.2" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" - sources."@types/yargs-15.0.5" + sources."@types/yargs-15.0.7" sources."@types/yargs-parser-15.0.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -74105,7 +74279,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.14.3" + sources."browserslist-4.14.5" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.1" @@ -74120,7 +74294,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001133" + sources."caniuse-lite-1.0.30001140" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -74242,7 +74416,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.570" + sources."electron-to-chromium-1.3.576" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -74414,7 +74588,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" @@ -74900,7 +75074,7 @@ in sources."v8-compile-cache-2.1.1" sources."validate-npm-package-license-3.0.4" sources."verror-1.10.0" - sources."vinyl-2.2.0" + sources."vinyl-2.2.1" sources."vm-browserify-1.1.2" sources."walker-1.0.7" sources."watchpack-1.7.4" @@ -75066,7 +75240,7 @@ in sources."link-check-4.5.1" sources."lodash-4.17.20" sources."markdown-link-extractor-1.2.6" - sources."marked-1.1.1" + sources."marked-1.2.0" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."ms-2.1.2" @@ -75444,6 +75618,87 @@ in bypassCache = true; reconstructLock = true; }; + "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { + name = "_at_mermaid-js_slash_mermaid-cli"; + packageName = "@mermaid-js/mermaid-cli"; + version = "8.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.8.0.tgz"; + sha512 = "vHmikrgrYlaQFqYLFEShIjpAcz26vpXTA08c7QnAR8PN+6aIs9q2RREKcOTbd0Cm/0JoHZ0UwbCviaJIB3Ex1Q=="; + }; + dependencies = [ + sources."@types/color-name-1.1.1" + sources."@types/node-14.11.2" + sources."@types/yauzl-2.9.1" + sources."agent-base-5.1.1" + sources."ansi-styles-4.2.1" + sources."balanced-match-1.0.0" + sources."base64-js-1.3.1" + sources."bl-4.0.3" + sources."brace-expansion-1.1.11" + sources."buffer-5.6.0" + sources."buffer-crc32-0.2.13" + sources."chalk-4.1.0" + sources."chownr-1.1.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."commander-6.1.0" + sources."concat-map-0.0.1" + sources."debug-4.3.0" + sources."devtools-protocol-0.0.799653" + sources."end-of-stream-1.4.4" + sources."extract-zip-2.0.1" + sources."fd-slicer-1.1.0" + sources."find-up-4.1.0" + sources."fs-constants-1.0.0" + sources."fs.realpath-1.0.0" + sources."get-stream-5.2.0" + sources."glob-7.1.6" + sources."has-flag-4.0.0" + sources."https-proxy-agent-4.0.0" + sources."ieee754-1.1.13" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."locate-path-5.0.0" + sources."minimatch-3.0.4" + sources."mkdirp-classic-0.5.3" + sources."ms-2.1.2" + sources."once-1.4.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."pend-1.2.0" + sources."pkg-dir-4.2.0" + sources."progress-2.0.3" + sources."proxy-from-env-1.1.0" + sources."pump-3.0.0" + sources."puppeteer-5.3.1" + sources."readable-stream-3.6.0" + sources."rimraf-3.0.2" + sources."safe-buffer-5.2.1" + sources."string_decoder-1.3.0" + sources."supports-color-7.2.0" + sources."tar-fs-2.1.0" + sources."tar-stream-2.1.4" + sources."through-2.3.8" + sources."unbzip2-stream-1.4.3" + sources."util-deprecate-1.0.2" + sources."wrappy-1.0.2" + sources."ws-7.3.1" + sources."yauzl-2.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Command-line interface for mermaid"; + homepage = "https://github.com/mermaid-js/mermaid-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; mirakurun = nodeEnv.buildNodePackage { name = "mirakurun"; packageName = "mirakurun"; @@ -75453,24 +75708,23 @@ in sha512 = "uCsn3t7bV3jmy8mcgl19wowBq69Xz/Z/WUkazOC9PXvzzb9j5wvfr+qrwB5GtHkLBFIaBVI59HIX+JJ637jVmA=="; }; dependencies = [ - sources."@fluentui/date-time-utilities-7.8.1" + sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.139.0" - sources."@fluentui/react-focus-7.16.5" - sources."@fluentui/react-icons-0.3.4" + sources."@fluentui/react-7.143.0" + sources."@fluentui/react-focus-7.16.9" sources."@fluentui/react-window-provider-0.3.3" - sources."@fluentui/theme-0.3.2" - sources."@microsoft/load-themed-styles-1.10.97" + sources."@fluentui/theme-1.2.1" + sources."@microsoft/load-themed-styles-1.10.101" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@uifabric/foundation-7.9.5" - sources."@uifabric/icons-7.5.5" + sources."@uifabric/foundation-7.9.9" + sources."@uifabric/icons-7.5.8" sources."@uifabric/merge-styles-7.19.1" - sources."@uifabric/react-hooks-7.13.4" + sources."@uifabric/react-hooks-7.13.5" sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.16.5" - sources."@uifabric/utilities-7.32.2" + sources."@uifabric/styling-7.16.9" + sources."@uifabric/utilities-7.32.3" sources."accepts-1.3.7" sources."ajv-6.12.5" sources."ansi-escapes-1.4.0" @@ -75596,7 +75850,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.139.0" + sources."office-ui-fabric-react-7.143.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -75701,7 +75955,7 @@ in sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" - sources."ts-log-2.1.4" + sources."ts-log-2.2.3" sources."tslib-1.13.0" sources."type-is-1.6.18" sources."unpipe-1.0.0" @@ -75787,7 +76041,7 @@ in sources."is-arguments-1.0.4" sources."is-binary-path-2.1.0" sources."is-buffer-2.0.4" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -76016,15 +76270,12 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "2.63.3"; + version = "2.64.1"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.63.3.tgz"; - sha512 = "XHokxG0dgSYbewUj9ifRI/EiM8PYAwWaA31+WFCbGHi0kKHrVwFLx1FsQH3Yo35dQk7MM0dnHjT8xTir0slgZw=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.64.1.tgz"; + sha512 = "Lo1DX//zdGzbiRaDfcRd+RyjenNw7UvnZbFpSDiPUq+88BmTY2e9UinFCKoFmymG+o0+lYnRA+wynozknjFUQw=="; }; dependencies = [ - sources."@analytics/cookie-utils-0.2.3" - sources."@analytics/core-0.6.2" - sources."@analytics/storage-utils-0.2.4" sources."@babel/code-frame-7.10.4" (sources."@babel/compat-data-7.11.0" // { dependencies = [ @@ -76143,14 +76394,14 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-4.0.4" // { + (sources."@netlify/build-4.5.2" // { dependencies = [ sources."chalk-3.0.0" sources."resolve-2.0.0-next.1" ]; }) sources."@netlify/cache-utils-1.0.3" - (sources."@netlify/config-2.1.5" // { + (sources."@netlify/config-2.2.1" // { dependencies = [ sources."chalk-3.0.0" ]; @@ -76165,8 +76416,8 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@netlify/open-api-0.16.0" - sources."@netlify/plugin-edge-handlers-1.1.0" + sources."@netlify/open-api-0.16.1" + sources."@netlify/plugin-edge-handlers-1.6.0" sources."@netlify/run-utils-1.0.1" (sources."@netlify/zip-it-and-ship-it-1.3.12" // { dependencies = [ @@ -76343,19 +76594,17 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.11.1" + sources."@types/node-14.11.2" sources."@types/node-fetch-2.5.7" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-1.17.1" sources."@types/semver-5.5.0" - sources."@types/yargs-13.0.10" + sources."@types/yargs-13.0.11" sources."@types/yargs-parser-15.0.0" sources."@typescript-eslint/typescript-estree-2.34.0" sources."accepts-1.3.7" sources."agent-base-6.0.1" sources."aggregate-error-3.1.0" - sources."analytics-0.5.5" - sources."analytics-utils-0.2.2" (sources."ansi-align-3.0.0" // { dependencies = [ sources."emoji-regex-7.0.3" @@ -76404,7 +76653,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.756.0" // { + (sources."aws-sdk-2.763.0" // { dependencies = [ sources."buffer-4.9.2" sources."uuid-3.3.2" @@ -76439,13 +76688,14 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.14.3" + sources."browserslist-4.14.5" sources."btoa-lite-1.0.0" sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" sources."buffer-fill-1.0.0" + sources."buffer-from-1.1.1" sources."builtin-modules-3.1.0" sources."builtins-1.0.3" sources."byline-5.0.0" @@ -76459,7 +76709,7 @@ in sources."cachedir-2.3.0" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001133" + sources."caniuse-lite-1.0.30001140" sources."cardinal-2.1.1" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -76666,7 +76916,6 @@ in sources."pify-3.0.0" ]; }) - sources."dlv-1.1.3" sources."dot-prop-5.3.0" sources."dotenv-8.2.0" (sources."download-7.1.0" // { @@ -76690,7 +76939,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.570" + sources."electron-to-chromium-1.3.576" sources."elf-tools-1.1.2" sources."emoji-regex-8.0.0" sources."enabled-2.0.0" @@ -76763,7 +77012,11 @@ in sources."is-extendable-1.0.1" ]; }) - sources."external-editor-3.1.0" + (sources."external-editor-3.1.0" // { + dependencies = [ + sources."tmp-0.0.33" + ]; + }) (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -76899,7 +77152,7 @@ in ]; }) sources."has-yarn-2.1.0" - (sources."hasha-5.2.0" // { + (sources."hasha-5.2.1" // { dependencies = [ sources."is-stream-2.0.0" ]; @@ -76972,7 +77225,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" @@ -77016,6 +77269,7 @@ in sources."isurl-1.0.0" sources."jest-get-type-24.9.0" sources."jest-validate-24.9.0" + sources."jest-worker-26.3.0" sources."jmespath-0.15.0" sources."js-string-escape-1.0.1" sources."js-tokens-4.0.0" @@ -77159,7 +77413,7 @@ in sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" - (sources."netlify-4.5.1" // { + (sources."netlify-4.6.0" // { dependencies = [ sources."qs-6.9.4" ]; @@ -77299,7 +77553,7 @@ in sources."pinkie-promise-2.0.1" sources."pkg-dir-4.2.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.34" // { + (sources."postcss-7.0.35" // { dependencies = [ sources."has-flag-3.0.0" sources."source-map-0.6.1" @@ -77329,6 +77583,7 @@ in sources."querystring-0.2.0" sources."random-bytes-1.0.0" sources."random-item-3.0.0" + sources."randombytes-2.1.0" sources."range-parser-1.2.1" (sources."raw-body-2.4.1" // { dependencies = [ @@ -77379,7 +77634,8 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.28.1" + sources."rollup-2.28.2" + sources."rollup-plugin-terser-7.0.2" sources."run-async-2.4.1" sources."run-parallel-1.1.9" sources."rxjs-6.6.3" @@ -77406,6 +77662,7 @@ in sources."ms-2.1.1" ]; }) + sources."serialize-javascript-4.0.0" sources."serve-static-1.14.1" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { @@ -77460,6 +77717,11 @@ in sources."sort-keys-length-1.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" + (sources."source-map-support-0.5.19" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."source-map-url-0.4.0" sources."sourcemap-codec-1.4.8" sources."spdx-correct-3.1.1" @@ -77555,6 +77817,11 @@ in ]; }) sources."term-size-2.2.0" + (sources."terser-5.3.3" // { + dependencies = [ + sources."source-map-0.7.3" + ]; + }) sources."text-hex-1.0.0" sources."through-2.3.8" (sources."through2-2.0.5" // { @@ -77567,7 +77834,8 @@ in sources."through2-map-3.0.0" sources."time-zone-1.0.0" sources."timed-out-4.0.1" - sources."tmp-0.0.33" + sources."tmp-0.2.1" + sources."tmp-promise-3.0.2" sources."to-buffer-1.1.1" sources."to-fast-properties-2.0.0" (sources."to-object-path-0.3.0" // { @@ -77623,7 +77891,7 @@ in sources."has-values-0.1.4" ]; }) - (sources."update-notifier-4.1.1" // { + (sources."update-notifier-4.1.3" // { dependencies = [ sources."chalk-3.0.0" ]; @@ -77682,7 +77950,7 @@ in sources."y18n-4.0.0" sources."yargs-15.4.1" sources."yargs-parser-18.1.3" - sources."yarn-1.22.5" + sources."yarn-1.22.10" sources."yauzl-2.10.0" sources."zip-stream-3.0.1" ]; @@ -78540,7 +78808,7 @@ in }) sources."minizlib-1.3.3" sources."mkdirp-0.5.5" - sources."moment-2.28.0" + sources."moment-2.29.0" sources."moment-timezone-0.5.31" (sources."mqtt-2.18.8" // { dependencies = [ @@ -79075,7 +79343,7 @@ in ]; }) sources."unique-string-2.0.0" - sources."update-notifier-4.1.1" + sources."update-notifier-4.1.3" sources."url-parse-lax-3.0.0" sources."widest-line-3.1.0" sources."wrappy-1.0.2" @@ -79113,10 +79381,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "9.0.1"; + version = "9.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-9.0.1.tgz"; - sha512 = "xSMyNEIvsrNPDh5r1N/VxDGE+5ZkiEx8BxBvoEBWc/rsaHHfwKCvsY3qJjAn064pULH4uTrT7+kJwroHYsY/Yw=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-9.0.3.tgz"; + sha512 = "/pO7pFcPd8EUPvipS5aeiwGHIa0HXvl2+IJOZ9rlS/jXYJmHE7Y1V/jxZEN5gOVUT8fCAdJRMmN57ydeH+Mv0Q=="; }; dependencies = [ sources."@npmcli/ci-detect-1.3.0" @@ -79124,7 +79392,7 @@ in sources."@npmcli/installed-package-contents-1.0.5" sources."@npmcli/move-file-1.0.1" sources."@npmcli/promise-spawn-1.2.0" - sources."@npmcli/run-script-1.5.0" + sources."@npmcli/run-script-1.6.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" @@ -79308,34 +79576,17 @@ in sources."minimist-1.2.5" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - (sources."minipass-fetch-1.3.1" // { - dependencies = [ - sources."minizlib-2.1.2" - ]; - }) + sources."minipass-fetch-1.3.1" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" sources."minipass-sized-1.0.3" - (sources."minizlib-1.3.3" // { - dependencies = [ - sources."minipass-2.9.0" - sources."yallist-3.1.1" - ]; - }) + sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" - (sources."node-gyp-6.1.0" // { + (sources."node-gyp-7.1.0" // { dependencies = [ - sources."chownr-1.1.4" - sources."fs-minipass-1.2.7" - sources."minipass-2.9.0" - sources."mkdirp-0.5.5" sources."rimraf-2.7.1" - sources."semver-5.7.1" - sources."tar-4.4.13" - sources."which-1.3.1" - sources."yallist-3.1.1" ]; }) sources."nopt-4.0.3" @@ -79346,11 +79597,7 @@ in sources."npm-package-arg-8.0.1" sources."npm-packlist-2.1.2" sources."npm-pick-manifest-6.1.0" - (sources."npm-registry-fetch-8.1.4" // { - dependencies = [ - sources."minizlib-2.1.2" - ]; - }) + sources."npm-registry-fetch-8.1.4" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" @@ -79422,11 +79669,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - (sources."tar-6.0.5" // { - dependencies = [ - sources."minizlib-2.1.2" - ]; - }) + sources."tar-6.0.5" sources."term-size-2.2.0" sources."to-readable-stream-1.0.0" sources."tough-cookie-2.5.0" @@ -79437,7 +79680,7 @@ in sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-string-2.0.0" - (sources."update-notifier-4.1.1" // { + (sources."update-notifier-4.1.3" // { dependencies = [ sources."chalk-3.0.0" ]; @@ -79907,7 +80150,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.14.3" + sources."browserslist-4.14.5" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -79923,7 +80166,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001133" + sources."caniuse-lite-1.0.30001140" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -80057,7 +80300,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.570" + sources."electron-to-chromium-1.3.576" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -80187,7 +80430,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-color-stop-1.1.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ @@ -80357,7 +80600,7 @@ in sources."physical-cpu-count-2.0.0" sources."pn-1.1.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.34" // { + (sources."postcss-7.0.35" // { dependencies = [ sources."supports-color-6.1.0" ]; @@ -80419,7 +80662,7 @@ in sources."postcss-ordered-values-4.1.2" sources."postcss-reduce-initial-4.0.3" sources."postcss-reduce-transforms-4.0.2" - sources."postcss-selector-parser-6.0.3" + sources."postcss-selector-parser-6.0.4" sources."postcss-svgo-4.0.2" sources."postcss-unique-selectors-4.0.1" sources."postcss-value-parser-3.3.1" @@ -80808,7 +81051,7 @@ in sources."inherits-2.0.3" sources."ipaddr.js-1.9.1" sources."is-arguments-1.0.4" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-date-object-1.0.2" sources."is-fullwidth-code-point-2.0.0" sources."is-negative-zero-2.0.0" @@ -80846,7 +81089,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - sources."moment-2.28.0" + sources."moment-2.29.0" sources."ms-2.0.0" sources."msgpack5-3.6.0" sources."mv-2.1.1" @@ -80945,7 +81188,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.10.4" + sources."uglify-js-3.11.0" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.0" @@ -81380,7 +81623,7 @@ in sources."ipaddr.js-2.0.0" sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-date-object-1.0.2" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" @@ -81602,7 +81845,7 @@ in sources."aws4-1.10.1" sources."backo2-1.0.2" sources."balanced-match-1.0.0" - sources."base64-arraybuffer-0.1.5" + sources."base64-arraybuffer-0.1.4" sources."base64-js-1.3.1" sources."base64id-2.0.0" sources."basic-auth-2.0.1" @@ -81679,15 +81922,16 @@ in sources."ms-2.1.2" ]; }) - (sources."engine.io-client-3.4.3" // { + (sources."engine.io-client-3.4.4" // { dependencies = [ sources."component-emitter-1.3.0" - sources."debug-4.1.1" - sources."ms-2.1.2" + sources."debug-3.1.0" + sources."parseqs-0.0.6" + sources."parseuri-0.0.6" sources."ws-6.1.4" ]; }) - sources."engine.io-parser-2.2.0" + sources."engine.io-parser-2.2.1" sources."escape-html-1.0.3" sources."etag-1.8.1" sources."express-4.17.1" @@ -81878,11 +82122,13 @@ in sources."socket.io-adapter-1.1.2" (sources."socket.io-client-2.3.0" // { dependencies = [ + sources."base64-arraybuffer-0.1.5" sources."debug-4.1.1" sources."isarray-2.0.1" sources."ms-2.1.2" - (sources."socket.io-parser-3.3.0" // { + (sources."socket.io-parser-3.3.1" // { dependencies = [ + sources."component-emitter-1.3.0" sources."debug-3.1.0" sources."ms-2.0.0" ]; @@ -81951,10 +82197,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.7.0"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.7.0.tgz"; - sha512 = "5+ZKJUKhh6indenG8egpELjgAEQKO6fx5LHlepDr3zymkX6EupySjPh/E/20ue920bUbMdvC0Hi2S71S45IJ7A=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.8.0.tgz"; + sha512 = "J2rAxEXnohwcDkR4KNI6UsYhDs9hJ/tje/BahHpXawi406pmxd6caJUXfRxZPbKvKdyVqfBRKhlX1vyhYbM8lQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -81969,10 +82215,10 @@ in postcss-cli = nodeEnv.buildNodePackage { name = "postcss-cli"; packageName = "postcss-cli"; - version = "7.1.2"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-7.1.2.tgz"; - sha512 = "3mlEmN1v2NVuosMWZM2tP8bgZn7rO5PYxRRrXtdSyL5KipcgBDjJ9ct8/LKxImMCJJi3x5nYhCGFJOkGyEqXBQ=="; + url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-8.0.0.tgz"; + sha512 = "WgQIz1tc8htjob2DULE6dTssDzItuBh3UbscdrAlvid7M6X2WBZUrHCaLMtIuFkHFijAnimIq3nkpXV6FdDTSg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" @@ -81990,24 +82236,22 @@ in sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" - sources."camelcase-5.3.1" sources."chalk-4.1.0" sources."chokidar-3.4.2" - sources."cliui-6.0.0" + sources."cliui-7.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."colorette-1.2.1" sources."cosmiconfig-5.2.1" - sources."decamelize-1.2.0" sources."dependency-graph-0.9.0" sources."dir-glob-3.0.1" sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" - sources."escape-string-regexp-1.0.5" + sources."escalade-3.1.0" sources."esprima-4.0.1" sources."fast-glob-3.2.4" sources."fastq-1.8.0" sources."fill-range-7.0.1" - sources."find-up-4.1.0" sources."fs-extra-9.0.1" sources."fsevents-2.1.3" sources."get-caller-file-2.0.5" @@ -82030,76 +82274,39 @@ in sources."js-yaml-3.14.0" sources."json-parse-better-errors-1.0.2" sources."jsonfile-6.0.1" - sources."locate-path-5.0.0" - sources."lodash-4.17.20" - (sources."log-symbols-2.2.0" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) + sources."lodash.difference-4.5.0" + sources."lodash.forown-4.4.0" + sources."lodash.get-4.4.2" + sources."lodash.groupby-4.6.0" + sources."lodash.sortby-4.7.0" + sources."log-symbols-4.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.2" sources."normalize-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" sources."parse-json-4.0.0" - sources."path-exists-4.0.0" sources."path-type-4.0.0" sources."picomatch-2.2.2" sources."pify-2.3.0" - (sources."postcss-7.0.34" // { - dependencies = [ - sources."ansi-styles-3.2.1" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."supports-color-5.5.0" - ]; - }) - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-6.1.0" - ]; - }) - sources."postcss-load-config-2.1.1" - (sources."postcss-reporter-6.0.1" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) + sources."postcss-load-config-2.1.2" + sources."postcss-reporter-7.0.1" sources."pretty-hrtime-1.0.3" sources."read-cache-1.0.0" sources."readdirp-3.4.0" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" sources."resolve-from-3.0.0" sources."reusify-1.0.4" sources."run-parallel-1.1.9" - sources."set-blocking-2.0.0" sources."slash-3.0.0" - sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" sources."universalify-1.0.0" - sources."which-module-2.0.0" - sources."wrap-ansi-6.2.0" - sources."y18n-4.0.0" - sources."yargs-15.4.1" - sources."yargs-parser-18.1.3" + sources."wrap-ansi-7.0.0" + sources."y18n-5.0.1" + sources."yargs-16.0.3" + sources."yargs-parser-20.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -82503,10 +82710,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.73"; + version = "1.1.75"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.73.tgz"; - sha512 = "IWW7ZCp/Mk0WOVX9o1/L/Usq+vQODEDOaxlLSCDCClBAdjQsxCCo4FYZPMs4Ec3GKRwEmXHwzW8ZIit3J/cHKw=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.75.tgz"; + sha512 = "mwIUq71cfiVKep0QGB3cO+rjaU5t7v9D5CPIKWkBI9VJ6ENRpx8pwUrO+oANDHGCrCLtpDnJXA7n+4GcoXVojg=="; }; buildInputs = globalBuildInputs; meta = { @@ -82558,7 +82765,7 @@ in sources."is-arguments-1.0.4" sources."is-bigint-1.0.0" sources."is-boolean-object-1.0.1" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-date-object-1.0.2" sources."is-map-2.0.1" sources."is-negative-zero-2.0.0" @@ -82863,7 +83070,7 @@ in sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."jsesc-2.5.2" - sources."json-pointer-0.6.0" + sources."json-pointer-0.6.1" sources."json-schema-ref-parser-6.1.0" sources."json-schema-traverse-0.3.1" sources."json-to-ast-2.1.0" @@ -82906,7 +83113,7 @@ in sources."number-is-nan-1.0.1" sources."oas-kit-common-1.0.8" sources."oas-linter-3.2.0" - sources."oas-resolver-2.5.0" + sources."oas-resolver-2.5.1" sources."oas-schema-walker-1.1.5" sources."oas-validator-3.4.0" sources."object-assign-4.1.1" @@ -82948,8 +83155,8 @@ in sources."randomfill-1.0.4" sources."react-16.13.1" sources."react-dom-16.13.1" - sources."react-dropdown-1.8.0" - (sources."react-hot-loader-4.12.21" // { + sources."react-dropdown-1.9.0" + (sources."react-hot-loader-4.13.0" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -83022,7 +83229,7 @@ in sources."to-regex-range-5.0.1" sources."tslib-2.0.1" sources."tty-browserify-0.0.0" - sources."uglify-js-3.10.4" + sources."uglify-js-3.11.0" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -83102,10 +83309,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.28.1"; + version = "2.28.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.28.1.tgz"; - sha512 = "DOtVoqOZt3+FjPJWLU8hDIvBjUylc9s6IZvy76XklxzcLvAQLtVAG/bbhsMhcWnYxC0TKKcf1QQ/tg29zeID0Q=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.28.2.tgz"; + sha512 = "8txbsFBFLmm9Xdt4ByTOGa9Muonmc8MfNjnGAR8U8scJlF1ZW7AgNZa7aqBXaKtlvnYP/ab++fQIq9dB9NWUbg=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -83241,7 +83448,7 @@ in sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.9.0" // { + (sources."eslint-7.10.0" // { dependencies = [ sources."semver-7.3.2" ]; @@ -83308,7 +83515,7 @@ in sources."is-arguments-1.0.4" sources."is-binary-path-2.1.0" sources."is-buffer-2.0.4" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -83405,7 +83612,7 @@ in sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" - sources."rollup-2.28.1" + sources."rollup-2.28.2" sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."serialize-javascript-4.0.0" @@ -83450,7 +83657,7 @@ in sources."url-join-1.1.0" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.1.1" - (sources."vsce-1.79.5" // { + (sources."vsce-1.80.0" // { dependencies = [ sources."chalk-2.4.2" sources."semver-5.7.1" @@ -83772,10 +83979,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.1.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.1.1.tgz"; - sha512 = "e9NoM93/1hWm2+5YsfNbZPZuqjD62B2k16j85hTuLoOtkDPjp80vma9he4kMwbJoEoU4cT332vBWg8+EQmdkFA=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.3.0.tgz"; + sha512 = "glI1JOC5c4HBWRgo+mlhBv/PdFCNSGQDsmLdC5l1jj+yTL3zVMVSu+M0/ZizcyxCWu157H5V1pYRGyNbhP7slg=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -83801,16 +84008,30 @@ in sources."@protobufjs/utf8-1.1.0" (sources."@serverless/cli-1.5.2" // { dependencies = [ + sources."@serverless/utils-1.2.0" sources."chalk-2.4.2" + sources."uuid-3.4.0" ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.1.3" // { + (sources."@serverless/components-3.2.1" // { dependencies = [ - sources."chalk-2.4.2" - sources."fs-extra-8.1.0" - sources."globby-10.0.2" - sources."uuid-3.4.0" + sources."@sindresorhus/is-3.1.2" + sources."@szmarczak/http-timer-4.0.5" + sources."ansi-regex-5.0.0" + sources."cacheable-request-7.0.1" + sources."decompress-response-6.0.0" + sources."defer-to-connect-2.0.0" + sources."get-stream-5.2.0" + sources."got-11.7.0" + sources."json-buffer-3.0.1" + sources."keyv-4.0.3" + sources."lowercase-keys-2.0.0" + sources."mimic-response-3.1.0" + sources."p-cancelable-2.0.0" + sources."ramda-0.27.1" + sources."responselike-2.0.0" + sources."strip-ansi-6.0.0" ]; }) (sources."@serverless/core-1.1.2" // { @@ -83819,25 +84040,10 @@ in sources."semver-6.3.0" ]; }) - (sources."@serverless/enterprise-plugin-4.0.4" // { - dependencies = [ - sources."@serverless/platform-client-2.0.2" - ]; - }) + sources."@serverless/enterprise-plugin-4.0.4" sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/inquirer-1.1.2" // { - dependencies = [ - sources."chalk-2.4.2" - ]; - }) - sources."@serverless/platform-client-1.1.10" - (sources."@serverless/platform-client-china-1.1.0" // { - dependencies = [ - sources."archiver-4.0.2" - sources."async-3.2.0" - sources."fs-extra-8.1.0" - ]; - }) + sources."@serverless/platform-client-2.1.0" + sources."@serverless/platform-client-china-2.0.0" (sources."@serverless/platform-sdk-2.3.2" // { dependencies = [ sources."chalk-2.4.2" @@ -83851,27 +84057,26 @@ in ]; }) sources."@serverless/template-1.1.3" - (sources."@serverless/utils-1.2.0" // { + (sources."@serverless/utils-2.0.0" // { dependencies = [ - sources."chalk-2.4.2" - sources."uuid-3.4.0" + sources."write-file-atomic-3.0.3" ]; }) - sources."@serverless/utils-china-0.1.28" + sources."@serverless/utils-china-1.0.2" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@tencent-sdk/capi-0.2.17" + sources."@tencent-sdk/capi-1.1.4" + sources."@types/cacheable-request-6.0.1" sources."@types/caseless-0.12.2" - sources."@types/chalk-2.2.0" sources."@types/color-name-1.1.1" - sources."@types/glob-7.1.3" + sources."@types/http-cache-semantics-4.0.0" + sources."@types/keyv-3.1.1" sources."@types/lodash-4.14.161" sources."@types/long-4.0.1" - sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.1" - sources."@types/object-assign-4.0.30" + sources."@types/node-14.11.2" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" + sources."@types/responselike-1.0.0" sources."@types/tough-cookie-4.0.0" sources."adm-zip-0.4.16" sources."after-0.8.2" @@ -83880,6 +84085,8 @@ in sources."ajv-keywords-3.5.2" (sources."ansi-align-3.0.0" // { dependencies = [ + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" ]; }) @@ -83895,9 +84102,6 @@ in (sources."archiver-5.0.2" // { dependencies = [ sources."async-3.2.0" - sources."compress-commons-4.0.1" - sources."crc32-stream-4.0.0" - sources."zip-stream-4.0.2" ]; }) (sources."archiver-utils-2.1.0" // { @@ -83917,7 +84121,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.756.0" // { + (sources."aws-sdk-2.763.0" // { dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" @@ -83939,16 +84143,11 @@ in sources."bluebird-3.7.2" (sources."boxen-4.2.0" // { dependencies = [ - sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."chalk-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."emoji-regex-8.0.0" sources."has-flag-4.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" sources."type-fest-0.8.1" ]; @@ -83962,6 +84161,7 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."builtin-modules-3.1.0" + sources."cacheable-lookup-5.0.3" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -83990,8 +84190,8 @@ in sources."ansi-regex-2.1.1" ]; }) - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.1" + sources."cli-cursor-3.1.0" + sources."cli-width-3.0.0" sources."clone-response-1.0.2" sources."color-3.0.0" sources."color-convert-1.9.3" @@ -84005,14 +84205,7 @@ in sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" - (sources."compress-commons-3.0.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."compress-commons-4.0.1" sources."concat-map-0.0.1" (sources."content-disposition-0.5.3" // { dependencies = [ @@ -84022,7 +84215,7 @@ in sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" sources."crc-3.8.0" - sources."crc32-stream-3.0.1" + sources."crc32-stream-4.0.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -84034,14 +84227,10 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.8.36" + sources."dayjs-1.9.1" sources."debug-3.1.0" sources."decode-uri-component-0.2.0" - (sources."decompress-4.2.1" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) + sources."decompress-4.2.1" sources."decompress-response-3.3.0" (sources."decompress-tar-4.1.1" // { dependencies = [ @@ -84063,13 +84252,11 @@ in dependencies = [ sources."file-type-3.9.0" sources."get-stream-2.3.1" - sources."pify-2.3.0" ]; }) sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" sources."deferred-0.7.11" - sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."diagnostics-1.1.1" sources."dijkstrajs-1.0.1" @@ -84106,18 +84293,22 @@ in sources."duplexify-4.1.1" sources."duration-0.2.2" sources."ecc-jsbn-0.1.2" - sources."emoji-regex-7.0.3" + sources."emoji-regex-8.0.0" sources."enabled-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-client-3.4.3" // { + (sources."engine.io-client-3.4.4" // { dependencies = [ sources."component-emitter-1.3.0" - sources."debug-4.1.1" - sources."ms-2.1.2" + sources."parseqs-0.0.6" + sources."parseuri-0.0.6" sources."ws-6.1.4" ]; }) - sources."engine.io-parser-2.2.0" + (sources."engine.io-parser-2.2.1" // { + dependencies = [ + sources."base64-arraybuffer-0.1.4" + ]; + }) sources."env-variable-0.0.6" sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" @@ -84185,7 +84376,6 @@ in sources."fs.realpath-1.0.0" sources."fs2-0.3.8" sources."fsevents-2.1.3" - sources."function-bind-1.1.1" sources."get-stdin-8.0.0" sources."get-stream-4.1.0" sources."getpass-0.1.7" @@ -84204,6 +84394,7 @@ in sources."has-to-string-tag-x-1.4.1" sources."http-cache-semantics-4.1.0" sources."http-signature-1.2.0" + sources."http2-wrapper-1.0.0-beta.5.2" (sources."https-proxy-agent-5.0.0" // { dependencies = [ sources."agent-base-6.0.1" @@ -84220,11 +84411,10 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-6.5.2" // { + (sources."inquirer-7.3.3" // { dependencies = [ - sources."ansi-escapes-3.2.0" - sources."chalk-2.4.2" - sources."figures-2.0.0" + sources."ansi-regex-5.0.0" + sources."strip-ansi-6.0.0" ]; }) sources."inquirer-autocomplete-prompt-1.1.0" @@ -84233,7 +84423,7 @@ in sources."is-binary-path-2.1.0" sources."is-docker-2.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-natural-number-4.0.1" sources."is-number-7.0.0" @@ -84315,14 +84505,14 @@ in sources."mime-1.6.0" sources."mime-db-1.44.0" sources."mime-types-2.1.27" - sources."mimic-fn-1.2.0" + sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - sources."moment-2.28.0" + sources."moment-2.29.0" sources."ms-2.0.0" - sources."mute-stream-0.0.7" + sources."mute-stream-0.0.8" sources."nanoid-2.1.11" sources."native-promise-only-0.8.1" sources."ncjsm-4.1.0" @@ -84336,11 +84526,10 @@ in sources."object-assign-4.1.1" sources."object-component-0.0.3" sources."object-hash-2.0.3" - sources."object-keys-1.1.1" sources."once-1.4.0" sources."one-time-0.0.4" - sources."onetime-2.0.1" - sources."open-7.2.1" + sources."onetime-5.1.2" + sources."open-7.3.0" (sources."opn-5.5.0" // { dependencies = [ sources."is-wsl-1.1.0" @@ -84369,7 +84558,7 @@ in sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picomatch-2.2.2" - sources."pify-5.0.0" + sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prepend-http-2.0.0" @@ -84387,10 +84576,11 @@ in sources."qs-6.5.2" sources."query-string-5.1.1" sources."querystring-0.2.0" + sources."quick-lru-5.1.1" sources."ramda-0.26.1" sources."rc-1.2.8" sources."readable-stream-3.6.0" - sources."readdir-glob-1.0.0" + sources."readdir-glob-1.1.0" sources."readdirp-3.4.0" sources."regenerator-runtime-0.13.7" sources."registry-auth-token-4.2.0" @@ -84404,8 +84594,9 @@ in }) sources."request-promise-core-1.1.4" sources."request-promise-native-1.0.9" + sources."resolve-alpn-1.0.0" sources."responselike-1.0.2" - sources."restore-cursor-2.0.0" + sources."restore-cursor-3.1.0" sources."reusify-1.0.4" sources."run-async-2.4.1" sources."run-parallel-1.1.9" @@ -84434,7 +84625,11 @@ in sources."ms-2.1.2" ]; }) - sources."socket.io-parser-3.3.0" + (sources."socket.io-parser-3.3.1" // { + dependencies = [ + sources."component-emitter-1.3.0" + ]; + }) sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" sources."source-map-0.6.1" @@ -84447,13 +84642,11 @@ in sources."stealthy-require-1.1.1" sources."stream-promise-3.2.0" sources."stream-shift-1.0.1" - sources."stream.finished-1.2.0" - sources."stream.pipeline-shim-1.1.0" sources."strict-uri-encode-1.1.0" - (sources."string-width-2.1.1" // { + (sources."string-width-4.2.0" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" + sources."ansi-regex-5.0.0" + sources."strip-ansi-6.0.0" ]; }) sources."string_decoder-1.3.0" @@ -84472,8 +84665,22 @@ in sources."supports-color-5.5.0" (sources."tabtab-3.0.2" // { dependencies = [ + sources."ansi-escapes-3.2.0" + sources."ansi-regex-3.0.0" + sources."chalk-2.4.2" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.1" sources."debug-4.3.0" + sources."figures-2.0.0" + sources."inquirer-6.5.2" + sources."is-fullwidth-code-point-2.0.0" + sources."mimic-fn-1.2.0" sources."ms-2.1.2" + sources."mute-stream-0.0.7" + sources."onetime-2.0.1" + sources."restore-cursor-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" sources."untildify-3.0.3" ]; }) @@ -84497,6 +84704,7 @@ in sources."tweetnacl-0.14.5" sources."type-2.1.0" sources."type-fest-0.11.0" + sources."typedarray-to-buffer-3.1.5" sources."unbzip2-stream-1.4.3" sources."universalify-0.1.2" sources."untildify-4.0.0" @@ -84513,15 +84721,7 @@ in sources."uuid-8.3.0" sources."verror-1.10.0" sources."which-1.3.1" - (sources."widest-line-3.1.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" - ]; - }) + sources."widest-line-3.1.0" sources."winston-3.2.1" (sources."winston-transport-4.4.0" // { dependencies = [ @@ -84543,7 +84743,7 @@ in sources."yargs-parser-20.2.0" sources."yauzl-2.10.0" sources."yeast-0.1.2" - sources."zip-stream-3.0.1" + sources."zip-stream-4.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -85118,7 +85318,7 @@ in sources."clone-0.1.5" sources."dashdash-1.10.1" sources."extsprintf-1.0.0" - (sources."http-signature-1.3.4" // { + (sources."http-signature-1.3.5" // { dependencies = [ sources."assert-plus-1.0.0" sources."dashdash-1.14.1" @@ -85182,10 +85382,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.399.0"; + version = "1.405.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.399.0.tgz"; - sha512 = "o1okhJvmRpETbMHCyJvXaVOLIVtlbledhztTZKsnMRs0wgim/GyNNWTboqM5a0aR23OpQzW8qlV3BQRsAvEisw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.405.0.tgz"; + sha512 = "WHvO3XCKV/l5u27MhsWEfh21DbM8Bp7iQK27z+G2fONecg+OAMp7EabbS1a4NyvWsz3TuPQRykscMuCe7CxvsQ=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" @@ -85195,7 +85395,7 @@ in sources."@snyk/dep-graph-1.19.4" sources."@snyk/docker-registry-v2-client-1.13.5" sources."@snyk/gemfile-1.2.0" - sources."@snyk/java-call-graph-builder-1.13.2" + sources."@snyk/java-call-graph-builder-1.14.0" sources."@snyk/rpm-parser-2.0.0" (sources."@snyk/snyk-cocoapods-plugin-2.5.1" // { dependencies = [ @@ -85216,7 +85416,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/js-yaml-3.12.5" sources."@types/keyv-3.1.1" - sources."@types/node-14.11.1" + sources."@types/node-14.11.2" sources."@types/responselike-1.0.0" sources."@types/semver-5.5.0" sources."@yarnpkg/lockfile-1.1.0" @@ -85488,7 +85688,7 @@ in sources."object-hash-2.0.3" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-7.2.1" + sources."open-7.3.0" sources."optionator-0.8.3" sources."os-locale-1.4.0" sources."os-name-3.1.0" @@ -85568,7 +85768,7 @@ in sources."signal-exit-3.0.3" sources."smart-buffer-4.1.0" sources."snyk-config-3.1.1" - (sources."snyk-cpp-plugin-1.5.0" // { + (sources."snyk-cpp-plugin-2.0.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-4.1.0" @@ -85579,9 +85779,10 @@ in sources."tslib-2.0.1" ]; }) - (sources."snyk-docker-plugin-3.21.0" // { + (sources."snyk-docker-plugin-3.24.0" // { dependencies = [ sources."rimraf-3.0.2" + sources."snyk-nodejs-lockfile-parser-1.29.0" sources."tmp-0.2.1" sources."uuid-8.3.0" ]; @@ -85593,7 +85794,7 @@ in sources."tmp-0.2.1" ]; }) - (sources."snyk-gradle-plugin-3.6.3" // { + (sources."snyk-gradle-plugin-3.7.0" // { dependencies = [ (sources."@snyk/cli-interface-2.9.1" // { dependencies = [ @@ -85615,6 +85816,7 @@ in (sources."snyk-mvn-plugin-2.19.4" // { dependencies = [ sources."@snyk/cli-interface-2.9.1" + sources."@snyk/java-call-graph-builder-1.13.2" sources."tmp-0.1.0" sources."tslib-1.11.1" ]; @@ -85732,7 +85934,7 @@ in sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" sources."unpipe-1.0.0" - (sources."update-notifier-4.1.1" // { + (sources."update-notifier-4.1.3" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-3.0.0" @@ -85801,7 +86003,7 @@ in sources."arraybuffer.slice-0.0.7" sources."async-limiter-1.0.1" sources."backo2-1.0.2" - sources."base64-arraybuffer-0.1.5" + sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" sources."better-assert-1.0.2" sources."blob-0.0.5" @@ -85812,13 +86014,17 @@ in sources."cookie-0.3.1" sources."debug-4.1.1" sources."engine.io-3.4.2" - (sources."engine.io-client-3.4.3" // { + (sources."engine.io-client-3.4.4" // { dependencies = [ sources."component-emitter-1.3.0" + sources."debug-3.1.0" + sources."ms-2.0.0" + sources."parseqs-0.0.6" + sources."parseuri-0.0.6" sources."ws-6.1.4" ]; }) - sources."engine.io-parser-2.2.0" + sources."engine.io-parser-2.2.1" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."indexof-0.0.1" @@ -85833,9 +86039,11 @@ in sources."socket.io-adapter-1.1.2" (sources."socket.io-client-2.3.0" // { dependencies = [ + sources."base64-arraybuffer-0.1.5" sources."ms-2.0.0" - (sources."socket.io-parser-3.3.0" // { + (sources."socket.io-parser-3.3.1" // { dependencies = [ + sources."component-emitter-1.3.0" sources."debug-3.1.0" ]; }) @@ -86298,7 +86506,7 @@ in sources."is-binary-path-1.0.1" sources."is-boolean-object-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-canonical-base64-1.1.1" (sources."is-data-descriptor-1.0.0" // { dependencies = [ @@ -86952,7 +87160,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.756.0" // { + (sources."aws-sdk-2.763.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -86970,7 +87178,7 @@ in ]; }) sources."balanced-match-1.0.0" - sources."base64-arraybuffer-0.1.5" + sources."base64-arraybuffer-0.1.4" sources."base64-js-1.3.1" sources."base64id-2.0.0" sources."base64url-3.0.1" @@ -87095,14 +87303,17 @@ in sources."ws-7.3.1" ]; }) - (sources."engine.io-client-3.4.3" // { + (sources."engine.io-client-3.4.4" // { dependencies = [ sources."component-emitter-1.3.0" - sources."debug-4.1.1" + sources."debug-3.1.0" + sources."ms-2.0.0" + sources."parseqs-0.0.6" + sources."parseuri-0.0.6" sources."ws-6.1.4" ]; }) - sources."engine.io-parser-2.2.0" + sources."engine.io-parser-2.2.1" sources."error-ex-1.3.2" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -87313,7 +87524,7 @@ in sources."minimist-1.2.5" sources."minitouch-prebuilt-1.2.0" sources."mkdirp-0.5.5" - sources."moment-2.28.0" + sources."moment-2.29.0" sources."ms-2.1.2" sources."multer-1.4.2" sources."mustache-2.3.2" @@ -87486,11 +87697,13 @@ in sources."socket.io-adapter-1.1.2" (sources."socket.io-client-2.3.0" // { dependencies = [ + sources."base64-arraybuffer-0.1.5" sources."debug-4.1.1" sources."isarray-2.0.1" sources."ms-2.0.0" - (sources."socket.io-parser-3.3.0" // { + (sources."socket.io-parser-3.3.1" // { dependencies = [ + sources."component-emitter-1.3.0" sources."debug-3.1.0" ]; }) @@ -87762,7 +87975,7 @@ in sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.1" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-date-object-1.0.2" sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" @@ -88374,7 +88587,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.10.4" + sources."uglify-js-3.11.0" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -88499,7 +88712,7 @@ in sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."module-alias-2.2.2" - sources."moment-2.28.0" + sources."moment-2.29.0" sources."ms-2.1.2" sources."node-fetch-2.6.1" sources."oauth-sign-0.9.0" @@ -88688,7 +88901,7 @@ in sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-date-object-1.0.2" sources."is-decimal-1.0.4" sources."is-file-1.0.0" @@ -88876,7 +89089,7 @@ in sources."function-bind-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-date-object-1.0.2" sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" @@ -89282,7 +89495,7 @@ in sources."unist-util-visit-2.0.3" sources."unist-util-visit-children-1.1.4" sources."unist-util-visit-parents-3.1.0" - (sources."update-notifier-4.1.1" // { + (sources."update-notifier-4.1.3" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-3.0.0" @@ -89466,7 +89679,7 @@ in sources."has-1.0.3" sources."has-symbols-1.0.1" sources."inherits-2.0.4" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-date-object-1.0.2" sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" @@ -89523,7 +89736,7 @@ in sources."function-bind-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-date-object-1.0.2" sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" @@ -89551,10 +89764,10 @@ in textlint-rule-stop-words = nodeEnv.buildNodePackage { name = "textlint-rule-stop-words"; packageName = "textlint-rule-stop-words"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.6.tgz"; - sha512 = "9xvmzSaye+7MJBkuq7+oVskCiSXQc/TaCeGoSV4+6n2JYMBOFu8OiDKKE3HDtnLlg9K7H0mbhNEySLGF9kPntQ=="; + url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.7.tgz"; + sha512 = "wBG1K2HfmQaHEjxMddRB9canjBbX6xaztVB5d0cgOBVj9NTvPVWf4z9OuTfYUEmIt84wAvQ6XxsIA9YTJ+N5Fg=="; }; dependencies = [ sources."@textlint/ast-node-types-4.3.4" @@ -89624,7 +89837,7 @@ in sources."function-bind-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-capitalized-1.0.0" sources."is-date-object-1.0.2" sources."is-negative-zero-2.0.0" @@ -89671,7 +89884,7 @@ in sources."function-bind-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-date-object-1.0.2" sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" @@ -89727,7 +89940,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.11.1" + sources."@types/node-14.11.2" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.0" @@ -89763,7 +89976,7 @@ in sources."backo2-1.0.2" sources."backoff-2.5.0" sources."balanced-match-1.0.0" - sources."base64-arraybuffer-0.1.5" + sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" @@ -89839,15 +90052,16 @@ in sources."ms-2.1.2" ]; }) - (sources."engine.io-client-3.4.3" // { + (sources."engine.io-client-3.4.4" // { dependencies = [ sources."component-emitter-1.3.0" - sources."debug-4.1.1" - sources."ms-2.1.2" + sources."debug-3.1.0" + sources."parseqs-0.0.6" + sources."parseuri-0.0.6" sources."ws-6.1.4" ]; }) - sources."engine.io-parser-2.2.0" + sources."engine.io-parser-2.2.1" sources."entities-1.1.2" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -90078,10 +90292,12 @@ in sources."socket.io-adapter-1.1.2" (sources."socket.io-client-2.3.0" // { dependencies = [ + sources."base64-arraybuffer-0.1.5" sources."debug-4.1.1" sources."ms-2.1.2" - (sources."socket.io-parser-3.3.0" // { + (sources."socket.io-parser-3.3.1" // { dependencies = [ + sources."component-emitter-1.3.0" sources."debug-3.1.0" sources."ms-2.0.0" ]; @@ -90158,10 +90374,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.120.1"; + version = "0.121.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.120.1.tgz"; - sha512 = "ktaCRFUR7JUZcKec+cBRz+oBex5pOVaJhrtxvFF2T7on53o9UkEux+/Nh1g/4zeb4t/pbxIFcADbn/ACu3LC1g=="; + url = "https://registry.npmjs.org/three/-/three-0.121.0.tgz"; + sha512 = "12bkOFsSCsfHViuqDuxDccMBT8eJ/UH829P1J50f4mvI9pWNX4iurZq8Vbo+rs9rKkgrSBRq7ubE77dQ1Y1hzA=="; }; buildInputs = globalBuildInputs; meta = { @@ -90259,7 +90475,7 @@ in sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."minimatch-3.0.4" - sources."moment-2.28.0" + sources."moment-2.29.0" (sources."node-appc-1.1.1" // { dependencies = [ sources."async-3.2.0" @@ -90361,7 +90577,7 @@ in ]; }) sources."glob-5.0.15" - (sources."http-signature-1.3.4" // { + (sources."http-signature-1.3.5" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -90394,7 +90610,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.28.0" + sources."moment-2.29.0" sources."mooremachine-2.3.0" sources."mute-stream-0.0.8" sources."mv-2.1.1" @@ -90646,10 +90862,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.10.4"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.4.tgz"; - sha512 = "kBFT3U4Dcj4/pJ52vfjCSfyLyvG9VYYuGYPmrPvAxRw/i7xHiT4VvCev+uiEMcEEiu6UNB6KgWmGtSUYIWScbw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.0.tgz"; + sha512 = "e1KQFRCpOxnrJsJVqDUCjURq+wXvIn7cK2sRAx9XL3HYLL9aezOP4Pb1+Y3/o693EPk111Yj2Q+IUXxcpHlygQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -90664,18 +90880,18 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.5.10"; + version = "1.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.5.10.tgz"; - sha512 = "WLrNg3hngoQJc3Ka1NxbWQMYjFJx013Xd9hNiRvHU1NUFMy8H5/5dT83Wh64gr2CJz5zNQlrqTkrfaWbwS/jEQ=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.5.11.tgz"; + sha512 = "oCpdK5T7N2skQCfZ7i/PEjuB3kRqQYYA/PXyN63jsoo0Vh6iSo/3w4GOt3e8s5XXw8YzuMlExKd1fsDXiUF47g=="; }; dependencies = [ sources."@dabh/diagnostics-2.0.2" - sources."@primer/octicons-10.1.0" + sources."@primer/octicons-11.0.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.11.1" + sources."@types/node-14.11.2" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -90692,11 +90908,11 @@ in sources."async-limiter-1.0.1" sources."backo2-1.0.2" sources."balanced-match-1.0.0" - sources."base64-arraybuffer-0.1.5" + sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" sources."better-assert-1.0.2" sources."blob-0.0.5" - sources."blueimp-md5-2.17.0" + sources."blueimp-md5-2.18.0" sources."body-parser-1.19.0" sources."bootstrap-3.4.1" sources."brace-expansion-1.1.11" @@ -90708,8 +90924,7 @@ in ]; }) sources."callsite-1.0.0" - sources."camelcase-5.3.1" - sources."cliui-6.0.0" + sources."cliui-7.0.1" sources."clone-2.1.2" sources."clone-response-1.0.2" sources."color-3.0.0" @@ -90730,7 +90945,6 @@ in sources."core-util-is-1.0.2" sources."crossroads-0.12.2" sources."debug-2.6.9" - sources."decamelize-1.2.0" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" @@ -90752,15 +90966,17 @@ in sources."ms-2.1.2" ]; }) - (sources."engine.io-client-3.4.3" // { + (sources."engine.io-client-3.4.4" // { dependencies = [ sources."component-emitter-1.3.0" - sources."debug-4.1.1" - sources."ms-2.1.2" + sources."debug-3.1.0" + sources."parseqs-0.0.6" + sources."parseuri-0.0.6" sources."ws-6.1.4" ]; }) - sources."engine.io-parser-2.2.0" + sources."engine.io-parser-2.2.1" + sources."escalade-3.1.0" sources."escape-html-1.0.3" sources."etag-1.8.1" sources."eve-0.5.4" @@ -90774,14 +90990,13 @@ in sources."fast-safe-stringify-2.0.7" sources."fecha-4.2.0" sources."finalhandler-1.1.2" - sources."find-up-4.1.0" sources."fn.name-1.1.0" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" - sources."getmac-5.15.0" + sources."getmac-5.16.0" sources."glob-7.1.6" sources."got-9.6.0" sources."has-binary2-1.0.3" @@ -90815,7 +91030,6 @@ in sources."knockout-3.5.1" sources."kuler-2.0.0" sources."latest-version-5.1.0" - sources."locate-path-5.0.0" sources."locks-0.2.2" sources."lodash-4.17.20" (sources."logform-2.2.0" // { @@ -90840,7 +91054,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."ms-2.0.0" sources."negotiator-0.6.2" sources."node-cache-5.1.2" @@ -90855,9 +91069,6 @@ in sources."one-time-1.0.0" sources."open-7.2.1" sources."p-cancelable-1.1.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" (sources."package-json-6.5.0" // { dependencies = [ sources."semver-6.3.0" @@ -90869,7 +91080,6 @@ in sources."passport-0.4.1" sources."passport-local-1.0.0" sources."passport-strategy-1.0.0" - sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."pause-0.0.1" @@ -90888,7 +91098,6 @@ in sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" sources."responselike-1.0.2" sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" @@ -90900,7 +91109,6 @@ in ]; }) sources."serve-static-1.14.1" - sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."signals-1.0.0" sources."simple-swizzle-0.2.2" @@ -90914,10 +91122,12 @@ in sources."socket.io-adapter-1.1.2" (sources."socket.io-client-2.3.0" // { dependencies = [ + sources."base64-arraybuffer-0.1.5" sources."debug-4.1.1" sources."ms-2.1.2" - (sources."socket.io-parser-3.3.0" // { + (sources."socket.io-parser-3.3.1" // { dependencies = [ + sources."component-emitter-1.3.0" sources."debug-3.1.0" sources."ms-2.0.0" ]; @@ -90957,7 +91167,6 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."vary-1.1.2" - sources."which-module-2.0.0" sources."winston-3.3.3" (sources."winston-transport-4.4.0" // { dependencies = [ @@ -90966,14 +91175,14 @@ in sources."string_decoder-1.1.1" ]; }) - sources."wrap-ansi-6.2.0" + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."ws-7.3.1" sources."xmlhttprequest-ssl-1.5.5" - sources."y18n-4.0.0" + sources."y18n-5.0.1" sources."yallist-2.1.2" - sources."yargs-15.4.1" - sources."yargs-parser-18.1.3" + sources."yargs-16.0.3" + sources."yargs-parser-20.2.0" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -90989,10 +91198,10 @@ in vega-cli = nodeEnv.buildNodePackage { name = "vega-cli"; packageName = "vega-cli"; - version = "5.15.0"; + version = "5.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.15.0.tgz"; - sha512 = "1Mv7+T84L6EIPIsC3fslhywNDfguy135EN4uAcFCWhErQXG3yzel2gNyvlsA0ixTAi5oG7mFL6ftkTB6r2CzIw=="; + url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.16.1.tgz"; + sha512 = "7CkUpjfRLvqANnDChd2/gYXzuJD/8v2ookj38nWrSPzrEPXlziDXiWeFycgr+cj9QdZTmlFF73fe+YhXF1c73Q=="; }; dependencies = [ sources."@types/color-name-1.1.1" @@ -91003,10 +91212,9 @@ in sources."are-we-there-yet-1.1.5" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."camelcase-5.3.1" sources."canvas-2.6.1" sources."chownr-1.1.4" - (sources."cliui-6.0.0" // { + (sources."cliui-7.0.1" // { dependencies = [ sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -91021,7 +91229,7 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - sources."d3-array-2.7.1" + sources."d3-array-2.8.0" sources."d3-color-2.0.0" sources."d3-delaunay-5.3.0" sources."d3-dispatch-2.0.0" @@ -91034,20 +91242,19 @@ in sources."d3-interpolate-2.0.1" sources."d3-path-2.0.0" sources."d3-quadtree-2.0.0" - sources."d3-scale-3.2.2" + sources."d3-scale-3.2.3" sources."d3-shape-2.0.0" sources."d3-time-2.0.0" sources."d3-time-format-3.0.0" sources."d3-timer-2.0.0" sources."debug-3.2.6" - sources."decamelize-1.2.0" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" sources."delaunator-4.0.1" sources."delegates-1.0.0" sources."detect-libc-1.0.3" sources."emoji-regex-8.0.0" - sources."find-up-4.1.0" + sources."escalade-3.1.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" @@ -91061,7 +91268,6 @@ in sources."ini-1.3.5" sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" - sources."locate-path-5.0.0" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -91084,17 +91290,12 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."process-nextick-args-2.0.1" sources."rc-1.2.8" sources."readable-stream-2.3.7" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" sources."resolve-1.17.0" sources."rimraf-2.7.1" sources."rw-1.3.3" @@ -91113,38 +91314,38 @@ in sources."tar-4.4.13" sources."topojson-client-3.1.0" sources."util-deprecate-1.0.2" - sources."vega-5.15.0" - sources."vega-canvas-1.2.4" - sources."vega-crossfilter-4.0.4" - sources."vega-dataflow-5.7.2" - sources."vega-encode-4.8.2" - sources."vega-event-selector-2.0.5" - sources."vega-expression-2.7.0" - sources."vega-force-4.0.6" - sources."vega-format-1.0.3" - sources."vega-functions-5.7.3" - sources."vega-geo-4.3.6" - sources."vega-hierarchy-4.0.8" - sources."vega-loader-4.3.2" - sources."vega-parser-6.0.4" - sources."vega-projection-1.4.4" - sources."vega-regression-1.0.8" - sources."vega-runtime-6.1.2" - sources."vega-scale-7.1.0" - sources."vega-scenegraph-4.9.1" - sources."vega-selections-5.1.3" - sources."vega-statistics-1.7.8" - sources."vega-time-2.0.3" - sources."vega-transforms-4.9.2" - sources."vega-typings-0.18.2" - sources."vega-util-1.15.1" - sources."vega-view-5.8.2" - sources."vega-view-transforms-4.5.7" - sources."vega-voronoi-4.1.4" - sources."vega-wordcloud-4.1.2" - sources."which-module-2.0.0" + sources."vega-5.16.1" + sources."vega-canvas-1.2.5" + sources."vega-crossfilter-4.0.5" + sources."vega-dataflow-5.7.3" + sources."vega-encode-4.8.3" + sources."vega-event-selector-2.0.6" + sources."vega-expression-3.0.0" + sources."vega-force-4.0.7" + sources."vega-format-1.0.4" + sources."vega-functions-5.8.0" + sources."vega-geo-4.3.7" + sources."vega-hierarchy-4.0.9" + sources."vega-label-1.0.0" + sources."vega-loader-4.3.3" + sources."vega-parser-6.1.0" + sources."vega-projection-1.4.5" + sources."vega-regression-1.0.9" + sources."vega-runtime-6.1.3" + sources."vega-scale-7.1.1" + sources."vega-scenegraph-4.9.2" + sources."vega-selections-5.1.4" + sources."vega-statistics-1.7.9" + sources."vega-time-2.0.4" + sources."vega-transforms-4.9.3" + sources."vega-typings-0.19.1" + sources."vega-util-1.15.3" + sources."vega-view-5.9.0" + sources."vega-view-transforms-4.5.8" + sources."vega-voronoi-4.1.5" + sources."vega-wordcloud-4.1.3" sources."wide-align-1.1.3" - (sources."wrap-ansi-6.2.0" // { + (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -91153,9 +91354,9 @@ in ]; }) sources."wrappy-1.0.2" - sources."y18n-4.0.0" + sources."y18n-5.0.1" sources."yallist-3.1.1" - (sources."yargs-15.4.1" // { + (sources."yargs-16.0.3" // { dependencies = [ sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -91163,7 +91364,7 @@ in sources."strip-ansi-6.0.0" ]; }) - sources."yargs-parser-18.1.3" + sources."yargs-parser-20.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -91178,10 +91379,10 @@ in vega-lite = nodeEnv.buildNodePackage { name = "vega-lite"; packageName = "vega-lite"; - version = "4.15.0"; + version = "4.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/vega-lite/-/vega-lite-4.15.0.tgz"; - sha512 = "381Kszxei5Rhg8WkcUE7yPHafLndBbdR8nBSJi4zFsn8iAfCVjn7h7QL9DphNix5V7Ko1nhOadxqNaxGsiD71w=="; + url = "https://registry.npmjs.org/vega-lite/-/vega-lite-4.16.8.tgz"; + sha512 = "WB9OOHbFyIaLvx5k9m8XGEaB2p0sTC9Srtsm9ETQ6EoOksdLQtVesxCalgT+cGaUVtHAiqBNmLh/nQGxZXml7w=="; }; dependencies = [ sources."@types/clone-2.1.0" @@ -91190,38 +91391,28 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."array-flat-polyfill-1.0.1" - sources."camelcase-5.3.1" - sources."cliui-6.0.0" + sources."cliui-7.0.1" sources."clone-2.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."decamelize-1.2.0" sources."emoji-regex-8.0.0" + sources."escalade-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."find-up-4.1.0" sources."get-caller-file-2.0.5" sources."is-fullwidth-code-point-3.0.0" sources."json-stringify-pretty-compact-2.0.0" - sources."locate-path-5.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."path-exists-4.0.0" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" - sources."set-blocking-2.0.0" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."tslib-2.0.1" - sources."vega-event-selector-2.0.5" - sources."vega-expression-2.7.0" - sources."vega-util-1.15.1" - sources."which-module-2.0.0" - sources."wrap-ansi-6.2.0" - sources."y18n-4.0.0" - sources."yargs-15.4.1" - sources."yargs-parser-18.1.3" + sources."vega-event-selector-2.0.6" + sources."vega-expression-3.0.0" + sources."vega-util-1.15.3" + sources."wrap-ansi-7.0.0" + sources."y18n-5.0.1" + sources."yargs-16.0.3" + sources."yargs-parser-20.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -91339,7 +91530,7 @@ in sources."vscode-nls-4.1.2" ]; }) - (sources."vscode-json-languageservice-3.8.4" // { + (sources."vscode-json-languageservice-3.9.0" // { dependencies = [ sources."jsonc-parser-2.3.1" sources."vscode-nls-5.0.0" @@ -91725,7 +91916,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-2.1.0" sources."is-buffer-2.0.4" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -92079,9 +92270,9 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.1.1" sources."vm-browserify-1.1.2" - sources."vsce-1.79.5" - sources."vscode-debugadapter-testsupport-1.41.0" - sources."vscode-debugprotocol-1.41.0" + sources."vsce-1.80.0" + sources."vscode-debugadapter-testsupport-1.42.0" + sources."vscode-debugprotocol-1.42.0" (sources."watchpack-1.7.4" // { dependencies = [ sources."chokidar-3.4.2" @@ -92431,7 +92622,7 @@ in sources."tslib-1.13.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.10.4" + sources."uglify-js-3.11.0" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -92490,7 +92681,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.11.1" + sources."@types/node-14.11.2" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -93451,7 +93642,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.1" + sources."@types/node-14.11.2" sources."JSONSelect-0.2.1" sources."acorn-7.4.0" sources."acorn-jsx-5.3.1" @@ -93860,7 +94051,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" @@ -93985,7 +94176,7 @@ in ]; }) sources."mkdirp-1.0.4" - sources."moment-2.28.0" + sources."moment-2.29.0" sources."ms-2.0.0" sources."multimatch-4.0.0" (sources."mv-2.1.1" // { @@ -94193,7 +94384,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."sonic-boom-1.1.0" + sources."sonic-boom-1.3.0" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" sources."source-map-support-0.5.19" @@ -95267,7 +95458,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.1" + sources."@types/node-14.11.2" sources."accepts-1.3.7" sources."ajv-6.12.5" sources."ajv-errors-1.0.1" @@ -95509,7 +95700,7 @@ in sources."is-arguments-1.0.4" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.1" + sources."is-callable-1.2.2" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -96117,7 +96308,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-classic-0.5.3" - sources."moment-2.28.0" + sources."moment-2.29.0" sources."mp4-box-encoding-1.4.1" sources."mp4-stream-3.1.0" sources."ms-2.0.0" @@ -96135,7 +96326,7 @@ in sources."nodebmc-0.0.7" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."open-7.2.1" + sources."open-7.3.0" sources."package-json-versionify-1.0.4" sources."parse-numeric-range-1.2.0" (sources."parse-torrent-7.1.3" // { @@ -96310,10 +96501,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.11.0"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.11.0.tgz"; - sha512 = "tAEVZvlNLhmF2NLzhOm6UnejjPUp/iiEdxDLdP1Cm3M2YOJ7QLwrYtr0lzoNLLxQkzJwXmuBX01idECTWln82g=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.11.1.tgz"; + sha512 = "N3Tu3g4O6ZWV7W0LVsNk62DtKJDQkbnPZRDd7ntaAeEl8QkxL1vnMunI26uzDU4PwwG4tPJ8g/VRS6U+fVp/6A=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -96330,7 +96521,7 @@ in sources."prettier-2.0.5" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - (sources."vscode-json-languageservice-3.8.4" // { + (sources."vscode-json-languageservice-3.9.0" // { dependencies = [ sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-nls-5.0.0" @@ -96366,14 +96557,15 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.22.5"; + version = "1.22.10"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.22.5.tgz"; - sha512 = "5uzKXwdMc++mYktXqkfpNYT9tY8ViWegU58Hgbo+KXzrzzhEyP1Ip+BTtXloLrXNcNlxFJbLiFKGaS9vK9ym6Q=="; + url = "https://registry.npmjs.org/yarn/-/yarn-1.22.10.tgz"; + sha512 = "IanQGI9RRPAN87VGTF7zs2uxkSyQSrSPsju0COgbsKQOOXr5LtcVPeyXWgwVa0ywG3d8dg6kSYKGBuYK021qeA=="; }; buildInputs = globalBuildInputs; meta = { description = "📦🐈 Fast, reliable, and secure dependency management."; + homepage = "https://github.com/yarnpkg/yarn#readme"; license = "BSD-2-Clause"; }; production = true; @@ -96399,7 +96591,7 @@ in sources."@types/color-name-1.1.1" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.1" + sources."@types/node-14.11.2" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" @@ -96841,7 +97033,7 @@ in ]; }) sources."mkdirp-0.5.5" - sources."moment-2.28.0" + sources."moment-2.29.0" sources."ms-2.0.0" (sources."multimatch-4.0.0" // { dependencies = [ @@ -97198,7 +97390,7 @@ in sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" sources."verror-1.10.0" - sources."vinyl-2.2.0" + sources."vinyl-2.2.1" (sources."vinyl-file-3.0.0" // { dependencies = [ sources."pify-2.3.0" 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 3aecfde8a7..75eb2255ee 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix @@ -1,8 +1,8 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, result, bigstringaf }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, result, bigstringaf, ppx_let }: buildDunePackage rec { pname = "angstrom"; - version = "0.14.1"; + version = "0.15.0"; minimumOCamlVersion = "4.04"; @@ -10,10 +10,10 @@ buildDunePackage rec { owner = "inhabitedtype"; repo = pname; rev = version; - sha256 = "1l69y0qspgi7kgrphyh7718hjb2sml1a9lljkp65bkqmmmi6ybly"; + sha256 = "1hmrkdcdlkwy7rxhngf3cv3sa61cznnd9p5lmqhx20664gx2ibrh"; }; - checkInputs = [ alcotest ]; + checkInputs = [ alcotest ppx_let ]; propagatedBuildInputs = [ bigstringaf result ]; doCheck = lib.versionAtLeast ocaml.version "4.05"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 16b4413291..556c749011 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -6,11 +6,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.05"; pname = "asn1-combinators"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-v${version}.tbz"; - sha256 = "0c9n3nki3drjwn7yv2pg7nzyzsi409laq70830wh147hvvwxbsy9"; + sha256 = "1z73hc17f5m2i4bfxw0g94fsri67f8vha812mm8klz4ggs8y7d6r"; }; propagatedBuildInputs = [ cstruct zarith bigarray-compat stdlib-shims ptime ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix index 7d15d7d3c6..9cbaabd9cf 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix @@ -1,5 +1,5 @@ { buildDunePackage, containers -, gen, iter, mdx, ounit, qcheck +, gen, iter, qcheck }: buildDunePackage { @@ -8,7 +8,7 @@ buildDunePackage { inherit (containers) src version; doCheck = true; - checkInputs = [ gen iter mdx.bin ounit qcheck ]; + checkInputs = [ gen iter qcheck ]; propagatedBuildInputs = [ containers ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/csexp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/csexp/default.nix index 610de2cb8a..0ca0943822 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/csexp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/csexp/default.nix @@ -1,19 +1,17 @@ -{ lib, fetchurl, buildDunePackage }: +{ lib, fetchurl, buildDunePackage, result }: buildDunePackage rec { pname = "csexp"; version = "1.3.2"; - minimumOCamlVersion = "4.08"; + minimumOCamlVersion = "4.02.3"; src = fetchurl { url = "https://github.com/ocaml-dune/csexp/releases/download/${version}/csexp-${version}.tbz"; sha256 = "0jhwrxfjb0x31xj4g4b89fzw34sq19j0rq2hs2zyh1vz4xxl47zj"; }; - postPatch = '' - substituteInPlace src/csexp.ml --replace Result.result Result.t - ''; + propagatedBuildInputs = [ result ]; meta = with lib; { homepage = "https://github.com/ocaml-dune/csexp"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix index 16e365dd4f..f5303db9a3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix @@ -7,6 +7,8 @@ buildDunePackage rec { inherit (dune_2) src version patches; + minimumOCamlVersion = "4.03"; + dontAddPrefix = true; propagatedBuildInputs = [ csexp result ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/earley/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/earley/default.nix index f47231a242..c7b2d09d66 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/earley/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/earley/default.nix @@ -1,18 +1,23 @@ -{ lib, fetchurl, ocaml, buildDunePackage }: - -if lib.versionAtLeast ocaml.version "4.08" -then throw "earley is not available for OCaml ${ocaml.version}" -else +{ lib, fetchFromGitHub, ocaml, buildDunePackage +, stdlib-shims +}: buildDunePackage rec { - version = "2.0.0"; + version = "3.0.0"; pname = "earley"; - src = fetchurl { - url = "https://github.com/rlepigre/ocaml-earley/releases/download/${version}/earley-${version}.tbz"; - sha256 = "1kjr0wh3lji7f493kf48rphxnlv3sygj5a8rmx9z3xkpbd7aqyyw"; + src = fetchFromGitHub { + owner = "rlepigre"; + repo = "ocaml-earley"; + rev = version; + sha256 = "1vi58zdxchpw6ai0bz9h2ggcmg8kv57yk6qbx82lh47s5wb3mz5y"; }; - minimumOCamlVersion = "4.03"; + minimumOCamlVersion = "4.07"; + useDune2 = true; + + buildInputs = [ stdlib-shims ]; + + doCheck = true; meta = { description = "Parser combinators based on Earley Algorithm"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix index 02b125642c..4694e3ac63 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix @@ -1,10 +1,14 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, astring }: +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "fpath is not available for OCaml ${ocaml.version}" +else + stdenv.mkDerivation { - name = "ocaml${ocaml.version}-fpath-0.7.2"; + name = "ocaml${ocaml.version}-fpath-0.7.3"; src = fetchurl { - url = "https://erratique.ch/software/fpath/releases/fpath-0.7.2.tbz"; - sha256 = "1hr05d8bpqmqcfdavn4rjk9rxr7v2zl84866f5knjifrm60sxqic"; + url = "https://erratique.ch/software/fpath/releases/fpath-0.7.3.tbz"; + sha256 = "03z7mj0sqdz465rc4drj1gr88l9q3nfs374yssvdjdyhjbqqzc0j"; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix index 45cfa07e43..66f3f26285 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { buildInputs = lib.optionals doCheck [ mdx.bin qtest ]; propagatedBuildInputs = [ result ]; - doCheck = lib.versionAtLeast ocaml.version "4.04"; + doCheck = lib.versionAtLeast ocaml.version "4.07"; meta = { homepage = "https://github.com/c-cube/sequence"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix index 69f4e6f61d..837504f9a7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix @@ -234,7 +234,7 @@ rec { ppx_let = janePackage { pname = "ppx_let"; hash = "1ckzwljlb78cdf6xxd24nddnmsihvjrnq75r1b255aj3xgkzsygx"; - buildInputs = [ ppxlib ]; + propagatedBuildInputs = [ base ppxlib ]; meta.description = "Monadic let-bindings"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix index 76ced1d753..08b486bb68 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "macaddr"; - version = "5.0.0"; + version = "5.0.1"; minimumOCamlVersion = "4.04"; src = fetchurl { url = "https://github.com/mirage/ocaml-ipaddr/archive/v${version}.tar.gz"; - sha256 = "1j2m2v64g3d81sixxq3g57j1iyk6042ivsszml18akrqvwfpxy66"; + sha256 = "0ffqkhmnj8l085xgl7jxhs3ld9zsd9iavdg06nnhr1i9g1aayk1b"; }; checkInputs = [ ppx_sexp_conv ounit ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix index 528ea68d98..57e0f99ab1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "mirage-stack"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { url = "https://github.com/mirage/mirage-stack/releases/download/v${version}/mirage-stack-v${version}.tbz"; - sha256 = "1y110i4kjr03b0ji3q5h0bi3n3q8mdkfflb3fyq5rvpi5l45vvdb"; + sha256 = "1qhi0ghcj4j3hw7yqn085ac6n18b6b66z5ih3k8p79m4cvn7cdq0"; }; propagatedBuildInputs = [ mirage-protocols ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix index ea346479a0..816e85d3c9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -3,13 +3,13 @@ buildDunePackage rec { pname = "mirage-runtime"; - version = "3.8.0"; + version = "3.8.1"; minimumOCamlVersion = "4.06"; src = fetchurl { url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-v${version}.tbz"; - sha256 = "18v37arzy7gkz5qcy34k0l8g69146nysjv0h1jcym0h4xxy0bxir"; + sha256 = "1sx9df041jb2rdrsibybifhml6h6kpzw9d2bw6vvv0ml500070ww"; }; propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs ocaml_lwt ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-result/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-result/default.nix index df44200992..2814c6c528 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-result/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-result/default.nix @@ -1,21 +1,14 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib }: +{ lib, buildDunePackage, fetchurl }: -let version = "1.2"; in +buildDunePackage rec { + pname = "result"; + version = "1.5"; -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-result-${version}"; - - src = fetchFromGitHub { - owner = "janestreet"; - repo = "result"; - rev = version; - sha256 = "1jwzpcmxwgkfsbjz9zl59v12hf1vv4r9kiifancn9p8gm206g3g0"; + src = fetchurl { + url = "https://github.com/janestreet/result/releases/download/${version}/result-${version}.tbz"; + sha256 = "0cpfp35fdwnv3p30a06wd0py3805qxmq3jmcynjc3x2qhlimwfkw"; }; - buildInputs = [ ocaml findlib ]; - - createFindlibDestdir = true; - meta = { homepage = "https://github.com/janestreet/result"; description = "Compatibility Result module"; @@ -24,7 +17,6 @@ stdenv.mkDerivation { while staying compatible with older version of OCaml should use the Result module defined in this library. ''; - license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms or []; + license = lib.licenses.bsd3; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix index 45761e9804..54133850e0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix @@ -1,17 +1,17 @@ -{ lib, fetchurl, buildDunePackage, result }: +{ lib, fetchurl, buildDunePackage }: buildDunePackage rec { pname = "ocaml-version"; - version = "2.3.0"; + version = "3.0.0"; + + minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-v${version}.tbz"; - sha256 = "0c711lifl35xila9k0rvhijy9zm3shd37q3jgw7xf01hn1swg0hn"; + sha256 = "15vk8sh50p3f2mbv8z7mqnx76cffri36f2krp25zkkwix8jg7ci4"; }; - propagatedBuildInputs = [ result ]; - meta = { description = "Manipulate, parse and generate OCaml compiler version strings"; homepage = "https://github.com/ocurrent/ocaml-version"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix index 807fb022e9..b52561d760 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix @@ -6,12 +6,12 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; - version = "0.12.4"; + version = "0.12.5"; pname = "tls"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz"; - sha256 = "1m6ci98xg8axk1swrjx0q33ixinyjg8vzr7vwr65k9wljfgy10s9"; + sha256 = "1zsh3fx8l3d9lc9w516apzabqsix2ss8nv6kbbzjmp2d4hwh818b"; }; useDune2 = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix index d2327b93a4..1bd926b1dd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix @@ -7,11 +7,17 @@ build system is required, the attribute `run` can be used. */ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, result, opaline }: -if !stdenv.lib.versionAtLeast ocaml.version "4.01" -then throw "topkg is not available for OCaml ${ocaml.version}" -else - let + param = + if stdenv.lib.versionAtLeast ocaml.version "4.03" then { + version = "1.0.3"; + sha256 = "0b77gsz9bqby8v77kfi4lans47x9p2lmzanzwins5r29maphb8y6"; + } else { + version = "1.0.0"; + sha256 = "1df61vw6v5bg2mys045682ggv058yqkqb67w7r2gz85crs04d5fw"; + propagatedBuildInputs = [ result ]; + }; + /* This command allows to run the “topkg” build system. * It is usually called with `build` or `test` as argument. * Packages that use `topkg` may call this command as part of @@ -22,15 +28,15 @@ in stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-topkg-${version}"; - version = "1.0.0"; + inherit (param) version; src = fetchurl { url = "https://erratique.ch/software/topkg/releases/topkg-${version}.tbz"; - sha256 = "1df61vw6v5bg2mys045682ggv058yqkqb67w7r2gz85crs04d5fw"; + inherit (param) sha256; }; nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ result ]; + propagatedBuildInputs = param.propagatedBuildInputs or []; buildPhase = "${run} build"; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/z3/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/z3/default.nix new file mode 100644 index 0000000000..d24a951020 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/z3/default.nix @@ -0,0 +1,29 @@ +{ stdenv, ocaml, findlib, zarith, z3 }: + +let z3-with-ocaml = z3.override { + ocamlBindings = true; + inherit ocaml findlib zarith; +}; in + +stdenv.mkDerivation { + + pname = "ocaml${ocaml.version}-z3"; + inherit (z3-with-ocaml) version; + + phases = [ "installPhase" "fixupPhase" ]; + + installPhase = '' + runHook preInstall + mkdir -p $OCAMLFIND_DESTDIR + cp -r ${z3-with-ocaml.ocaml}/lib/ocaml/${ocaml.version}/site-lib/stublibs $OCAMLFIND_DESTDIR + cp -r ${z3-with-ocaml.ocaml}/lib/ocaml/${ocaml.version}/site-lib/Z3 $OCAMLFIND_DESTDIR/z3 + runHook postInstall + ''; + + buildInputs = [ findlib ]; + propagatedBuildInputs = [ zarith ]; + + meta = z3.meta // { + description = "Z3 Theorem Prover (OCaml API)"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/third_party/nixpkgs/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix index dc48c9931a..ccc59980dd 100644 --- a/third_party/nixpkgs/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix +++ b/third_party/nixpkgs/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix @@ -2,13 +2,13 @@ buildPerlPackage rec { pname = "WWW-YoutubeViewer"; - version = "3.7.5"; + version = "3.7.9"; src = fetchFromGitHub { owner = "trizen"; repo = "youtube-viewer"; rev = version; - sha256 = "1caz56sxy554avz2vdv9gm7gyqcq0gyixzrh5v9ixmg6vxif5d4f"; + sha256 = "16p0sa91h0zpqdpqmy348g6b9qj5f6qrbzrljn157vk00cg6mx18"; }; nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix index 535a21e545..4f4dbbc2fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.6.2"; + version = "0.6.3"; src = fetchPypi { inherit pname version; - sha256 = "0jm1jdrlmm0gkvaxhbwwqic48vfgv8d0j99y90calnjrid3hwi35"; + sha256 = "d21429288fe0de63d829dbbfb26736ebaed9fd0792c2a0dc5943c5cab803a708"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/abodepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/abodepy/default.nix new file mode 100644 index 0000000000..eb0de74e79 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/abodepy/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, colorlog, lomond +, requests, isPy3k, requests-mock }: + +buildPythonPackage rec { + pname = "abodepy"; + version = "1.2.0"; + + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "MisterWil"; + repo = pname; + rev = "v${version}"; + sha256 = "0m2cm90yy7fq7yrjyd999m48gqri65ifi7f6hc0s3pv2hfj89yj0"; + }; + + propagatedBuildInputs = [ colorlog lomond requests ]; + checkInputs = [ pytestCheckHook requests-mock ]; + + meta = with lib; { + homepage = "https://github.com/MisterWil/abodepy"; + description = "An Abode alarm Python library running on Python 3"; + license = licenses.mit; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix index f8d56159cc..f36e12b365 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix @@ -7,9 +7,8 @@ , pybind11 , pyfma , eigen -, pytest +, pytestCheckHook , matplotlib -, perfplot , isPy27 }: @@ -35,9 +34,8 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook matplotlib - perfplot ]; postConfigure = '' @@ -49,9 +47,15 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - checkPhase = '' - pytest test + # performance tests aren't useful to us and disabling them allows us to + # decouple ourselves from an unnecessary build dep + preCheck = '' + for f in test/test*.py ; do + substituteInPlace $f --replace 'import perfplot' "" + done ''; + disabledTests = [ "test_speed_comparison1" "test_speed_comparison2" ]; + pythonImportsCheck = [ "accupy" ]; meta = with lib; { description = "Accurate sums and dot products for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix new file mode 100644 index 0000000000..9b2de53201 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix @@ -0,0 +1,32 @@ +{ aiofiles, buildPythonPackage, cryptography, fetchFromGitHub, isPy3k, lib +, libusb1, mock, pyasn1, python, pycryptodome, rsa }: + +buildPythonPackage rec { + pname = "adb-shell"; + version = "0.2.3"; + + disabled = !isPy3k; + + # pypi does not contain tests, using github sources instead + src = fetchFromGitHub { + owner = "JeffLIrion"; + repo = "adb_shell"; + rev = "v${version}"; + sha256 = "1ay598avmg656cxnc9phdx43z1plsrfjf9png9jwjwyhyjjiqxil"; + }; + + propagatedBuildInputs = [ aiofiles cryptography libusb1 pyasn1 rsa ]; + + checkInputs = [ mock pycryptodome ]; + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests -t . + ''; + + meta = with lib; { + description = + "A Python implementation of ADB with shell and FileSync functionality."; + homepage = "https://github.com/JeffLIrion/adb_shell"; + license = licenses.asl20; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix new file mode 100644 index 0000000000..b3cbfd212b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix @@ -0,0 +1,26 @@ +{ aiohttp, aresponses, buildPythonPackage, fetchFromGitHub, isPy3k, lib +, pytest-asyncio, pytestCheckHook, yarl }: + +buildPythonPackage rec { + pname = "adguardhome"; + version = "0.4.2"; + + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-${pname}"; + rev = "v${version}"; + sha256 = "0lcf3yg27amrnqvgn5nw4jn2j0vj4yfmyl5p5yncmn7dh6bdbsp8"; + }; + + propagatedBuildInputs = [ aiohttp yarl ]; + checkInputs = [ aresponses pytest-asyncio pytestCheckHook ]; + + meta = with lib; { + description = "Asynchronous Python client for the AdGuard Home API."; + homepage = "https://github.com/frenck/python-adguardhome"; + license = licenses.mit; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix index 181c0be370..c009ac4bdd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "aioftp"; - version = "0.17.2"; + version = "0.18.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "8433ff21317e71ef1f4d8cb8f7fe58365c04b5174142d9643e22343cfb35da1b"; + sha256 = "6f9d5b5ac910987daca4f7ad4a017530751e2107d2471c9f92a3e09b507cb2dc"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aionotify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aionotify/default.nix new file mode 100644 index 0000000000..93177733de --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aionotify/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, asynctest +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aionotify"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "rbarrois"; + repo = "aionotify"; + rev = "v${version}"; + sha256 = "1sk9i8czxgsbrswsf1nlb4c82vgnlzi8zrvrxdip92w2z8hqh43y"; + }; + + disabled = pythonOlder "3.5"; + + checkInputs = [ + asynctest + ]; + + meta = with lib; { + homepage = "https://github.com/rbarrois/aionotify"; + description = "Simple, asyncio-based inotify library for Python"; + license = with lib.licenses; [ bsd2 ]; + platforms = platforms.linux; + maintainers = with lib.maintainers; [ thiagokokada ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix index 571b1fea2e..dd3e4ab1b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pyyaml -, python-dateutil, requests, pymongo, raven, bcrypt, flask, pyjwt, flask-cors, psycopg2, pytz, flask-compress, jinja2 +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder +, bcrypt, blinker, flask, flask-compress, flask-cors, mohawk, psycopg2, pyjwt, pymongo, python-dateutil, pytz, pyyaml, requests, requests-hawk, sentry-sdk }: buildPythonPackage rec { @@ -11,7 +11,23 @@ buildPythonPackage rec { sha256 = "894d240c51428225264867a80094b9743d71272635a18ddfefa5832b61fed2c6"; }; - propagatedBuildInputs = [ python-dateutil requests pymongo raven bcrypt flask pyjwt flask-cors psycopg2 pytz flask-compress jinja2 pyyaml]; + propagatedBuildInputs = [ + bcrypt + blinker + flask + flask-compress + flask-cors + mohawk + psycopg2 + pyjwt + pymongo + python-dateutil + pytz + pyyaml + requests + requests-hawk + sentry-sdk + ]; doCheck = false; # We can't run the tests from Nix, because they rely on the presence of a working MongoDB server diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alerta/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alerta/default.nix index a024592b4e..579f017872 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/alerta/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/alerta/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, six, click, requests, pytz, tabulate, pythonOlder +, six, click, requests, requests-hawk, pytz, tabulate, pythonOlder }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "49e0862c756d644e9349f5040dd59d135cd871ffeaea5fc288eb3a2e818cf61a"; }; - propagatedBuildInputs = [ six click requests pytz tabulate ]; + propagatedBuildInputs = [ six click requests requests-hawk pytz tabulate ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix new file mode 100644 index 0000000000..91140dc0bf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix @@ -0,0 +1,31 @@ +{ aiofiles, adb-shell, buildPythonPackage, fetchFromGitHub, isPy3k, lib, mock +, pure-python-adb, python }: + +buildPythonPackage rec { + pname = "androidtv"; + version = "0.0.50"; + + # pypi does not contain tests, using github sources instead + src = fetchFromGitHub { + owner = "JeffLIrion"; + repo = "python-androidtv"; + rev = "v${version}"; + sha256 = "1iqw40szwgzvhv3fbnx2wwfnw0d3clcwk9vsq1xsn30fjil2vl7b"; + }; + + propagatedBuildInputs = [ adb-shell pure-python-adb ] + ++ lib.optionals (isPy3k) [ aiofiles ]; + + checkInputs = [ mock ]; + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests -t . + ''; + + meta = with lib; { + description = + "Communicate with an Android TV or Fire TV device via ADB over a network."; + homepage = "https://github.com/JeffLIrion/python-androidtv/"; + license = licenses.mit; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix index bd57b7b28a..3ab390d822 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix @@ -7,11 +7,11 @@ }: buildPythonPackage rec { pname = "argcomplete"; - version = "1.12.0"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "0p19rkvh28klkkd1c6y78h6vb9b9cnlyr7qrshkxghfjkz85xgig"; + sha256 = "849c2444c35bb2175aea74100ca5f644c29bf716429399c0f2203bb5d9a8e4e6"; }; doCheck = false; # meant to be ran with interactive interpreter diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix index e85de90b1f..bc540b45de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.3.0"; + version = "2.4.2"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "44bda34c7123f00c3df95d24e2dc8d43c4d17b456fbb8c434ef4f4a7ebb5265e"; + sha256 = "1c4a697d05a5e3d8d16ea18526115e84d8f015ba4c8b721a0d84062b6b244ef4"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix index 077a855896..5161f85a4c 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "1.16.1"; + version = "1.17.5"; src = fetchPypi { inherit pname version; - sha256 = "b672131be7cc5e239c465909454542623c0aeb0a4d3b05e6a25ee9459959c11d"; + sha256 = "cbd7941fa7e1eb6f63e12724277894350298745480297658da912e07234314cc"; }; checkInputs = [ pytestrunner pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/avro-python3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/avro-python3/default.nix index e6bd5acbbb..332bcf4d4d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/avro-python3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/avro-python3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, pycodestyle, isort }: buildPythonPackage rec { pname = "avro-python3"; @@ -10,6 +10,7 @@ buildPythonPackage rec { sha256 = "a455c215540b1fceb1823e2a918e94959b54cb363307c97869aa46b5b55bde05"; }; + buildInputs = [ pycodestyle isort ]; doCheck = false; # No such file or directory: './run_tests.py meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix new file mode 100644 index 0000000000..bea5fc4adc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, azure-core +, msrest +}: + +buildPythonPackage rec { + pname = "azure-appconfiguration"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0mv053vl88nzpv701gnjdmbylc8qm0kkq87264rfhvrx3ydymf97"; + }; + + propagatedBuildInputs = [ + azure-core + msrest + ]; + + pythonImportsCheck = [ "azure.appconfiguration" ]; + + meta = with lib; { + description = "Microsoft App Configuration Data Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/appconfiguration/azure-appconfiguration"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix index 35640989b2..dfe3468594 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { - version = "1.8.0"; + version = "1.8.1"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c89bbdcdc13ad45fe57d775ed87b15baf6d0b039a1ecd0a1bc91d2f713cb1f08"; + sha256 = "7efbeac3a6dfb634cb5323bc04e18ab609aeab6b03610808091aa0517373d626"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-datalake-store/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-datalake-store/default.nix index e5a38cdaa4..fc9b98eae0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-datalake-store/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-datalake-store/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "azure-datalake-store"; - version = "0.0.49"; + version = "0.0.50"; src = fetchPypi { inherit pname version; - sha256 = "3fcede6255cc9cd083d498c3a399b422f35f804c561bb369a7150ff1f2f07da9"; + sha256 = "9b9b58dcf1d0d0e5aa499d5cb49dcf8f5432ca467a747b39167bb70ef901dbc2"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-administration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-administration/default.nix new file mode 100644 index 0000000000..e72dc03698 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-administration/default.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, azure-common +, azure-core +, msrest +}: + +buildPythonPackage rec { + pname = "azure-keyvault-administration"; + version = "4.0.0b1"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1kmf2x3jdmfm9c7ldvajzckkm79gxxvl1l2968lizjwiyjbbsih5"; + }; + + propagatedBuildInputs = [ + azure-common + azure-core + msrest + ]; + + # no tests in pypi tarball + doCheck = false; + + pythonNamespaces = [ "azure.keyvault" ]; + + pythonImportsCheck = [ "azure.keyvault.administration" ]; + + meta = with lib; { + description = "Microsoft Azure Key Vault Administration Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-administration"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} 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 index 06752a4f8f..56ccb8b5fb 100644 --- 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 @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-keyvault-certificates"; - version = "4.2.0"; + version = "4.2.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "5e33881f3a9b3080c815fe6a7200c0c8670ec506eff45955432ddb84f3076902"; + sha256 = "ea651883ad00d0a9a25b38e51feff7111f6c7099c6fb2597598da5bb21d3451c"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix index 3c019cdf31..9fea2cf87d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix @@ -1,25 +1,33 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-mgmt-core , msrest , msrestazure }: buildPythonPackage rec { - version = "0.6.0"; + version = "1.0.1"; pname = "azure-mgmt-appconfiguration"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "fe6e216ce7293219b7d8d1cbcca7cf2f4511f134c2bf0b3455078bf086436c5f"; + sha256 = "b58bbe82a7429ba589292024896b58d96fe9fa732c578569cac349928dc2ca5f"; extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-mgmt-core + msrest + msrestazure + ]; # no tests included doCheck = false; + pythonNamespaces = [ "azure.mgmt" ]; + pythonImportsCheck = [ "azure.common" "azure.mgmt.appconfiguration" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix index 2be5d27f82..43829dcb59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , msrestazure , azure-common , azure-mgmt-nspkg @@ -8,34 +8,39 @@ , isPy3k }: -buildPythonPackage { +buildPythonPackage rec { pname = "azure-mgmt-commerce"; version = "1.0.1"; - src = fetchFromGitHub { - owner = "Azure"; - repo = "azure-sdk-for-python"; - rev = "ee5b47525d6c1eae3b1fd5f65b0421eab62a6e6f"; - sha256 = "0xzdn7da5c3q5knh033vbsqk36vwbm75cx8vf10x0yj58krb4kn4"; + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1hw4crkgb72ps85m2kz9kf8p2wg9qmaagk3z5nydva9g6bnq93n4"; }; - preBuild = '' - cd ./azure-mgmt-commerce - ''; - propagatedBuildInputs = [ msrestazure azure-common azure-mgmt-nspkg ]; + prePatch = '' + rm -f azure_bdist_wheel.py tox.ini + substituteInPlace setup.py \ + --replace "wheel==0.30.0" "wheel" + sed -i "/azure-namespace-package/c\ " setup.cfg + ''; + + pythonNamespaces = [ "azure.mgmt" ]; + # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.commerce" ]; meta = with lib; { description = "This is the Microsoft Azure Commerce Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ mwilsoninsight ]; + maintainers = with maintainers; [ mwilsoninsight jonringer ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 5d80bace33..9acf4ddadc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -3,21 +3,23 @@ , fetchPypi , python , azure-mgmt-common +, azure-mgmt-core , isPy3k }: buildPythonPackage rec { - version = "13.0.0"; + version = "17.0.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7f331bafcbedf25d65aa42038f7553747dab18d7f10a5af3297192d31c45339e"; + sha256 = "c7350b404e5d10a548ceddb034394c8fad6c852ce33a3d3b211065813c1da404"; }; propagatedBuildInputs = [ azure-mgmt-common + azure-mgmt-core ]; pythonNamespaces = [ "azure.mgmt" ]; 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 603bd81ad1..d500ba0df8 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.3.0"; + version = "9.4.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "04ca071d1d6af854b6a5947c5aed803924ccbd2ea0d240285b6fa68dc4ab75a9"; + sha256 = "d90684106c70779450b82067be4d3e449c799ca1f47d941e45f6d2b5c016dac9"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 9e6fb57ba2..e164dbd8f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "0.12.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "cee5168c8b89cbc673744323cf98f7f22d710914c79d103f84f8f24b780e8214"; + sha256 = "3eabe34f49587840617747511a0aa25d08b0c1619677a1fdda24ce9e6b0f2c74"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix index 78e30841c1..3aa02dd883 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-eventhub"; - version = "4.0.0"; + version = "8.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1qisnwn0gqfsa3h5x0fdbsgdjwn92hdbg71gdijrja0kryb328k5"; + sha256 = "ae02b1e3ccbb9ec45849de544dea4d8ef36ea767707207d055ae2b4f756c0d79"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index a4b1679b25..5b9ea536df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "azure-mgmt-keyvault"; - version = "2.2.0"; + version = "7.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1883e12eeb5819064dc52bf3a3ade05c791f4b66e4aeec948bda28df6ce2bce4"; + sha256 = "128c1424373aabab5ffcfa74a3ee73cf8bda0a9259229ce2c1d09a8bc9f7370a"; }; 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 247e1ef3fe..95c1831f72 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.7.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "18n2lqvrhq40gdqhlzzg8mc03571i02c7qq7jv771lc58rqpzysh"; + sha256 = "7eb052a1c4bb037c06a0aff740378bd54a6ae256bf5cb71faa14b4eb61281488"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index 038ed52d76..3b85c9e9e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -6,23 +6,25 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-monitor"; - version = "0.11.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c6e1fe83dd2ddffa7f6d90c7aa63b3128042396a3893c14dc4816ad28cb15016"; + sha256 = "04bd89d74fe47f966b09e3256ffefcfa5c1a51057a6b33c092afe5ae17a1a7b7"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; 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 03388c4276..ad74d2cf77 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.12.0"; + version = "0.13.0"; pname = "azure-mgmt-netapp"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "7d773119bc02e3d6f9d7cffb7effc17e85676d5c5b1f656d05abc4489e472c76"; + sha256 = "e86034d073144bd5dbafe17e20fef3f48b5bf98a31b27cc0de462dc8f98303bb"; 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 a140c779ff..b08a729d5f 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 @@ -1,37 +1,43 @@ { lib , buildPythonPackage , fetchPypi +, azure-common , azure-mgmt-common -, python +, azure-mgmt-core +, msrest +, msrestazure , isPy3k }: buildPythonPackage rec { - version = "11.0.0"; + version = "16.0.0"; pname = "azure-mgmt-network"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7fdfc631c660cb173eee88abbb7b8be7742f91b522be6017867f217409cd69bc"; + sha256 = "6159a8c44590cc58841690c27c7d4acb0cd9ad0a1e5178c1d35e0f48e3c3c0e9"; }; - postInstall = if isPy3k then "" else '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py - ''; - propagatedBuildInputs = [ - azure-mgmt-common + azure-common + azure-mgmt-core + msrest + msrestazure ]; # has no tests doCheck = false; + pythonNamespaces = [ "azure.mgmt" ]; + + pythonImportsCheck = [ "azure.mgmt.network" ]; + meta = with lib; { description = "Microsoft Azure SDK for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ olcai mwilsoninsight ]; + maintainers = with maintainers; [ olcai mwilsoninsight jonringer ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 07427ff1ff..5467537f08 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -1,36 +1,39 @@ { pkgs , buildPythonPackage , fetchPypi -, python +, azure-mgmt-core , azure-mgmt-common , isPy3k }: buildPythonPackage rec { - version = "10.2.0"; + version = "15.0.0"; pname = "azure-mgmt-resource"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ddfe4c0c55f0e3fd1f66dd82c1d4a3d872ce124639b9a77fcd172daf464438a5"; + sha256 = "80ecb69aa21152b924edf481e4b26c641f11aa264120bc322a14284811df9c14"; }; - postInstall = if isPy3k then "" else '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py - ''; - - propagatedBuildInputs = [ azure-mgmt-common ]; + propagatedBuildInputs = [ + azure-mgmt-common + azure-mgmt-core + ]; # has no tests doCheck = false; + pythonNamespaces = [ "azure.mgmt" ]; + + pythonImportsCheck = [ "azure.mgmt.resource" ]; + meta = with pkgs.lib; { description = "Microsoft Azure SDK for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ olcai mwilsoninsight ]; + maintainers = with maintainers; [ olcai mwilsoninsight jonringer ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix index 16b37320ff..e4ee9c9051 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "0.20.0"; + version = "0.21.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "29dde5bb3234be6e4b2bc93ad1d37dc94b3d0536bbb21759e9b24250d2dfdab2"; + sha256 = "7bf7a41d2e42532a00b5f41d3fc0512244451a35f038ac0a25c96ef2c5c04300"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix index b6cd9ca5c8..71302be53d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -3,23 +3,30 @@ , fetchPypi , python , azure-mgmt-common +, azure-mgmt-core , isPy3k }: buildPythonPackage rec { - version = "11.2.0"; + version = "16.0.0"; pname = "azure-mgmt-storage"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "fc8e3cbf3c58cab98d9b2218c774dae2cc90b693f5ab5a24a7a959febe6c0528"; + sha256 = "2f9d714d9722b1ef4bac6563676612e6e795c4e90f6f3cd323616fdadb0a99e5"; }; - propagatedBuildInputs = [ azure-mgmt-common ]; + propagatedBuildInputs = [ + azure-mgmt-common + azure-mgmt-core + ]; pythonNamespaces = [ "azure.mgmt" ]; + pythonImportsCheck = [ "azure.mgmt.storage" ]; + # has no tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix index ffdb6eb537..13369eb014 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-mgmt-synapse"; - version = "0.3.0"; + version = "0.4.0"; disabled = pythonOlder "3"; src = fetchPypi { inherit pname version; - sha256 = "0sa12s5af9xl1wnblilswxc6ydr2anm9an000iz3ks54pydby2vy"; + sha256 = "ebd4dcb980a6425f4db7dd94225332b6bd74e1089b0c6e57af868d96ceab1d3c"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix index dbd4c1c040..13d577362a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix @@ -1,32 +1,29 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , azure-common , requests }: -buildPythonPackage { +buildPythonPackage rec { version = "0.20.7"; pname = "azure-servicemanagement-legacy"; - src = fetchFromGitHub { - owner = "Azure"; - repo = "azure-sdk-for-python"; - rev = "ab01fc1f23462f130c69f46505524b88101023dc"; - sha256 = "0w2bm9hkwy1m94l8r2klnpqn4192y8bir3z8bymxgfx9y0b1mn2q"; + src = fetchPypi { + inherit version pname; + extension = "zip"; + sha256 = "1kcibw17qm8c02y28xabm3k1zrawi6g4q8kzc751l5l3vagqnf2x"; }; - preBuild = '' - cd ./azure-servicemanagement-legacy - ''; - propagatedBuildInputs = [ azure-common requests ]; + pythonNamespaces = [ "azure" ]; # has no tests doCheck = false; + pythonImportsCheck = [ "azure.servicemanagement" ]; meta = with lib; { description = "This is the Microsoft Azure Service Management Legacy Client Library"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix index 964ec3c0d1..20d0248cc4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "12.4.0"; + version = "12.5.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1s03daq5mxh9acbv8qpa55c2wmjvdf8jq071cwv65mrly8prp84n"; + sha256 = "1469a5a0410296fb5ff96c326618d939c9cb0c0ea45eb931c89c98fa742d8daa"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix index d9d0941abd..a46202b6f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "azure-synapse-accesscontrol"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1rsdqrhrgy09kbw6c7krb4hlaxs1ldb6lilwrbxgp3zqybxxnh5b"; + sha256 = "5cead7051df3816a3382a74033efa0b8774cb7f8cdf5871c6825dd1638289189"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix index bf75e987bd..fb724e6dbf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "azure-synapse-spark"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1qijqp6llshqas422lnqvpv45iv99n7f13v86znql40y3jp5n3ir"; + sha256 = "fcfe559e30a2e159f07e371af28d18dc635dc55174fb3457be7210ce8e7e7559"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix index 69494a4fa1..9174b25f6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -25,7 +25,8 @@ buildPythonPackage rec { checkInputs = [ pytest ]; checkPhase = '' - pytest tests + # New sklearn broke one test: https://github.com/fmfn/BayesianOptimization/issues/243 + pytest tests -k "not test_suggest_with_one_observation" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bidict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bidict/default.nix index 8c7acc0a8a..34b9f4cf5f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bidict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bidict/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "bidict"; - version = "0.20.0"; + version = "0.21.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "c1b1ce1c0f1e3457489672bc3a4db375a06f61ae7797a9eedf71ea788cea3870"; + sha256 = "4fa46f7ff96dc244abfc437383d987404ae861df797e2fd5b190e233c302be09"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/biopython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/biopython/default.nix index f96b8447e8..43b48aa03a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/biopython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/biopython/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.77"; + version = "1.78"; src = fetchPypi { inherit pname version; - sha256 = "fb1936e9ca9e7af8de1050e84375f23328e04b801063edf0ad73733494d8ec42"; + sha256 = "1ee0a0b6c2376680fea6642d5080baa419fd73df104a62d58a8baf7a8bbe4564"; }; disabled = !isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix index 490df40e93..2b9e16b6a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder , ecdsa , pysha3 @@ -8,20 +8,19 @@ buildPythonPackage rec { pname = "bip_utils"; - version = "1.4.0"; + version = "1.5.0"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "582022ab5c1ff35d0179a22a39c90b7e4e71e4641d59b2a3e81d60df741d1e3c"; + src = fetchFromGitHub { + owner = "ebellocchia"; + repo = pname; + rev = "v${version}"; + sha256 = "06ls1lara7sklqw6wrw5d3wpxwgyv6paxwjp37x7b3kfskm14cmd"; }; propagatedBuildInputs = [ ecdsa pysha3 ]; - # tests are not packaged in the released tarball - doCheck = false; - pythonImportsCheck = [ "bip_utils" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blessed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blessed/default.nix index 76394c5f85..e2963eb51b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blessed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blessed/default.nix @@ -2,35 +2,21 @@ , wcwidth, pytest, mock, glibcLocales }: -let - - fixTestSuiteFailure_1 = fetchpatch { - url = "https://github.com/jquast/blessed/pull/108/commits/76a54d39b0f58bfc71af04ee143459eefb0e1e7b.patch"; - sha256 = "1higmv4c03ly7ywac1d7s71f3hrl531vj16nsfl9xh6zh9c47qcg"; - }; - - fixTestSuiteFailure_2 = fetchpatch { - url = "https://github.com/jquast/blessed/pull/108/commits/aa94e01aed745715e667601fb674844b257cfcc9.patch"; - sha256 = "1frygr6sc1vakdfx1hf6jj0dbwibiqz8hw9maf1b605cbslc9nay"; - }; - -in - buildPythonPackage rec { pname = "blessed"; - version = "1.15.0"; + version = "1.17.10"; src = fetchPypi { inherit pname version; - sha256 = "777b0b6b5ce51f3832e498c22bc6a093b6b5f99148c7cbf866d26e2dec51ef21"; + sha256 = "09kcz6w87x34a3h4r142z3zgw0av19cxn9jrbz52wkpm1534dfaq"; }; - patches = [ fixTestSuiteFailure_1 fixTestSuiteFailure_2 ]; - checkInputs = [ pytest mock glibcLocales ]; + # Default tox.ini parameters not needed checkPhase = '' - LANG=en_US.utf-8 py.test blessed/tests + rm tox.ini + pytest ''; propagatedBuildInputs = [ wcwidth six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix index 1965d256fd..2c05d64682 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "4.3.0"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "d2b5ead45dbfe98b6099d387c7f12b7d2994ae0efb60679e6bb0929a06027e16"; + sha256 = "79ddadaa9db60b81762a10af0c0d994fd60d21616c7d9229d6f7ce1930f8d343"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix index 5afb3bfffc..fe7a2a713c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: buildPythonPackage rec { - version = "4.20.0"; + version = "4.22.1"; pname = "breathe"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d7e1e1ee9b0615423b7e9abc64f0afe12e7bcf32c817a8fd1d9c8c3c4b3d71c9"; + sha256 = "6e4b66e61876dac90e78b335788a38eaa3625ed9c70d0add261f98ddd128d36a"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bumps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bumps/default.nix index af1d2cde1c..2551aebcea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bumps/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bumps/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = "http://www.reflectometry.org/danse/software.html"; + homepage = "https://www.reflectometry.org/danse/software.html"; description = "Data fitting with bayesian uncertainty analysis"; maintainers = with maintainers; [ rprospero ]; license = licenses.publicDomain; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix index 8edd8d0550..31daad18bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "canonicaljson"; - version = "1.3.0"; + version = "1.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "b4763db06a2e8553293c5edaa4bda05605c3307179a7ddfb30273a24ac384b6c"; + sha256 = "899b7604f5a6a8a92109115d9250142cdf0b1dfdcb62cdb21d8fb5bf37780631"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chameleon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chameleon/default.nix index d522764c79..0af3d18824 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chameleon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chameleon/default.nix @@ -1,17 +1,22 @@ { stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub }: buildPythonPackage rec { pname = "Chameleon"; version = "3.8.1"; - src = fetchPypi { - inherit pname version; - sha256 = "adf9609a2fa4ad20deb390605495f9a5d617b737bfbd86e51a49bbac2acaf316"; + # tests not included in pypi tarball + src = fetchFromGitHub { + owner = "malthe"; + repo = "chameleon"; + rev = version; + sha256 = "0nf8x4w2vh1a31wdb86nnvlic9xmr23j3in1f6fq4z6mv2jkwa87"; }; + pythonImportsCheck = [ "chameleon" ]; + meta = with stdenv.lib; { homepage = "https://chameleon.readthedocs.io/"; description = "Fast HTML/XML Template Compiler"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/class-registry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/class-registry/default.nix new file mode 100644 index 0000000000..9a3650bceb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/class-registry/default.nix @@ -0,0 +1,30 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + nose, + six, +}: + +buildPythonPackage rec { + pname = "class-registry"; + version = "2.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zjf9nczl1ifzj07bgs6mwxsfd5xck9l0lchv2j0fv2n481xp2v7"; + }; + + propagatedBuildInputs = [ six ]; + checkInputs = [ nose ]; + + # Tests currently failing. + doCheck = false; + + meta = { + description = "Factory+Registry pattern for Python classes."; + homepage = "https://class-registry.readthedocs.io/en/latest/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kevincox ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix index 99a2126ee9..9fe60ba55d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix @@ -1,14 +1,15 @@ { lib , buildPythonPackage , fetchPypi -, numpy -, scipy -, sparse -, numba +, isPy27 , future , h5py -, nose -, isPy27 +, ipython +, numba +, numpy +, pytestCheckHook +, scipy +, sparse }: buildPythonPackage rec { @@ -22,27 +23,35 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ + future + h5py + numba numpy scipy sparse - numba - future - h5py ]; checkInputs = [ - nose + pytestCheckHook + ipython ]; - preConfigure = '' + postPatch = '' substituteInPlace setup.py \ --replace "'numba==0.43'" "'numba'" ''; - checkPhase = '' - nosetests + # avoid collecting local files + preCheck = '' + cd clifford/test ''; + pytestFlagsArray = [ + "-m \"not veryslow\"" + "--ignore=test_algebra_initialisation.py" # fails without JIT + "--ignore=test_cga.py" + ]; + meta = with lib; { description = "Numerical Geometric Algebra Module"; homepage = "https://clifford.readthedocs.io"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix index f6055ae014..4a64606013 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "1.3.8"; + version = "1.3.10"; src = fetchPypi { inherit pname version; - sha256 = "b6f6254def8ba479088702f97bca1b999c12e0c38ac5d82dc50a44db93c7108c"; + sha256 = "960d8288c8e3a093d04975e3dd8461ce2e43c1d0c70e54873f622f8f0b77d6f5"; }; LC_ALL="en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colorful/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colorful/default.nix index c9378e329a..9ea380cd1d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colorful/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colorful/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Terminal string styling done right, in Python."; - homepage = "http://github.com/timofurrer/colorful"; + homepage = "https://github.com/timofurrer/colorful"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cppheaderparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cppheaderparser/default.nix new file mode 100644 index 0000000000..688d394198 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cppheaderparser/default.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage +, fetchPypi +, ply +, stdenv +}: + +buildPythonPackage rec { + pname = "CppHeaderParser"; + version = "2.7.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-OCswQW2VsKXoUCshSBDcrCpWQykX4mUUR9Or4lPjzEI="; + }; + + propagatedBuildInputs = [ ply ]; + + pythonImportsCheck = [ "CppHeaderParser" ]; + + meta = with stdenv.lib; { + description = "Parse C++ header files using ply.lex to generate navigable class tree representing the class structure"; + homepage = "https://sourceforge.net/projects/cppheaderparser/"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ pamplemousse ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix index 5852f518ab..0ffd66d6d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix @@ -2,8 +2,9 @@ , buildPythonPackage , fetchPypi , isPy3k -, pytest +, pytestCheckHook , sphinx +, stdenv }: buildPythonPackage rec { @@ -17,15 +18,18 @@ buildPythonPackage rec { disabled = !isPy3k; - checkInputs = [ pytest sphinx ]; + checkInputs = [ pytestCheckHook sphinx ]; __darwinAllowLocalNetworking = true; - # test_aside_basic times out, - # test_aside_cancel fails because modifies PYTHONPATH and cant find pytest - checkPhase = '' - pytest --deselect tests/test_task.py::test_aside_basic --deselect tests/test_task.py::test_aside_cancel -k "not test_ssl_outgoing" - ''; + disabledTests = [ + "test_aside_basic" # times out + "test_aside_cancel" # fails because modifies PYTHONPATH and cant find pytest + "test_ssl_outgoing" # touches network + ] ++ lib.optionals (stdenv.isDarwin) [ + "test_unix_echo" # socket bind error on hydra when built with other packages + "test_unix_ssl_server" # socket bind error on hydra when built with other packages + ]; meta = with lib; { homepage = "https://github.com/dabeaz/curio"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix index b3f2ed0629..30f747d7fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_core_components"; - version = "1.10.2"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "6152346ff2ac8a7fcdb76c8b8acbf3ee4e72f3822cd2a02a9f3a963db66f94a3"; + sha256 = "27f2ac612f5574dcd0d645f9302ceca5975bbdac6791865692e3ac51d0aec7f4"; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash-html-components/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash-html-components/default.nix index 901a670249..69eb4de2a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash-html-components/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash-html-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_html_components"; - version = "1.0.3"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1fj5wlh6x9nngmz1rzb5xazc5pl34yrp4kf7a3zgy0dniap59yys"; + sha256 = "2c662e640528c890aaa0fa23d48e51c4d13ce69a97841d856ddcaaf2c6a47be3"; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix index 7221d47e37..c61bf129ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_renderer"; - version = "1.6.0"; + version = "1.8.2"; src = fetchPypi { inherit pname version; - sha256 = "8e9c0c0c2efb8ea562489c37665417cd608c30bca20425ac4d847420b5bbc128"; + sha256 = "84cbb22019299a5a3c268ec1143c6f241c3f136e95753edac83a81673b7fa04e"; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash-table/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash-table/default.nix index bcf0a8f4e4..fdcadf3f00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash-table/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash-table/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_table"; - version = "4.9.0"; + version = "4.10.1"; src = fetchPypi { inherit pname version; - sha256 = "2f19000051730291100cd3a79b13fa62c478aea7908f2e4323c13b90f09e3320"; + sha256 = "1aa02180faef13434364286b60404d26164d1ce2779c765c9c52e6935991a4e9"; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix index eed9864d5c..b07836a098 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "dash"; - version = "1.14.0"; + version = "1.16.2"; src = fetchFromGitHub { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "1f7gal9x0bjsmwxlbvlkwfwz1cyyg5d0n6jh4399wkjilpd966d5"; + sha256 = "1krhwxlz8kpaklf5ii3h339id6c3139xzxxkq7mvvag330j6nbgg"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix index d69ae77e1a..2a088706f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix @@ -32,8 +32,6 @@ buildPythonPackage rec { pytest_xdist # takes >10mins to run single-threaded ]; - pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ]; - dontUseSetuptoolsCheck = true; propagatedBuildInputs = [ @@ -56,6 +54,13 @@ buildPythonPackage rec { --replace "cmdclass=versioneer.get_cmdclass()," "" ''; + # dask test suite with consistently fail when using high core counts + preCheck = '' + NIX_BUILD_CORES=$((NIX_BUILD_CORES > 8 ? 8 : NIX_BUILD_CORES)) + ''; + + pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ]; + disabledTests = [ "test_argwhere_str" "test_count_nonzero_str" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix index 59ebd4ef11..df3d08c3fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "7.1.0"; + version = "7.1.1"; src = fetchPypi { inherit pname version; - sha256 = "996a9d0f271f6c7edbd2d85b2efb6ff4e58d15222e80f87ca17fdbf224e17056"; + sha256 = "c7f508c84edc7f80a131650b892889624e4457c10f44318465dd3f7b8cf5be6d"; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix index 748c0a5352..a8917c3965 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.38.0"; + version = "0.39.0"; src = fetchPypi { inherit pname version; - sha256 = "401cd1dcf2d5de05786016a1c790bff28d1428d12ae1dbe11485f9cb5502939b"; + sha256 = "b0ef69a27aad0e4412c1ac3e6894fa1b5741db735515c34dfe1606d8cf30e4e5"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix index d1e2eb3b24..233aac688a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix @@ -74,8 +74,9 @@ buildPythonPackage rec { --replace "'numba >=0.37.0,<0.49'" "'numba'" ''; + # dask doesn't do well with large core counts checkPhase = '' - pytest -n $NIX_BUILD_CORES datashader + pytest -n $NIX_BUILD_CORES datashader -k 'not dask.array' ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datatable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datatable/default.nix index 345903932b..c5271e473e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datatable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datatable/default.nix @@ -1,45 +1,63 @@ { stdenv, lib, buildPythonPackage, fetchPypi, substituteAll, pythonOlder +, pipInstallHook, writeText , blessed , docutils , libcxx -, libcxxabi , llvm -, openmp -, pytest +, pytestCheckHook , typesentry }: buildPythonPackage rec { pname = "datatable"; - version = "0.10.1"; + version = "0.11.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "3ce5257c0c4afa96e2b14ca47a0aaf73add195b11de48f4adda50b5ede927436"; + sha256 = "19c602711e00f72e9ae296d8fa742d46da037c2d3a2d254bdf68f817a8da76bb"; }; + # authors seem to have created their own build system + format = "other"; - patches = lib.optionals stdenv.isDarwin [ - # Replace the library auto-detection with hardcoded paths. - (substituteAll { - src = ./hardcode-library-paths.patch; + # tarball doesn't appear to have been shipped totally ready-to-build + postPatch = '' + substituteInPlace ci/ext.py \ + --replace \ + 'shell_cmd(["git"' \ + '"0000000000000000000000000000000000000000" or shell_cmd(["git"' + echo '${version}' > VERSION.txt + ''; + DT_RELEASE = "1"; - libomp_dylib = "${lib.getLib openmp}/lib/libomp.dylib"; - libcxx_dylib = "${lib.getLib libcxx}/lib/libc++.1.dylib"; - libcxxabi_dylib = "${lib.getLib libcxxabi}/lib/libc++abi.dylib"; - }) - ]; + buildPhase = '' + python ci/ext.py wheel + ''; propagatedBuildInputs = [ typesentry blessed ]; - buildInputs = [ llvm ] ++ lib.optionals stdenv.isDarwin [ openmp ]; - checkInputs = [ docutils pytest ]; + buildInputs = [ llvm pipInstallHook ]; + checkInputs = [ docutils pytestCheckHook ]; LLVM = llvm; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isystem ${libcxx}/include/c++/v1"; - checkPhase = '' - mv datatable datatable.hidden - pytest - ''; + pytestFlagsArray = let + # ini file (not included in tarball) required to change python_files setting, + pytestIni = writeText "pytest.ini" '' + [pytest] + python_files = test_*.py test-*.py + ''; + in [ + "-c ${pytestIni}" + ]; + disabledTests = [ + # skip tests which are irrelevant to our installation or use way too much memory + "test_xfunction_paths" + "test_fread_from_cmd2" + "test_cast_huge_to_str" + "test_create_large_string_column" + ]; + pythonImportsCheck = [ "datatable" ]; meta = with lib; { description = "data.table for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datatable/hardcode-library-paths.patch b/third_party/nixpkgs/pkgs/development/python-modules/datatable/hardcode-library-paths.patch deleted file mode 100644 index 76c2f0e1dd..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/datatable/hardcode-library-paths.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/ci/setup_utils.py b/ci/setup_utils.py -index 66b385a..6255af0 100644 ---- a/ci/setup_utils.py -+++ b/ci/setup_utils.py -@@ -600,37 +600,7 @@ def find_linked_dynamic_libraries(): - them as a list of absolute paths. - """ - with TaskContext("Find the required dynamic libraries") as log: -- llvm = get_llvm() -- libs = required_link_libraries() -- resolved = [] -- for libname in libs: -- if llvm: -- fullpath = os.path.join(llvm, "lib", libname) -- if os.path.isfile(fullpath): -- resolved.append(fullpath) -- log.info("Library `%s` found at %s" % (libname, fullpath)) -- continue -- else: -- log.info("%s does not exist" % fullpath) -- # Rely on the shell `locate` command to find the dynamic libraries. -- proc = subprocess.Popen(["locate", libname], stdout=subprocess.PIPE, -- stderr=subprocess.PIPE) -- stdout, stderr = proc.communicate() -- if proc.returncode == 0: -- results = stdout.decode().strip().split("\n") -- results = [r for r in results if r] -- if results: -- results.sort(key=len) -- fullpath = results[0] -- assert os.path.isfile(fullpath), "Invalid path: %r" % (fullpath,) -- resolved.append(fullpath) -- log.info("Library `%s` found at %s" % (libname, fullpath)) -- continue -- else: -- log.fatal("Cannot locate dynamic library `%s`" % libname) -- else: -- log.fatal("`locate` command returned the following error:\n%s" -- % stderr.decode()) -+ resolved = ["@libomp_dylib@", "@libcxx_dylib@", "@libcxxabi_dylib@"] - return resolved - - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix index 2d11dee64a..52f23f437a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix @@ -1,19 +1,30 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub -, substituteAll, gdb -, colorama, django, flask, gevent, psutil, pytest -, pytest-timeout, pytest_xdist, requests +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, substituteAll +, gdb +, colorama +, flask +, psutil +, pytest-timeout +, pytest_xdist +, pytestCheckHook +, requests , isPy27 +, django +, gevent }: buildPythonPackage rec { pname = "debugpy"; - version = "1.0.0b12"; + version = "1.0.0"; src = fetchFromGitHub { owner = "Microsoft"; repo = pname; rev = "v${version}"; - sha256 = "0sz33aq5qldl7kh4qjf5w3d08l9s77ipcj4i9wfklj8f6vf9w1wh"; + sha256 = "1cxwbq97n5pfmq0hji1ybbc6i1jg5bjy830dq23zqxbwxxwjx98m"; }; patches = [ @@ -49,16 +60,31 @@ buildPythonPackage rec { )''; checkInputs = [ - colorama django flask gevent psutil pytest - pytest-timeout pytest_xdist requests + colorama + flask + psutil + pytest-timeout + pytest_xdist + pytestCheckHook + requests + ] ++ lib.optionals (!isPy27) [ + django + gevent ]; # Override default arguments in pytest.ini - checkPhase = "pytest --timeout 0 -n $NIX_BUILD_CORES" - # gevent fails to import zope.interface with Python 2.7 - + stdenv.lib.optionalString isPy27 " -k 'not test_gevent'"; + pytestFlagsArray = [ "--timeout=0" "-n=$NIX_BUILD_CORES" ]; - meta = with stdenv.lib; { + disabledTests = lib.optionals isPy27 [ + # django 1.11 is the last version to support Python 2.7 + # and is no longer built in nixpkgs + "django" + + # gevent fails to import zope.interface with Python 2.7 + "gevent" + ]; + + meta = with lib; { description = "An implementation of the Debug Adapter Protocol for Python"; homepage = "https://github.com/microsoft/debugpy"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dnspython/1.nix b/third_party/nixpkgs/pkgs/development/python-modules/dnspython/1.nix index d4ebaf82b3..30f280a502 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dnspython/1.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dnspython/1.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = { description = "A DNS toolkit for Python 3.x"; homepage = "http://www.dnspython.org"; - # BSD-like, check http://www.dnspython.org/LICENSE for details + # BSD-like, check https://www.dnspython.org/LICENSE for details license = lib.licenses.free; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dnspython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dnspython/default.nix index c699638083..1d224af035 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dnspython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dnspython/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "A DNS toolkit for Python 3.x"; homepage = "http://www.dnspython.org"; - # BSD-like, check http://www.dnspython.org/LICENSE for details + # BSD-like, check https://www.dnspython.org/LICENSE for details license = lib.licenses.free; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dpkt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dpkt/default.nix index 0238cf4706..4dd0de3b2d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dpkt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dpkt/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dpkt"; - version = "1.9.3"; + version = "1.9.4"; src = fetchPypi { inherit pname version; - sha256 = "18jcanxpzkd5n2gjbfpwbvvkm1hpxr59463z28py23vkbx57wmvg"; + sha256 = "f4e579cbaf6e2285ebf3a9e84019459b4367636bac079ba169527e582fca48b4"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix index 5a3a9b0110..53324f94c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 }: buildPythonPackage rec { - version = "2.0.0"; + version = "2.0.3"; pname = "elementpath"; disabled = isPy27; # uses incompatible class syntax @@ -9,19 +9,13 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "16kfbiy87qjl07y3iin8jdjhz8j28wlwnkwxq9a0752ipjjg869p"; + sha256 = "16gs5glnlr4i41xbmd30x62zj85apmf69m9akvfnka0gkjlzv8in"; }; # avoid circular dependency with xmlschema which directly depends on this doCheck = false; - pythonImportsCheck = [ - "elementpath.xpath1_parser" - "elementpath.xpath2_parser" - "elementpath.xpath2_functions" - "elementpath.xpath_context" - "elementpath.xpath_selectors" - ]; + pythonImportsCheck = [ "elementpath" ]; meta = with lib; { description = "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/entrypoint2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/entrypoint2/default.nix new file mode 100644 index 0000000000..301de3e278 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/entrypoint2/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchPypi, EasyProcess, pathpy, pytest }: + +buildPythonPackage rec { + pname = "entrypoint2"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "15dya04884armqjdyqz1jgachkqgh9dc3p25lvyz9afvg73k2qav"; + }; + + propagatedBuildInputs = [ ]; + + pythonImportsCheck = [ "entrypoint2" ]; + + # argparse is part of the standardlib + prePatch = '' + substituteInPlace setup.py --replace "argparse" "" + ''; + + checkInputs = [ EasyProcess pathpy pytest ]; + + # 0.2.1 has incompatible pycache files included + # https://github.com/ponty/entrypoint2/issues/8 + checkPhase = '' + rm -rf tests/__pycache__ + pytest tests + ''; + + meta = with lib; { + description = "Easy to use command-line interface for python modules"; + homepage = "https://github.com/ponty/entrypoint2/"; + license = licenses.bsd2; + maintainers = with maintainers; [ austinbutler ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix index 300a660f32..abd279d6c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "eventlet"; - version = "0.26.1"; + version = "0.28.0"; src = fetchPypi { inherit pname version; - sha256 = "4f4a43366b4cbd4a3f2f231816e5c3dae8ab316df9b7da11f0525e2800559f33"; + sha256 = "9c7c63e8a80c7d02d692b2cf308312402fa4777335fd3de5da45097383301ff3"; }; propagatedBuildInputs = [ dnspython greenlet monotonic six ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix index 0a52d89df5..47c7d50630 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix @@ -16,6 +16,9 @@ buildPythonPackage rec { # FIXME: package zstandard # removing the test dependency for now substituteInPlace setup.py --replace "'zstandard'," "" + + # workaround for https://github.com/dask/fastparquet/issues/517 + rm fastparquet/test/test_partition_filters_specialstrings.py ''; nativeBuildInputs = [ pytestrunner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix index a20b00087b..66e251b936 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix @@ -4,18 +4,19 @@ , pythonOlder , pytestCheckHook , numpy +, stdenv }: buildPythonPackage rec { pname = "fsspec"; - version = "0.7.4"; + version = "0.8.3"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "intake"; repo = "filesystem_spec"; rev = version; - sha256 = "0ylslmkzc803050yh8dl6cagabb9vrygz6w2zsmglzn4v9sz6jgd"; + sha256 = "0mfy0wxjfwwnp5q2afhhfbampf0fk71wsv512pi9yvrkzzfi1hga"; }; checkInputs = [ @@ -23,10 +24,18 @@ buildPythonPackage rec { numpy ]; + pytestFlagsArray = [ "--rootdir=$(mktemp -d)" ]; + disabledTests = [ # Test assumes user name is part of $HOME # AssertionError: assert 'nixbld' in '/homeless-shelter/foo/bar' "test_strip_protocol_expanduser" + ] ++ lib.optionals (stdenv.isDarwin) [ + # works locally on APFS, fails on hydra with AssertionError comparing timestamps + # darwin hydra builder uses HFS+ and has only one second timestamp resolution + # this two tests however, assume nanosecond resolution + "test_modified" + "test_touch" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/funcy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/funcy/default.nix index 87a3b830bf..96b12e631a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/funcy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/funcy/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "funcy"; - version = "1.14"; + version = "1.15"; src = fetchPypi { inherit pname version; - sha256 = "1i55c5kjvkb3y2jqfnlx3iirrd512mxjdhjpm1l2xya6nk1q9vkm"; + sha256 = "65b746fed572b392d886810a98d56939c6e0d545abb750527a717c21ced21008"; }; # No tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix index 329fe7aa07..69b5d2f97f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "4.0.2"; + version = "4.1.0"; pname = "geoip2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "4afb5d899eac08444e461239c8afb165c90234adc0b5dc952792d9da74c9091b"; + sha256 = "57d8d15de2527e0697bbef44fc16812bba709f03a07ef99297bd56c1df3b1efd"; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix index ba3ff3bfd6..318bafb98e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -1,10 +1,10 @@ { stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, substituteAll -, python, utillinux, pygit2, gitMinimal, git-annex +, python, utillinux, pygit2, gitMinimal, git-annex, cacert }: buildPythonPackage rec { pname = "git-annex-adapter"; - version = "0.2.1"; + version = "0.2.2"; disabled = !isPy3k; @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "alpernebbi"; repo = pname; rev = "v${version}"; - sha256 = "146q1jhcfc7f96ajkhjffskkljk2xzivs5ih5clb8qx0sh7mj097"; + sha256 = "0666vqspgnvmfs6j3kifwyxr6zmxjs0wlwis7br4zcq0gk32zgdx"; }; patches = [ @@ -28,11 +28,12 @@ buildPythonPackage rec { utillinux # `rev` is needed in tests/test_process.py ]; - propagatedBuildInputs = [ pygit2 ]; + propagatedBuildInputs = [ pygit2 cacert ]; checkPhase = '' ${python.interpreter} -m unittest ''; + pythonImportsCheck = [ "git_annex_adapter" ]; meta = with stdenv.lib; { homepage = "https://github.com/alpernebbi/git-annex-adapter"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix index 4b02cfdfa3..3ff530831b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.12.2"; + version = "1.12.3"; src = fetchPypi { inherit pname version; - sha256 = "54a7d330833a2e7b0587446d7e4ae6d0244925a9a8e1dfe878f3f7e06cdedb62"; + sha256 = "844ef76bda585ea0ea2d5e7f8f9a0eb10d6e2eba66c4fea0210ec7843941cb1a"; }; # No tests included in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix index f0cda83d3b..56a77258c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-i18n-address"; - version = "2.3.5"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "1kkg3x92m40z0mw712z9apnrw08qsx0f9lj7lfgddkdbx4vd8v3w"; + sha256 = "8454a58f254a29988b8d1ca9ab663fd28a1f392a3d29b844d8824807db6333d7"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/guestfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/guestfs/default.nix index 238a1e9980..a446166c29 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/guestfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/guestfs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ libguestfs qemu ]; meta = with stdenv.lib; { - homepage = "http://libguestfs.org/guestfs-python.3.html"; + homepage = "https://libguestfs.org/guestfs-python.3.html"; description = "Use libguestfs from Python"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ grahamc ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix index 7588135e33..482b2c64aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix @@ -14,8 +14,10 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "pyglet>=1.2.0,<=1.3.2" "pyglet" + --replace "pyglet>=1.2.0,<=1.3.2" "pyglet" \ + --replace "cloudpickle>=1.2.0,<1.4.0" "cloudpickle~=1.2" ''; + # cloudpickle range has been expanded in package but not yet released propagatedBuildInputs = [ numpy requests six pyglet scipy cloudpickle @@ -24,6 +26,8 @@ buildPythonPackage rec { # The test needs MuJoCo that is not free library. doCheck = false; + pythonImportCheck = [ "gym" ]; + meta = with lib; { description = "A toolkit by OpenAI for developing and comparing your reinforcement learning agents"; homepage = "https://gym.openai.com/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix index 2ee4a858f6..8cb6b8c22f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchPypi, isPy27, python, buildPythonPackage , numpy, hdf5, cython, six, pkgconfig, unittest2, fetchpatch -, mpi4py ? null, openssh }: +, mpi4py ? null, openssh, pytest }: assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi; @@ -10,20 +10,15 @@ let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "2.9.0"; + version = "2.10.0"; pname = "h5py"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9d41ca62daf36d6b6515ab8765e4c8c4388ee18e2a665701fef2b41563821002"; + sha256 = "84412798925dc870ffd7107f045d7659e60f5d46d1c70c700375248bf6bf512d"; }; - patches = [ ( fetchpatch { - # Skip a test that probes an already fixed bug in HDF5 (upstream patch) - url = "https://github.com/h5py/h5py/commit/141eafa531c6c09a06efe6a694251a1eea84908d.patch"; - sha256 = "0lmdn0gznr7gadx7qkxybl945fvwk6r0cc4lg3ylpf8ril1975h8"; - })]; - configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi"; postConfigure = '' @@ -36,7 +31,7 @@ in buildPythonPackage rec { preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; - checkInputs = optional isPy27 unittest2 ++ [ openssh ]; + checkInputs = optional isPy27 unittest2 ++ [ pytest openssh ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ hdf5 cython ] ++ optional mpiSupport mpi; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix index c40d9672f6..14cace859e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.0.1"; + version = "10.0.2"; src = fetchPypi { inherit pname version; - sha256 = "9468b3e2721744b077413c3d4a6b321b61370d4c87b90afa40dc2b48ad877d4b"; + sha256 = "75892623258339613528df45dcd1004786bf73e8d95407886d79bc4567fbde4d"; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hidapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hidapi/default.nix index b1c21b106b..9e9e965d33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hidapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hidapi/default.nix @@ -19,8 +19,12 @@ buildPythonPackage rec { libusb=${libusb1.dev}/include/libusb-1.0 test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace setup.py --replace 'macos_sdk_path =' 'macos_sdk_path = "" #' ''; + pythonImportsCheck = [ "hid" ]; + meta = with stdenv.lib; { description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi"; homepage = "https://github.com/trezor/cython-hidapi"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/icalendar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/icalendar/default.nix index 81c97a0ee4..c8a3a09fd5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/icalendar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/icalendar/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "4.0.6"; + version = "4.0.7"; pname = "icalendar"; src = fetchPypi { inherit pname version; - sha256 = "17wpvngxv9q333ng3hm4k1qhiafmzipr7l2liwny7ar24qiyfvvy"; + sha256 = "0fc18d87f66e0b5da84fa731389496cfe18e4c21304e8f6713556b2e8724a7a4"; }; buildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix index 68a71e0974..b9134ef16e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.4.29"; + version = "1.5.5"; src = fetchPypi { inherit pname version; - sha256 = "9f5fcf22b665eaece583bd395b103c2769772a0f646ffabb5b1f155901b07de2"; + sha256 = "7c22c384a2c9b32c5cc891d13f923f6b2653aa83e2d75d8f79be240d6c86c4f4"; }; # Tests not included in PyPI tarball diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix index 560ae55293..c17c3eb4af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix @@ -1,20 +1,23 @@ -{ stdenv, buildPythonPackage, fetchPypi, python-editor, readchar, blessings, pytest, pytestcov, pexpect, pytest-mock }: +{ stdenv, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytestcov, pexpect, pytest-mock }: buildPythonPackage rec { pname = "inquirer"; version = "2.7.0"; - src = fetchPypi { - inherit pname version; - sha256 = "e819188de0ca7985a99c282176c6f50fb08b0d33867fd1965d3f3e97d6c8f83f"; + # PyPi archive currently broken: https://github.com/magmax/python-inquirer/issues/106 + src = fetchFromGitHub rec { + owner = "magmax"; + repo = "python-inquirer"; + rev = version; + sha256 = "152l5qjgkag8zkr69ax2i5s8xcac1qvyngisrplbnbzwbpf77d0d"; }; - propagatedBuildInputs = [ python-editor readchar blessings ]; + propagatedBuildInputs = [ blessed python-editor readchar ]; - # No real changes in 2.0.0...e0edfa3 postPatch = '' - substituteInPlace setup.py \ - --replace "readchar == 2.0.1" "readchar >= 2.0.0" + substituteInPlace requirements.txt \ + --replace "blessed==1.17.6" "blessed~=1.17" \ + --replace "readchar==2.0.1" "readchar>=2.0.0" ''; checkInputs = [ pytest pytestcov pexpect pytest-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix index 91c779c292..922d543fd1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix @@ -6,19 +6,19 @@ , holoviews , hvplot , jinja2 -, msgpack-numpy , msgpack +, msgpack-numpy , numpy , pandas , panel , pyarrow +, pytestCheckHook +, pythonOlder , python-snappy , requests , ruamel_yaml , six , tornado -, pytest -, pythonOlder }: buildPythonPackage rec { @@ -32,7 +32,6 @@ buildPythonPackage rec { sha256 = "0c284abeb74927a7366dcab6cefc010c4d050365b8af61c37326a2473a490a4e"; }; - checkInputs = [ pyarrow pytest ]; propagatedBuildInputs = [ appdirs dask @@ -51,6 +50,8 @@ buildPythonPackage rec { tornado ]; + checkInputs = [ pyarrow pytestCheckHook ]; + postPatch = '' # Is in setup_requires but not used in setup.py... substituteInPlace setup.py --replace "'pytest-runner'" "" @@ -58,8 +59,18 @@ buildPythonPackage rec { # test_discover requires driver_with_entrypoints-0.1.dist-info, which is not included in tarball # test_filtered_compressed_cache requires calvert_uk_filter.tar.gz, which is not included in tarball - checkPhase = '' - PATH=$out/bin:$PATH HOME=$(mktemp -d) pytest -k "not test_discover and not test_filtered_compressed_cache" + preCheck = '' + HOME=$TMPDIR + PATH=$out/bin:$PATH + ''; + + # disable tests which touch network + disabledTests = '' + "test_discover" + "test_filtered_compressed_cache" + "test_get_dir" + "test_remote_cat" + "http" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix index 44ec6cade9..4efe8b176c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ipympl"; - version = "0.5.7"; + version = "0.5.8"; src = fetchPypi { inherit pname version; - sha256 = "0cjsabsbn02vpf3yl0x9xdqgf4f707mbnz2hp2bn6zp9qnyyirx5"; + sha256 = "0e2f2e540a2dfea61524b7993fc8552c9236b1aaa3826e1f382c75cb2fa5c382"; }; propagatedBuildInputs = [ ipywidgets matplotlib ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix index bc87015f10..ed113dc6da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "irc"; - version = "19.0.0"; + version = "19.0.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "29026b1e977dacb621c710ae9531fcab6fa21825b743c616c220da0e58a32233"; + sha256 = "99fd5d1fa1d054dee4fbb81e0d5193dc1e8200db751d5da9a97850a62162b9ab"; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix index 5b2a8e1614..1d32291dff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix @@ -2,7 +2,9 @@ , buildPythonPackage , fetchPypi , isl -, pytest +, pybind11 +, pytestCheckHook +, pythonOlder , cffi , six }: @@ -10,6 +12,7 @@ buildPythonPackage rec { pname = "islpy"; version = "2020.2"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; @@ -21,16 +24,12 @@ buildPythonPackage rec { --replace "\"pytest>=2\"," "" ''; - buildInputs = [ isl ]; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ - cffi - six - ]; + buildInputs = [ isl pybind11 ]; + propagatedBuildInputs = [ six ]; - checkPhase = '' - pytest test - ''; + preCheck = "mv islpy islpy.hidden"; + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "islpy" ]; meta = with lib; { description = "Python wrapper around isl, an integer set library"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iterm2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iterm2/default.nix index 4d4cf95fc8..66227fcb66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iterm2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iterm2/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to iTerm2's scripting API"; - homepage = "http://github.com/gnachman/iTerm2"; + homepage = "https://github.com/gnachman/iTerm2"; license = licenses.gpl2; maintainers = with maintainers; [ jeremyschlatter ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jug/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jug/default.nix index d55a5fad44..edfc7573d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jug/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jug/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "Jug"; - version = "2.0.2"; + version = "2.0.3"; buildInputs = [ nose numpy ]; propagatedBuildInputs = [ bottle @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "859a4b4cb26a0010299b189c92cfba626852c97a38e22f3d1b56e4e1d8ad8620"; + sha256 = "3656355c1f9cd1731065c9d589f66d33653cbe5e0879cbe5d8447b51e4ddb4ec"; }; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix index 42f50c203e..372698744c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "jupyter_console"; - version = "6.1.0"; + version = "6.2.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "06s3kr5vx0l1y1b7fxb04dmrppscl7q69sl9yyfr0d057d1ssvkg"; + sha256 = "7f6194f4f4692d292da3f501c7f343ccd5e36c6a1becf7b7515e23e66d6bf1e9"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix index fb5ac3d06a..f05536741f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "2.2.6"; + version = "2.2.8"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "6554b022d2cd120100e165ec537c6511d70de7f89e253b3c667ea28f2a9263ff"; + sha256 = "c8377bee30504919c1e79949f9fe35443ab7f5c4be622c95307e8108410c8b8c"; }; propagatedBuildInputs = [ jupyterlab_server notebook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ldap3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ldap3/default.nix index 9842c4d759..178477dcc6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ldap3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ldap3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ldap3"; - version = "2.8"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "59d1adcd5ead263387039e2a37d7cd772a2006b1cdb3ecfcbaab5192a601c515"; + sha256 = "37d633e20fa360c302b1263c96fe932d40622d0119f1bddcb829b03462eeeeb7"; }; propagatedBuildInputs = [ pyasn1 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix index 6693756b9c..671de812f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1b28j265kvibgxrgxx0gwfm6cmv252c8ph1j2vb0cpms8ph5if5v"; + sha256 = "1b14b1f5f91ceeff5cf228613e76577d7b41e790dccd53a0f647ef816fb5495c"; }; checkInputs = [ mock pytest pytestrunner requests-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix index 4a5e138673..60fe4d86ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2020.07.01"; + version = "2020.08.30"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "08q8krq8dqlvzz3wjgnki3n8d8qmk99pn7n3lfsim5rnrnx1jchb"; + sha256 = "44d81682cdf246a0324638707a2ef0819aae8c84fc0e69daaaa57cbc3f9e18e1"; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lmtpd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lmtpd/default.nix index e9dd42219e..336b799eee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lmtpd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lmtpd/default.nix @@ -1,9 +1,11 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ buildPythonPackage, fetchPypi, isPy3k, stdenv }: buildPythonPackage rec { pname = "lmtpd"; version = "6.2.0"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "2c6825d2ffa1de099440411a742f58e1b3e8deeb3345adcfd4c2c38d4baf62b3"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/localzone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/localzone/default.nix index 3827c29720..f4ed4b98ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/localzone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/localzone/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "localzone"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "ags-slc"; repo = pname; rev = "v${version}"; - sha256 = "154l7qglsm4jrhqddvlas8cgl9qm2z4dzihv05jmsyqjikcmfwk8"; + sha256 = "1vzn1vm3zf86l7qncbmghjrwyvla9dc2v8abn8jajbl47gm7r5f7"; }; propagatedBuildInputs = [ dnspython sphinx ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix index 18b1594b28..216fb3c518 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "loguru"; - version = "0.5.1"; + version = "0.5.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "70201d5fce26da89b7a5f168caa2bb674e06b969829f56737db1d6472e53e7c3"; + sha256 = "b28e72ac7a98be3d28ad28570299a393dfcd32e5e3f6a353dec94675767b6319"; }; checkInputs = [ pytestCheckHook colorama ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lomond/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lomond/default.nix new file mode 100644 index 0000000000..669f16e5f9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/lomond/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage, freezegun, fetchFromGitHub, lib, pytestCheckHook +, pytest-mock, pytestrunner, six, tornado_4 }: + +buildPythonPackage rec { + pname = "lomond"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "wildfoundry"; + repo = "dataplicity-${pname}"; + rev = "b30dad3cc38d5ff210c5dd01f8c3c76aa6c616d1"; + sha256 = "0lydq0imala08wxdyg2iwhqa6gcdrn24ah14h91h2zcxjhjk4gv8"; + }; + + nativeBuildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ six ]; + checkInputs = [ pytestCheckHook freezegun pytest-mock tornado_4 ]; + # Makes HTTP requests + disabledTests = [ "test_proxy" "test_live" ]; + + meta = with lib; { + description = "Websocket Client Library"; + homepage = "https://github.com/wildfoundry/dataplicity-lomond"; + license = licenses.bsd3; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mask-rcnn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mask-rcnn/default.nix index ae07e7928a..4c500a1851 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mask-rcnn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mask-rcnn/default.nix @@ -12,7 +12,7 @@ , pillow , scikitimage , scipy -, tensorflow +, tensorflow_2 }: buildPythonPackage rec { @@ -39,7 +39,7 @@ buildPythonPackage rec { pillow scikitimage scipy - tensorflow + tensorflow_2 # Keras only supports tensorflow 2 now ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mockito/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mockito/default.nix index 74887b9953..1238388a91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mockito/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mockito/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }: buildPythonPackage rec { - version = "1.2.1"; + version = "1.2.2"; pname = "mockito"; src = fetchPypi { inherit pname version; - sha256 = "1ilj73bdk81v4l7ir6hbfvmslzbsxkgvz1asngbyf7w5gl2y5nyf"; + sha256 = "d6b3aca6cdb92bbd47e19ebdb1a0b84ef23ab874eae5c6d505323c8657257c06"; }; propagatedBuildInputs = stdenv.lib.optionals (!isPy3k) [ funcsigs ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mss/default.nix new file mode 100644 index 0000000000..1604a00656 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mss/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "mss"; + version = "6.0.0"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0dicp55adbqxb7hqlck95hngb1klv5s26lszw3xim30k18bwqaxl"; + }; + + propagatedBuildInputs = [ ]; + + # By default it attempts to build Windows-only functionality + prePatch = '' + rm mss/windows.py + ''; + + # Skipping tests due to most relying on DISPLAY being set + pythonImportsCheck = [ "mss" ]; + + meta = with lib; { + description = "Cross-platform multiple screenshots module in pure Python"; + homepage = "https://github.com/BoboTiG/mss/"; + license = licenses.mit; + maintainers = with maintainers; [ austinbutler ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/namedlist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/namedlist/default.nix index b66ecb6210..874b1e177d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/namedlist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/namedlist/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "namedlist"; - version = "1.7"; + version = "1.8"; src = fetchPypi { inherit pname version; - sha256 = "11n9c4a5ak9971awkf1g92m6mcmiprhrw98ik2cmjsqxmz73j2qr"; + sha256 = "34f89fc992592c80b39a709e136edcf41ea17f24ba31eaf84a314a02c8b9bcef"; }; # Test file has a `unittest.main()` at the bottom that fails the tests; @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Similar to namedtuple, but instances are mutable"; - homepage = "https://bitbucket.org/ericvsmith/namedlist"; + homepage = "https://gitlab.com/ericvsmith/namedlist"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ivan ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix index f6009bf500..aa7a1ce390 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "nbclient"; - version = "0.4.3"; + version = "0.5.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "311e14e463a300239c558a95023f6d1007c3f69f589bd51a76b1b6b3f19a7f4b"; + sha256 = "8ad52d27ba144fca1402db014857e53c5a864a2f407be66ca9d74c3a56d6591d"; }; checkInputs = [ pytest xmltodict nbconvert ipywidgets ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix index 198f139b11..704bc21d7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix @@ -40,8 +40,12 @@ buildPythonPackage rec { six ]; - # ignore impure tests + # Set HOME so that matplotlib doesn't try to use + # /homeless-shelter/.config/matplotlib, otherwise some of the tests fail for + # having an unexpected warning on stderr produced by matplotlib. + # Ignore impure tests. checkPhase = '' + export HOME=$(mktemp -d) pytest tests --ignore tests/test_timeouts.py ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nodeenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nodeenv/default.nix index b4acefaeb6..821a2d1bcc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nodeenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nodeenv/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "nodeenv"; - version = "1.3.5"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "7389d06a7ea50c80ca51eda1b185db7b9ec38af1304d12d8b8299d6218486e91"; + sha256 = "ab45090ae383b716c4ef89e690c41ff8c2b257b85b309f01f3654df3d084bd7c"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notify-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notify-py/default.nix new file mode 100644 index 0000000000..fc2eda47be --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/notify-py/default.nix @@ -0,0 +1,35 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, alsaUtils, libnotify, which, loguru, pytest }: + +buildPythonPackage rec { + pname = "notify_py"; + version = "0.2.3"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1i209xsff54hipdk9cg6va60fl33swg126yfgkg3wsgjmi6s07ca"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "loguru==0.4.1" "loguru~=0.5.0" + ''; + + propagatedBuildInputs = [ alsaUtils libnotify loguru which ]; + + checkInputs = [ alsaUtils libnotify pytest which ]; + + checkPhase = '' + pytest + ''; + + pythonImportsCheck = [ "notifypy" ]; + + meta = with lib; { + description = " Python Module for sending cross-platform desktop notifications on Windows, macOS, and Linux."; + homepage = "https://github.com/ms7m/notify-py/"; + license = licenses.mit; + maintainers = with maintainers; [ austinbutler ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix index 909be25138..e85fc4693a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix @@ -1,18 +1,21 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook, setuptools, structlog, pytest-asyncio, flaky, tornado, pycurl, aiohttp, pytest-httpbin }: +{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, pytestCheckHook, setuptools, toml, structlog, appdirs, pytest-asyncio, flaky, tornado, pycurl, aiohttp, pytest-httpbin }: buildPythonPackage rec { pname = "nvchecker"; - version = "1.7"; + version = "2.1"; - src = fetchPypi { - inherit pname version; - sha256 = "01be0e5587d346ad783b4b2dc45bd8eefe477081b33fff18cc2fdea58c2a38ef"; + # Tests not included in PyPI tarball + src = fetchFromGitHub { + owner = "lilydjwg"; + repo = pname; + rev = "v${version}"; + sha256 = "0zf9vhf8ka0v1mf1xhbvkc2nr54m0rkiw1i68ps4sgx2mdj6qrfk"; }; - propagatedBuildInputs = [ setuptools structlog tornado pycurl aiohttp ]; + propagatedBuildInputs = [ setuptools toml structlog appdirs tornado pycurl aiohttp ]; checkInputs = [ pytestCheckHook pytest-asyncio flaky pytest-httpbin ]; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; pytestFlagsArray = [ "-m 'not needs_net'" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pastel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pastel/default.nix index a44b4253ca..a8eb5396fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pastel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pastel/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pastel"; - version = "0.2.0"; + version = "0.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0dnaw44ss10i10z4ksy0xljknvjap7rb7g0b8p6yzm5x4g2my5a6"; + sha256 = "e6581ac04e973cac858828c6202c1e1e81fee1dc7de7683f3e1ffe0bfd8a573d"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix index 5fc61f6442..b9342821b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pdf2image"; - version = "1.13.1"; + version = "1.14.0"; propagatedBuildInputs = [ pillow poppler_utils ]; src = fetchPypi { inherit pname version; - sha256 = "1l3jic687vnji952f4dp66jwiprpxskja9v4ffw3bpr6gxgq4syz"; + sha256 = "066527e1bf954762fb4369c677ae3bc15f2ce8707eee830cccef8471fde736d7"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/periodictable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/periodictable/default.nix index acbfc06850..a0949385bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/periodictable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/periodictable/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; meta = { - homepage = "http://www.reflectometry.org/danse/software.html"; + homepage = "https://www.reflectometry.org/danse/software.html"; description = "an extensible periodic table of the elements prepopulated with data important to neutron and x-ray scattering experiments"; license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ rprospero ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix index 1aef55e821..8693901c93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.8"; + version = "8.12.10"; src = fetchPypi { inherit pname version; - sha256 = "3a8b8f7b60ea00b83ca588b5ca57e48d9a3c223aa42f1a3d5fa88566424216c3"; + sha256 = "d6e108352e7113c55cf0d92f8aede876a379580e46a3b9c2e779dc3601f11863"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillowfight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillowfight/default.nix index 879ebe252d..ed0daf123d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pillowfight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pillowfight/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pillow ]; meta = with stdenv.lib; { - description = "Pillow Fight"; + description = "Eases the transition from PIL to Pillow for Python packages"; homepage = "https://github.com/beanbaginc/pillowfight"; license = licenses.mit; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pivy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pivy/default.nix index 8f1b7de92b..3d3f93f21a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pivy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pivy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pivy"; - version = "0.6.5a2"; + version = "0.6.5"; src = fetchFromGitHub { - owner = "FreeCAD"; + owner = "coin3d"; repo = "pivy"; rev = version; - sha256 = "1w03jaha36bjyfaz8hchnv8yrkm5715w15crhd3qrlagz8fs38hm"; + sha256 = "0vids7sxk8w5vr73xdnf8xdci71a7syl6cd35aiisppbqyyfmykx"; }; nativeBuildInputs = with pkgs; [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix index c41aaf6b4d..b9a4fb34bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix @@ -1,21 +1,21 @@ { lib, buildPythonPackage, fetchFromGitHub, requests -, tqdm, websocket_client, pytest, pillow, mock, isPy27 }: +, tqdm, websocket_client, pytest, pillow, isPy27 }: buildPythonPackage rec { pname = "PlexAPI"; - version = "3.6.0"; + version = "4.1.2"; + disabled = isPy27; src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "1lzp3367hmcpqwbkp4ckdv6hv37knwnwya88jicwl1smznpmjdfv"; + sha256 = "1l955q1q6lljq3bmyiayr33gzxrlw16xdwgjdaflznvyg16fcjkk"; }; propagatedBuildInputs = [ requests tqdm websocket_client ]; - checkInputs = [ pytest pillow ] - ++ lib.optionals isPy27 [ mock ]; + checkInputs = [ pytest pillow ]; meta = with lib; { homepage = "https://github.com/pkkid/python-plexapi"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix index fb4ff8b2d8..6f96a61116 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix @@ -13,22 +13,16 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.0.0a9"; + version = "1.0.0"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "1ln47x1bc1yvhdfwfnkqx4d2j7988a59v8vmcriw14whfgzfki75"; + sha256 = "02pqkwzbg43xz2zsw8q7m0sfkj8wbw07in83gy0bk0znhljhp0vw"; }; - # avoid mass-rebuild of python packages - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "^1.7.0" "^1.6.0" - ''; - nativeBuildInputs = [ intreehooks ]; @@ -50,7 +44,7 @@ buildPythonPackage rec { ]; # requires git history to work correctly - disabledTests = [ "default_with_excluded_data" ]; + disabledTests = [ "default_with_excluded_data" "default_src_with_excluded_data" ]; pythonImportsCheck = [ "poetry.core" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/poetry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/poetry/default.nix index 937a758b9c..8000c667e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/poetry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/poetry/default.nix @@ -7,14 +7,11 @@ , httpretty , importlib-metadata , intreehooks -, jsonschema , keyring , lockfile , pexpect , pkginfo -, pygments -, pyparsing -, pyrsistent +, poetry-core , pytestCheckHook , pytestcov , pytest-mock @@ -22,11 +19,12 @@ , requests-toolbelt , shellingham , tomlkit +, virtualenv }: buildPythonPackage rec { pname = "poetry"; - version = "1.0.10"; + version = "1.1.1"; format = "pyproject"; disabled = isPy27; @@ -34,19 +32,13 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "00qfzjjs6clh93gfl1px3ma9km8qxl3f4z819nmyl58zc8ni3zyv"; + sha256 = "1j3ij8qsd709p7ww5r4759f2xnk2s7g40kzm9vx99l98zw890g05"; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "pyrsistent = \"^0.14.2\"" "pyrsistent = \"^0.16.0\"" \ - --replace "requests-toolbelt = \"^0.8.0\"" "requests-toolbelt = \"^0.9.1\"" \ - --replace 'importlib-metadata = {version = "~1.1.3", python = "<3.8"}' \ - 'importlib-metadata = {version = ">=1.3,<2", python = "<3.8"}' \ - --replace "tomlkit = \"^0.5.11\"" "tomlkit = \"<2\"" \ - --replace "cleo = \"^0.7.6\"" "cleo = \"^0.8.0\"" \ - --replace "version = \"^20.0.1\", python = \"^3.5\"" "version = \"^21.0.0\", python = \"^3.5\"" \ - --replace "clikit = \"^0.4.2\"" "clikit = \"^0.6.2\"" + --replace 'importlib-metadata = {version = "^1.6.0", python = "<3.8"}' \ + 'importlib-metadata = {version = ">=1.6,<2", python = "<3.8"}' ''; nativeBuildInputs = [ intreehooks ]; @@ -57,17 +49,16 @@ buildPythonPackage rec { cleo clikit html5lib - jsonschema keyring lockfile pexpect pkginfo - pyparsing - pyrsistent + poetry-core requests requests-toolbelt shellingham tomlkit + virtualenv ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; postInstall = '' @@ -79,7 +70,7 @@ buildPythonPackage rec { "$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish" ''; - checkInputs = [ pytestCheckHook httpretty pytest-mock pygments pytestcov ]; + checkInputs = [ pytestCheckHook httpretty pytest-mock pytestcov ]; preCheck = "export HOME=$TMPDIR"; disabledTests = [ # touches network @@ -88,10 +79,13 @@ buildPythonPackage rec { "load" "vcs" "prereleases_if_they_are_compatible" + "test_executor" # requires git history to work correctly "default_with_excluded_data" # toml ordering has changed "lock" + # fs permission errors + "test_builder_should_execute_build_scripts" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix index 5136cf2010..23ebc93545 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "progressbar2"; - version = "3.51.4"; + version = "3.53.1"; src = fetchPypi { inherit pname version; - sha256 = "0dnfw8mdrz78gck4ibnv64cinbp5f7kw349wjgpwv53z6p7jiwhk"; + sha256 = "ef72be284e7f2b61ac0894b44165926f13f5d995b2bf3cd8a8dedc6224b255a7"; }; propagatedBuildInputs = [ python-utils ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix index 0f89069c7d..b439c05f0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "psautohint"; - version = "2.1.0"; + version = "2.1.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "adobe-type-tools"; repo = pname; - sha256 = "1k1rx1adqxdxj5v3788lwnvygylp73sps1p0q44hws2vmsag2s8r"; + sha256 = "00n9bycjmvx1fb4332bdj53f01q86ajndrvid9idpiyzybmd5vp4"; rev = "v${version}"; fetchSubmodules = true; # data dir for tests }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ptpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ptpython/default.nix index e92a99d998..85ba8838f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ptpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ptpython/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "ptpython"; - version = "3.0.5"; + version = "3.0.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "5094e7e4daa77453d3c33eb7b7ebbf1060be4446521865a94e698bc85ff15930"; + sha256 = "34814eb410f854c823be4c4a34124e1dc8ca696da1c1fa611f9da606c5a8a609"; }; propagatedBuildInputs = [ appdirs prompt_toolkit docopt jedi pygments ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pure-eval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pure-eval/default.nix index d7e92f0978..2807611f49 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pure-eval/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pure-eval/default.nix @@ -1,9 +1,11 @@ -{ lib, buildPythonPackage, fetchFromGitHub, setuptools_scm, toml, pytest }: +{ buildPythonPackage, isPy3k, lib, fetchFromGitHub, setuptools_scm, toml, pytest }: buildPythonPackage rec { pname = "pure_eval"; version = "0.1.0"; + disabled = !isPy3k; + src = fetchFromGitHub { owner = "alexmojaki"; repo = pname; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pure-python-adb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pure-python-adb/default.nix new file mode 100644 index 0000000000..c562f20e5e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pure-python-adb/default.nix @@ -0,0 +1,26 @@ +{ aiofiles, buildPythonPackage, fetchPypi, lib, pythonOlder }: + +buildPythonPackage rec { + pname = "pure-python-adb"; + version = "0.3.0.dev0"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0kdr7w2fhgjpcf1k3l6an9im583iqkr6v8hb4q1zw30nh3bqkk0f"; + }; + + propagatedBuildInputs = [ aiofiles ]; + # Disable tests as they require docker, docker-compose and a dedicated + # android emulator + doCheck = false; + pythonImportsCheck = [ "ppadb.client" "ppadb.client_async" ]; + + meta = with lib; { + description = "Pure python implementation of the adb client"; + homepage = "https://github.com/Swind/pure-python-adb"; + license = licenses.mit; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-sonic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-sonic/default.nix new file mode 100644 index 0000000000..ebaf5f7f64 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-sonic/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 }: + +buildPythonPackage rec { + pname = "py-sonic"; + version = "0.7.7"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "4cea42a2b0dc2ed0fd8568d6bf0509cfa2675a8b1c347ce9364a00881ebc0272"; + }; + + # package has no tests + doCheck = false; + pythonImportsCheck = [ "libsonic" ]; + + meta = with lib; { + homepage = "https://github.com/crustymonkey/py-sonic"; + description = "A python wrapper library for the Subsonic REST API"; + license = licenses.gpl3; + maintainers = with maintainers; [ wenngle ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix index 31e56e6c0a..e7c75f9823 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "scrypt"; - version = "0.8.15"; + version = "0.8.17"; src = fetchPypi { inherit pname version; - sha256 = "0643fwj8vl96bsl30jx091zicmwyi0gglza66xqhqizqyqjq0ag6"; + sha256 = "25b5075f2238be93af1cd574540a5ea01b8547f9b678aa72d22fce22577475ec"; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyads/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyads/default.nix new file mode 100644 index 0000000000..37d3b31a36 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyads/default.nix @@ -0,0 +1,30 @@ +{ adslib, buildPythonPackage, fetchFromGitHub, lib, pytestCheckHook, pytest +, pytestcov, pythonOlder }: + +buildPythonPackage rec { + pname = "pyads"; + version = "3.2.2"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "stlehmann"; + repo = pname; + rev = version; + sha256 = "1jd727pw0z73y4xhrykqkfcz1acrpy3rks58lr1y4yilfv11p6jb"; + }; + + buildInputs = [ adslib ]; + patchPhase = '' + substituteInPlace pyads/pyads_ex.py \ + --replace "ctypes.CDLL(adslib)" "ctypes.CDLL(\"${adslib}/lib/adslib.so\")" + ''; + checkInputs = [ pytestCheckHook pytest pytestcov ]; + + meta = with lib; { + description = "Python wrapper for TwinCAT ADS library"; + homepage = "https://github.com/MrLeeh/pyads"; + license = licenses.mit; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix index 6a141484bb..d52a1f67d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix @@ -1,9 +1,11 @@ -{ buildPythonPackage, stdenv, fetchPypi, six, pytest }: +{ buildPythonPackage, isPy3k, stdenv, fetchPypi, six, pytest }: buildPythonPackage rec { pname = "pybase64"; version = "1.0.1"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "6ced40531bffc81bafc790d5c0d2f752e281b3b00fd6ff4e79385c625e5dbab1"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix index 92c34c7bd4..7f930c0410 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix @@ -2,6 +2,7 @@ , lib , fetchPypi , isPy27 +, click , num2words , numpy , scipy @@ -15,15 +16,16 @@ }: buildPythonPackage rec { - version = "0.12.0"; + version = "0.12.1"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "0flvrb61hfyjjgdz07dlm8m9pqwb8qrx027zfrwa9d5nw1az7g28"; + sha256 = "08smd4frl8hf0n6bi20ayd5wcf51g3g488bpakjciz7ghdvky1h6"; }; propagatedBuildInputs = [ + click num2words numpy scipy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix index e6aef54557..e9f70df589 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "7.2.1"; + version = "7.5.0"; src = fetchPypi { inherit pname version; - sha256 = "9aad074d0361791af8ccb8fb7ea0f1646db3d89600fed85c5562b64c8b1aa899"; + sha256 = "2f346a88ddc27a19cc68bc2d3e8929d89276298cb1c11871b82a87fbdafb95a8"; }; disabled = !isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix index 9e557668de..08fba705aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix @@ -1,31 +1,34 @@ { stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , python }: buildPythonPackage rec { pname = "pyelftools"; - version = "0.26"; + version = "unstable-2020-09-23"; - src = fetchPypi { - inherit pname version; - sha256 = "86ac6cee19f6c945e8dedf78c6ee74f1112bd14da5a658d8c9d4103aed5756a2"; + src = fetchFromGitHub { + owner = "eliben"; + repo = pname; + rev = "ab84e68837113b2d700ad379d94c1dd4a73125ea"; + sha256 = "sha256-O7l1kj0k8bOSOtZJVzS674oVnM+X3oP00Ybs0qjb64Q="; }; + doCheck = stdenv.is64bit; + checkPhase = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" test/external_tools/readelf ${python.interpreter} test/all_tests.py ''; - # Tests cannot pass against system-wide readelf - # https://github.com/eliben/pyelftools/issues/65 - doCheck = false; + pythonImportsCheck = [ "elftools" ]; meta = with stdenv.lib; { description = "A library for analyzing ELF files and DWARF debugging information"; homepage = "https://github.com/eliben/pyelftools"; license = licenses.publicDomain; - maintainers = [ maintainers.igsha ]; + maintainers = with maintainers; [ igsha pamplemousse ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix index 4e0c294de0..c2c5ca826b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.2.1"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "11q3a0p4mvzdskla0c6ffcrddldfbh7dc4p5l6xrriwri88j356y"; + sha256 = "0be93f6a8d7cbf0cc79ae2f0afb1993fc055fc0018c27e2bd01ba143e51d4452"; }; preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix index d563fa2766..edd5d9bc31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix @@ -1,30 +1,29 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub -, mock, pytest, pytest-asyncio +{ lib +, buildPythonPackage +, isPy3k +, fetchFromGitHub +, mock +, pytest-asyncio +, pytestCheckHook }: buildPythonPackage rec { pname = "pygls"; - version = "0.9.0"; + version = "0.9.1"; disabled = !isPy3k; src = fetchFromGitHub { owner = "openlawlibrary"; repo = pname; rev = "v${version}"; - sha256 = "1wfp4hjin1mb6nkzhpfh5v8q8rwvn9zh0mwwj4dlxkqx5lp272hl"; + sha256 = "1v7x5598d6jg8ya0spqjma56y062rznwimsrp8nq6fkskqgfm0ds"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "pytest==4.5.0" "pytest" - ''; + checkInputs = [ mock pytest-asyncio pytestCheckHook ]; - checkInputs = [ mock pytest pytest-asyncio ]; - checkPhase = "pytest"; - - meta = with stdenv.lib; { - homepage = "https://github.com/openlawlibrary/pygls"; + meta = with lib; { description = "Pythonic generic implementation of the Language Server Protocol"; + homepage = "https://github.com/openlawlibrary/pygls"; license = licenses.asl20; maintainers = with maintainers; [ metadark ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix index 3a451f4af1..a8d80f6e61 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix @@ -1,10 +1,12 @@ -{ stdenv, buildPythonPackage, fetchPypi, substituteAll, graphviz +{ stdenv, buildPythonPackage, isPy3k, fetchPypi, substituteAll, graphviz , pkgconfig, doctest-ignore-unicode, mock, nose }: buildPythonPackage rec { pname = "pygraphviz"; version = "1.6"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "411ae84a5bc313e3e1523a1cace59159f512336318a510573b47f824edef8860"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix index 6babcb15ba..102619b2b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix @@ -1,18 +1,18 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, astroid, +{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, astroid, installShellFiles, isort, mccabe, pytestCheckHook, pytest-benchmark, pytestrunner, toml }: buildPythonPackage rec { pname = "pylint"; - version = "2.5.3"; + version = "2.6.0"; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "7dd78437f2d8d019717dbf287772d0b2dbdfd13fc016aa7faa08d67bccc46adc"; + sha256 = "bb4a908c9dadbc3aac18860550e870f58e1a02c9f2c204fdf5693d73be061210"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytestrunner installShellFiles ]; checkInputs = [ pytestCheckHook pytest-benchmark ]; @@ -43,12 +43,12 @@ buildPythonPackage rec { postInstall = '' mkdir -p $out/share/emacs/site-lisp cp "elisp/"*.el $out/share/emacs/site-lisp/ + installManPage man/*.1 ''; meta = with lib; { - homepage = "https://github.com/PyCQA/pylint"; + homepage = "https://pylint.pycqa.org/"; description = "A bug and style checker for Python"; - platforms = platforms.all; license = licenses.gpl1Plus; maintainers = with maintainers; [ nand0p ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymysql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymysql/default.nix index c0419d025b..c243bf8f95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymysql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymysql/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "PyMySQL"; - version = "0.10.0"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "0dwqw556qmjl5359wsylnh5kmw3ns8qkw1pn1gwf0l70hjy70h71"; + sha256 = "263040d2779a3b84930f7ac9da5132be0fefcd6f453a885756656103f8ee1fdd"; }; propagatedBuildInputs = [ cryptography ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynvim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynvim/default.nix index 93cba65ae5..53bb06b13d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynvim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynvim/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "pynvim"; - version = "0.4.1"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "0n2cx22lrmbq7xk7356lyn6k77ryqvkxplw9k0fglk35ckb1isam"; + sha256 = "6bc6204d465de5888a0c5e3e783fe01988b032e22ae87875912280bef0e40f8f"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix index 04d66fb87a..b7dfd6d42b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.13"; + version = "0.5.14"; src = fetchPypi { inherit pname version; - sha256 = "518365f3313e73b0f024b9fa7a580b29bfa2fe2c5230be0bc69c068bbf6637e9"; + sha256 = "774c5ecf05fe40f0f601a7ab33c19ca0b24f00bf4a094e58deaa5333b7ca49b5"; }; # requires root priviledges diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix index 23aa092641..ec67b7649e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix @@ -1,7 +1,12 @@ { lib , buildPythonPackage , fetchPypi +, isPy3k , EasyProcess +, entrypoint2 +, jeepney +, mss +, pillow }: buildPythonPackage rec { @@ -15,11 +20,18 @@ buildPythonPackage rec { propagatedBuildInputs = [ EasyProcess + entrypoint2 + pillow + ] ++ lib.optionals (isPy3k) [ + jeepney + mss ]; # recursive dependency on pyvirtualdisplay doCheck = false; + pythonImportsCheck = [ "pyscreenshot" ]; + meta = with lib; { description = "python screenshot"; homepage = "https://github.com/ponty/pyscreenshot"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmb/default.nix index 605c13c0c9..33bff0e394 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysmb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmb/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pysmb"; - version = "1.2.1"; + version = "1.2.2"; src = fetchPypi { inherit pname version; format = "setuptools"; extension = "zip"; - sha256 = "1gkh28m74rf0ic51cxahiyw4sfz3sp3dz0iggsksi917ryyinwmb"; + sha256 = "59ccd07537fb2a630b0d8cccd78e80180bcca72150d7322c318e1bdae927e125"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyspice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyspice/default.nix index f2cce09c8b..bed00ddabe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyspice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyspice/default.nix @@ -1,5 +1,6 @@ { stdenv , buildPythonPackage +, pythonOlder , fetchPypi , libngspice , numpy @@ -15,6 +16,7 @@ buildPythonPackage rec { pname = "PySpice"; version = "1.4.3"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix index efb20ac297..ac3bf6dbf5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytesseract"; - version = "0.3.5"; + version = "0.3.6"; src = fetchPypi { inherit pname version; - sha256 = "1xb5ydwgcfcxzs1k7g6frmhxf1mmivi9ay48qdmf5w4ascirm22l"; + sha256 = "b79641b7915ff039da22d5591cb2f5ca6cb0ed7c65194c9c750360dc6a1cc87f"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix index 5a3219f430..e2a469c1ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-black"; - version = "0.3.10"; + version = "0.3.11"; src = fetchPypi { inherit pname version; - sha256 = "0dvlfic7nvfj97rg5fwj7ahw83n9yj3jjbp5m60n47mlx7z0qg2z"; + sha256 = "1mjxqvzadpyfvypv5isfda9c6lz8xbqci9b4hn58b2lbj3kv0pjr"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix index c15320867c..384681eee1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pytest-rerunfailures"; - version = "9.0"; + version = "9.1.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1r5qnkkhkfvx1jbi1wfyxpyggwyr32w6h5z3i93a03bc92kc4nl9"; + sha256 = "1cb11a17fc121b3918414eb5eaf314ee325f2e693ac7cb3f6abf7560790827f2"; }; checkInputs = [ mock pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-twisted/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-twisted/default.nix index 6bdf1089d5..19e1091c8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-twisted/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-twisted/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pytest-twisted"; - version = "1.12"; + version = "1.13.2"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "bb9af117c5c6063d9ef20ffdf2fa297caaf57de5a687e4d3607db7b0a6f74fea"; + sha256 = "cee2320becc5625050ab221b8f38533e636651a24644612f4726891fdf1f1847"; }; propagatedBuildInputs = [ greenlet pytest decorator ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/2.nix index a3d80f9402..ea4741cab6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/2.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/2.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "pytest-xdist"; - version = "2.0.0"; + version = "2.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3217b1f40290570bf27b1f82714fc4ed44c3260ba9b2f6cde0372378fc707ad3"; + sha256 = "82d938f1a24186520e2d9d3a64ef7d9ac7ecdf1a0659e095d18e596b8cbd0672"; }; nativeBuildInputs = [ setuptools_scm pytest_6 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix index 8548dba8d8..1dd11133a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pytest-xprocess"; - version = "0.13.1"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "779aeca517cd9c996d1544bdc510cb3cff40c48136d94bbce6148e27f30a93ff"; + sha256 = "06g1j5079ddl2sd3pxh2jg6g83b2z3l5hzbadiry2xg673dcncmb"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-csxcad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-csxcad/default.nix new file mode 100644 index 0000000000..885208e0e6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-csxcad/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, openems +, csxcad +, numpy +, matplotlib +}: + +buildPythonPackage rec { + pname = "python-csxcad"; + version = "unstable-2020-02-18"; + + src = fetchFromGitHub { + owner = "thliebig"; + repo = "CSXCAD"; + rev = "ef6e40931dbd80e0959f37c8e9614c437bf7e518"; + sha256 = "072s765jyzpdq8qqysdy0dld17m6sr9zfcs0ip2zk8c4imxaysnb"; + }; + + sourceRoot = "source/python"; + + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + openems + csxcad + numpy + matplotlib + ]; + + setupPyBuildFlags = "-I${openems}/include -L${openems}/lib -R${openems}/lib"; + + meta = with lib; { + description = "Python interface to CSXCAD"; + homepage = http://openems.de/index.php/Main_Page.html; + license = licenses.gpl3; + maintainers = with maintainers; [ matthuszagh ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-ctags3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-ctags3/default.nix index bc7b848499..6ef8a75709 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-ctags3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-ctags3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-ctags3"; - version = "1.3.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "69029185ec70db4180be2b58e9a7245700c7ddcdc9049bf0641448f439112176"; + sha256 = "a2cb0b35f0d67bab47045d803dce8291a1500af11832b154f69b3785f2130daa"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-efl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-efl/default.nix index 419b490648..4e3cffa9d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-efl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-efl/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "python-efl"; - version = "1.24.0"; + version = "1.25.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz"; - sha256 = "1vk1cdd959gia4a9qzyq56a9zw3lqf9ck66k8c9g3c631mp5cfpy"; + sha256 = "0bk161xwlz4dlv56r68xwkm8snzfifaxd1j7w2wcyyk4fgvnvq4r"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix index 470095eae8..6108ea74a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "e240b5c371d9e98c46c980d878c3f03cd83f3da6cda01d533db27fa3e0dd474f"; + sha256 = "68b42aafd4b620ab2534ff78a52584c7f799e4e55d5ac297eab4263066e6f74b"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-nest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-nest/default.nix new file mode 100644 index 0000000000..c894654e41 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-nest/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage, fetchPypi, lib, python, python-dateutil, requests +, six, sseclient-py }: + +buildPythonPackage rec { + pname = "python-nest"; + version = "4.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "12iyypbl92ybh8w1bf4z0c2g0sb9id2c07c89vzvnlxgjylw3wbi"; + }; + + propagatedBuildInputs = [ python-dateutil requests six sseclient-py ]; + # has no tests + doCheck = false; + pythonImportsCheck = [ "nest" ]; + + meta = with lib; { + description = + "Python API and command line tool for talking to the Nest™ Thermostat"; + homepage = "https://github.com/jkoelker/python-nest"; + license = licenses.cc-by-nc-sa-40; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-vlc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-vlc/default.nix index a66b4cc522..6f83f587f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-vlc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-vlc/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , setuptools -, vlc +, libvlc , substituteAll }: @@ -22,7 +22,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./vlc-paths.patch; - libvlcPath="${vlc}/lib/libvlc.so.5"; + libvlcPath="${libvlc}/lib/libvlc.so.5"; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix new file mode 100644 index 0000000000..0f5f9a4b43 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage, fetchPypi, pytestrunner, pytestCheckHook, glib, vips, cffi +, pkg-config, pkgconfig, lib }: + +buildPythonPackage rec { + pname = "pyvips"; + version = "2.1.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pg0dxhxgi2m7bb5bi5wpx9hgnbi8ws1bz6w2dldbhi52pizghl4"; + }; + + nativeBuildInputs = [ pytestrunner pkgconfig pkg-config ]; + + buildInputs = [ glib vips ]; + + propagatedBuildInputs = [ cffi ]; + + # tests are not included in pypi tarball + doCheck = false; + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pyvips" ]; + + meta = with lib; { + description = "A python wrapper for libvips"; + homepage = "https://github.com/libvips/pyvips"; + license = licenses.mit; + maintainers = with maintainers; [ ccellado ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix index 7175986bd7..6ec8ce3677 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtAwesome"; - version = "0.7.2"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "ca9719c82d41707f62c340811b23bcab95336e73edd88b7eab7fd951d2e27fab"; + sha256 = "d612a313e531966d17f5a8fb7604faba961cf7ce3c77a9168c6f60e60140b767"; }; propagatedBuildInputs = [ qtpy six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rarfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rarfile/default.nix index 024d043c47..6502d9f4ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rarfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rarfile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, nose, libarchive, glibcLocales +{ stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, nose, libarchive, glibcLocales, isPy27 # unrar is non-free software , useUnrar ? false, unrar }: @@ -6,17 +6,19 @@ assert useUnrar -> unrar != null; assert !useUnrar -> libarchive != null; -buildPythonPackage { +buildPythonPackage rec { pname = "rarfile"; - version = "3.0"; + version = "4.0"; + disabled = isPy27; src = fetchFromGitHub { owner = "markokr"; repo = "rarfile"; - rev = "rarfile_3_0"; - sha256 = "07yliz6p1bxzhipnrgz133gl8laic35gl4rqfay7f1vc384ch7sn"; + rev = "v${version}"; + sha256 = "0gpriqkvcb6bsccvq8b099xjv5fkjs0d7g4636d5jphy417jxk5m"; }; - buildInputs = [ pytest nose glibcLocales ]; + + checkInputs = [ pytestCheckHook nose glibcLocales ]; prePatch = '' substituteInPlace rarfile.py \ @@ -31,9 +33,7 @@ buildPythonPackage { # the tests only work with the standard unrar package doCheck = useUnrar; LC_ALL = "en_US.UTF-8"; - checkPhase = '' - py.test test -k "not test_printdir" - ''; + pythonImportsCheck = [ "rarfile" ]; meta = with stdenv.lib; { description = "RAR archive reader for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-hawk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-hawk/default.nix new file mode 100644 index 0000000000..9641ee9d12 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-hawk/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, python, mohawk, requests }: + +buildPythonPackage rec { + pname = "requests-hawk"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qcga289yr6qlkmc6fjk0ia6l5cg0galklpdzpslf1y8ky9zb7rl"; + }; + + propagatedBuildInputs = [ mohawk requests ]; + + meta = with lib; { + description = "Hawk authentication strategy for the requests python library."; + homepage = "https://github.com/sam-washington/requests-hawk"; + license = licenses.asl20; + maintainers = with maintainers; [ austinbutler ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ruffus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ruffus/default.nix index b3f09ee88f..da905f7ab4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ruffus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ruffus/default.nix @@ -9,39 +9,34 @@ buildPythonPackage rec { pname = "ruffus"; - version = "2.8.1"; + version = "2.8.4"; src = fetchFromGitHub { owner = "cgat-developers"; repo = pname; rev = "v${version}"; - sha256 = "1gyabqafq4s2sy0prh3k1m8859shzjmfxr7fimx10liflvki96a9"; + sha256 = "0fnzpchwwqsy5h18fs0n90s51w25n0dx0l74j0ka6lvhjl5sxn4c"; }; propagatedBuildInputs = [ gevent ]; - postPatch = '' - sed -i -e 's|/bin/bash|${stdenv.shell}|' ruffus/test/Makefile - sed -i -e 's|\tpytest|\t${pytest}/bin/pytest|' ruffus/test/Makefile - sed -i -e 's|\tpython|\t${python.interpreter}|' ruffus/test/Makefile - sed -i -e 's|/usr/bin/env bash|${stdenv.shell}|' ruffus/test/run_all_unit_tests.cmd - sed -i -e 's|python3|${python.interpreter}|' ruffus/test/run_all_unit_tests3.cmd - sed -i -e 's|python %s|${python.interpreter} %s|' ruffus/test/test_drmaa_wrapper_run_job_locally.py - ''; - - makefile = "ruffus/test/Makefile"; - checkInputs = [ - gevent hostname pytest ]; + # tests very flaky & hang often on darwin + doCheck = !stdenv.isDarwin; + # test files do indeed need to be executed separately checkPhase = '' - export HOME=$TMPDIR - cd ruffus/test - make all PYTEST_OPTIONS="-q --disable-warnings" + pushd ruffus/test + rm test_with_logger.py # spawns 500 processes + for f in test_*.py ; do + HOME=$TMPDIR pytest -v --disable-warnings $f + done + popd ''; + pythonImportsCheck = [ "ruffus" ]; meta = with stdenv.lib; { description = "Light-weight Python Computational Pipeline Management"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix index d3bf05b096..a9199614f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchPypi, buildPythonPackage, pytest, fake-useragent, scrapy }: +{ stdenv, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytestcov, pytest-mock, fake-useragent, faker, scrapy }: buildPythonPackage rec { pname = "scrapy-fake-useragent"; version = "1.4.4"; - src = fetchPypi { - inherit pname version; - sha256 = "3b17e982e646918dc25080da0672812d07bfb7a92a58377c014c74e0182c665e"; + # PyPi tarball is corrupted + src = fetchFromGitHub { + owner = "alecxe"; + repo = pname; + rev = "59c20d38c58c76618164760d546aa5b989a79b8b"; # no tags + sha256 = "0yb7d51jws665rdfqkmi077w0pjxmb2ni7ysphj7lx7b18whq54j"; }; - propagatedBuildInputs = [ fake-useragent ]; + propagatedBuildInputs = [ fake-useragent faker ]; - checkInputs = [ pytest scrapy ]; + checkInputs = [ pytestCheckHook scrapy pytestcov pytest-mock ]; meta = with stdenv.lib; { description = "Random User-Agent middleware based on fake-useragent"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seaborn/0.9.1.nix b/third_party/nixpkgs/pkgs/development/python-modules/seaborn/0.9.1.nix index 552262bb51..79361a4916 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seaborn/0.9.1.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seaborn/0.9.1.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Statisitical data visualization"; - homepage = "http://stanford.edu/~mwaskom/software/seaborn/"; + homepage = "https://seaborn.pydata.org/"; license = with lib.licenses; [ bsd3 ]; maintainers = [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix index c68224c401..9438320c1a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "seaborn"; - version = "0.10.1"; + version = "0.11.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "2d1a0c9d6bd1bc3cadb0364b8f06540f51322a670cf8438d0fde1c1c7317adc0"; + sha256 = "390f8437b14f5ce845062f2865ad51656464c306d09bb97d7764c6cba1dd607c"; }; checkInputs = [ nose ]; @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = { description = "Statisitical data visualization"; - homepage = "http://stanford.edu/~mwaskom/software/seaborn/"; + homepage = "https://seaborn.pydata.org/"; license = with lib.licenses; [ bsd3 ]; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix index de23241e37..3ef3393363 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sh"; - version = "1.13.1"; + version = "1.14.0"; src = fetchPypi { inherit pname version; - sha256 = "18w6wawmpzfh52s0jimwn59a7rfa7blrmg7bhwnq8siwbqhd58wp"; + sha256 = "05c7e520cdf70f70a7228a03b589da9f96c6e0d06fc487ab21fc62b26a592e59"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shodan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shodan/default.nix index be1a642438..ecc18c5c52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shodan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shodan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.23.0"; + version = "1.23.1"; src = fetchPypi { inherit pname version; - sha256 = "16rkbhdj7al7p8s1pfsjx9agxpvisbvyvcd04rm1kigpz87p9c1i"; + sha256 = "d2d37d47dd084747df672e6d981f6d72d5d03f4ee12f0ce2170e618147578349"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skein/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skein/default.nix index 630c4370a8..32320c5042 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skein/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skein/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { description = "A tool and library for easily deploying applications on Apache YARN"; license = licenses.bsd3; maintainers = with maintainers; [ alexbiehl ]; + broken = true; # maven repo src isn't stable }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skidl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skidl/default.nix new file mode 100644 index 0000000000..3d2007732e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/skidl/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, future +, kinparse +, enum34 +, pyspice +, graphviz +, pillow +, cffi +}: + +buildPythonPackage rec { + pname = "skidl"; + version = "unstable-2020-09-15"; + + src = fetchFromGitHub { + owner = "xesscorp"; + repo = "skidl"; + rev = "551bdb92a50c0894b0802c0a89b4cb62a5b4038f"; + sha256 = "1g65cyxpkqshgsggav2q3f76rbj5pzh7sacyhmhzvfz4zfarkcxk"; + }; + + propagatedBuildInputs = [ + requests + future + kinparse + enum34 + pyspice + graphviz + pillow + cffi + ]; + + # Checks require availability of the kicad symbol libraries. + doCheck = false; + pythonImportsCheck = [ "skidl" ]; + + meta = with lib; { + description = "SKiDL is a module that extends Python with the ability to design electronic circuits"; + homepage = "https://xesscorp.github.io/skidl/docs/_site/"; + license = licenses.mit; + maintainers = with maintainers; [ matthuszagh ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix index ae280eb96c..bdedfc0ed4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.2.10"; + version = "2.3.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0beba8eb9c1dec2782d52491d058256e1f5d9e010114a80ff3b8e3905be655fd"; + sha256 = "0as7m736wgx684wssnvhvixjkqidnhxn9i98rcdgagr67s3akfdy"; }; propagatedBuildInputs = [ @@ -57,12 +57,15 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "'cffi>=1.9,<1.14'," "'cffi~=1.9'," + --replace "'cryptography>=2.5.0,<3.0.0'," "'cryptography'," \ + --replace "'idna<2.10'," "'idna'," \ + --replace "'requests<2.24.0'," "'requests'," ''; # tests are not working # XXX: fix the tests doCheck = false; + pythonImportsCheck = [ "snowflake" "snowflake.connector" ]; meta = with lib; { description = "Snowflake Connector for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 4a44c32070..0eb0b6bebe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { snowflake-connector-python ]; + pythonImportsCheck = [ "snowflake.sqlalchemy" ]; + meta = with lib; { description = "Snowflake SQLAlchemy Dialect"; homepage = "https://www.snowflake.net/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sparse/default.nix index d72830f3fb..93ffa89c76 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sparse/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "sparse"; - version = "0.10.0"; + version = "0.11.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ffbca00a53f938e4f04230f582b210440efb54d74d60af1d1ced3864f61677ac"; + sha256 = "bc5c35dbc81242237feb7a8e1f7d9c5e9dd9bb0910f6ec55f50dcc379082864f"; }; checkInputs = [ pytest dask ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix index 47b12a3565..1e003be1f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "spotipy"; - version = "2.13.0"; + version = "2.16.0"; src = fetchPypi { inherit pname version; - sha256 = "d1a85b8831ed60d2290ab9bbba289c548fb9680889757252c02dab2f2327d865"; + sha256 = "315eadd1248053ed336b4d3adbf2e3c32895fdbb0cfcd170542c848c8fd45649"; }; propagatedBuildInputs = [ requests six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix index f2decd2c0d..ddcaa061c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.4.8"; + version = "1.4.9"; src = fetchPypi { inherit pname version; - sha256 = "af789cc2d9b7cab2f71087967867b3587db9636b38bef1ffb39165a0675a6d87"; + sha256 = "8f1f84799184a2d3b0433ece09fa0e2ff90a8286c562957667fe0f40dad28287"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix index d1de78788d..0565973da4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "srsly"; - version = "2.2.0"; + version = "2.3.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1h246zvh2wsqyjlw3a3bwmd1zwrkgpflk4z4i9k3sqp2j1jika54"; + sha256 = "f994a266f6e547c8ffe803cb90baed7ca566831f924e0491402564ba0d185e66"; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sseclient-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sseclient-py/default.nix new file mode 100644 index 0000000000..05c3fc8074 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sseclient-py/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage, fetchFromGitHub, lib, python }: + +buildPythonPackage rec { + pname = "sseclient-py"; + version = "1.7"; + + src = fetchFromGitHub { + owner = "mpetazzoni"; + repo = "sseclient"; + rev = "sseclient-py-${version}"; + sha256 = "0iar4w8gryhjzqwy5k95q9gsv6xpmnwxkpz33418nw8hxlp86wfl"; + }; + + # based on tox.ini + checkPhase = '' + ${python.interpreter} tests/unittests.py + ''; + + meta = with lib; { + description = "Pure-Python Server Side Events (SSE) client"; + homepage = "https://github.com/mpetazzoni/sseclient"; + license = licenses.asl20; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/starfish/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/starfish/default.nix deleted file mode 100644 index 38f2411117..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/starfish/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, click -, dataclasses -, jsonschema -, matplotlib -, numpy -, pandas -, regional -, semantic-version -, scikitimage -, scikitlearn -, scipy -, showit -, slicedimage -, sympy -, tqdm -, trackpy -, validators -, xarray -, ipywidgets -, pytest -, pythonOlder -}: - -buildPythonPackage rec { - pname = "starfish"; - version = "0.2.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "d635ef7b412b5781d6f98cd080b45098de6f3c7f7303e929b07c88b49d98ff12"; - }; - - propagatedBuildInputs = [ - click - jsonschema - matplotlib - numpy - pandas - regional - semantic-version - scikitimage - scikitlearn - scipy - showit - slicedimage - sympy - tqdm - trackpy - validators - xarray - ipywidgets - ] ++ lib.optionals (pythonOlder "3.7") [ dataclasses ]; - - checkInputs = [ - pytest - ]; - - postConfigure = '' - substituteInPlace REQUIREMENTS.txt \ - --replace "slicedimage==3.1.1" "slicedimage" - ''; - - checkPhase = '' - # a few tests < 5% require - rm -rf starfish/test/full_pipelines/* - pytest starfish \ - --ignore starfish/core/config/test/test_config.py \ - --ignore starfish/core/experiment/builder/test/test_build.py \ - --ignore starfish/core/experiment/test/test_experiment.py \ - --ignore starfish/core/image/_filter/test/test_reduce.py \ - --ignore starfish/core/image/_registration/_apply_transform/test/test_warp.py \ - --ignore starfish/core/image/_registration/_learn_transform/test/test_translation.py \ - --ignore starfish/core/image/_registration/test/test_transforms_list.py \ - --ignore starfish/core/imagestack/test/test_max_proj.py \ - --ignore starfish/core/recipe/test/test_recipe.py \ - --ignore starfish/core/recipe/test/test_runnable.py \ - --ignore starfish/core/test/test_profiler.py - ''; - - meta = with lib; { - description = "Pipelines and pipeline components for the analysis of image-based transcriptomics data"; - homepage = "https://spacetx-starfish.readthedocs.io/en/latest/"; - license = licenses.mit; - maintainers = [ maintainers.costrouc ]; - broken = true; # incompatible with latest python-dateutil, scikit-image - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix index ba6d0b64f5..3ced08d785 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "statsmodels"; - version = "0.11.1"; + version = "0.12.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "5bde3fa0a35a91b45dba7cbc28270b5b649ff1d721c89290883f6e831672d5f0"; + sha256 = "5c7d6707ad3112b67f564abaf1845d3c02ecc7174c2d990d539f45c37e98ad35"; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix index 2c09017d05..06d614feaa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "stevedore"; - version = "3.2.0"; + version = "3.2.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1r8m8g7f13wdmfw5m7k0vj7bcx3psfg5yg2i8jlb08nrpsjily9q"; + sha256 = "f845868b3a3a77a2489d226568abe7328b5c2d4f6a011cc759dfa99144a521f0"; }; propagatedBuildInputs = [ pbr setuptools six ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix index c2f170fc69..5070d7d194 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.50.0"; + version = "2.54.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0c3c02c9b65644502a701d4ff939964799bd1a581fb3f8bf75a3f8675527ef48"; + sha256 = "a622bce0d6d0ac99a53b6e6a6475c39250207d644f28ad0ed276af7b96d12617"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/2/default.nix index 16c3eeec7a..750ef6e8a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/2/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "tensorflow-estimator"; - version = "2.2.0"; + version = "2.3.0"; format = "wheel"; src = fetchPypi { pname = "tensorflow_estimator"; inherit version format; - sha256 = "1hkx4k6927xn4qpwiba6wa56n0qqm7s23bymm377j9bz2bfsr7fh"; + sha256 = "11n4sl9wfr00fv1i837b7a36ink86ggmlsgj7i06kcfc011h6pmp"; }; propagatedBuildInputs = [ mock numpy absl-py ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/1/default.nix index 1aad8677ca..5df3ad32af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/1/default.nix @@ -72,7 +72,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "1.15.2"; + version = "1.15.4"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -103,7 +103,7 @@ let owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - sha256 = "1q0848drjvnaaa38dgns8knmpmkj5plzsc98j20m5ybv68s55w78"; + sha256 = "0lg8ahyr2k7dmp0yfypk8ivl9a0xcg3j0f0dakmn5ljk8nsji0bj"; }; patches = [ @@ -255,6 +255,9 @@ let # include security vulnerabilities. So we make it optional. # https://github.com/tensorflow/tensorflow/issues/20280#issuecomment-400230560 sed -i '/tensorboard >=/d' tensorflow/tools/pip_package/setup.py + + substituteInPlace tensorflow/tools/pip_package/setup.py \ + --replace "numpy >= 1.16.0, < 1.19.0" "numpy >= 1.16.0" ''; preConfigure = let @@ -307,9 +310,9 @@ let # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "09j57w6kc0vkfcdwr0qggy3qgrgq82kfa2jrwvvcnij4bl3wj40j" + "1bi6aydidgi943hiqj0d279jbz2g173hvafdqla1ifw2qdsm73pb" else - "14g8z49qz7d8n1c2mcsfhr7yqpcy7mhmpm6hgmqvpgb8vm7yvwrc"; + "0l5510fr8n22c4hx9llr0vqqhx9wlgkyxl55fxbixhssd0ai05r4"; }; buildAttrs = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix index eedd6e6d0d..bd049a9a2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, bazel_0_29, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin +{ stdenv, pkgs, bazel_3, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin , addOpenGLRunpath # Python deps , buildPythonPackage, isPy3k, isPy27, pythonOlder, pythonAtLeast, python @@ -6,7 +6,7 @@ , numpy, tensorflow-tensorboard_2, backports_weakref, mock, enum34, absl-py , future, setuptools, wheel, keras-preprocessing, keras-applications, google-pasta , functools32 -, opt-einsum +, opt-einsum, astunparse, h5py , termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_2 # Common deps , git, swig, which, binutils, glibcLocales, cython @@ -17,7 +17,7 @@ # that in nix as well. It would make some things easier and less confusing, but # it would also make the default tensorflow package unfree. See # https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 -, cudaSupport ? false, nvidia_x11 ? null, cudatoolkit ? null, cudnn ? null, nccl ? null +, cudaSupport ? false, cudatoolkit ? null, cudnn ? null, nccl ? null , mklSupport ? false, mkl ? null # XLA without CUDA is broken , xlaSupport ? cudaSupport @@ -30,8 +30,7 @@ , Foundation, Security }: -assert cudaSupport -> nvidia_x11 != null - && cudatoolkit != null +assert cudaSupport -> cudatoolkit != null && cudnn != null; # unsupported combination @@ -47,6 +46,7 @@ let paths = [ cudatoolkit.lib cudatoolkit.out + ] ++ lib.optionals (lib.versionOlder cudatoolkit.version "11") [ # for some reason some of the required libs are in the targets/x86_64-linux # directory; not sure why but this works around it "${cudatoolkit}/targets/${stdenv.system}" @@ -72,7 +72,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.1.0"; + version = "2.3.0"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -97,40 +97,32 @@ let bazel-build = buildBazelPackage { name = "${pname}-${version}"; - bazel = bazel_0_29; + bazel = bazel_3; src = fetchFromGitHub { owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - sha256 = "1g79xi8yl4sjia8ysk9b7xfzrz83zy28v5dlb2wzmcf0k5pmz60p"; + sha256 = "1dd5fgyiazyfy7y2iv4v42qnap51fr6dzwb26inrsj7aaas06j71"; }; patches = [ - # Work around https://github.com/tensorflow/tensorflow/issues/24752 - ../no-saved-proto.patch # Fixes for NixOS jsoncpp ../system-jsoncpp.patch - (fetchpatch { - name = "backport-pr-18950.patch"; - url = "https://github.com/tensorflow/tensorflow/commit/73640aaec2ab0234d9fff138e3c9833695570c0a.patch"; - sha256 = "1n9ypbrx36fc1kc9cz5b3p9qhg15xxhq4nz6ap3hwqba535nakfz"; - }) - - (fetchpatch { - # Don't try to fetch things that don't exist - name = "prune-missing-deps.patch"; - url = "https://github.com/tensorflow/tensorflow/commit/b39b1ed24b4814db27d2f748dc85c10730ae851d.patch"; - sha256 = "1skysz53nancvw1slij6s7flar2kv3gngnsq60ff4lap88kx5s6c"; - excludes = [ "tensorflow/cc/saved_model/BUILD" ]; - }) - ./lift-gast-restriction.patch - # cuda 10.2 does not have "-bin2c-path" option anymore - # https://github.com/tensorflow/tensorflow/issues/34429 - ../cuda-10.2-no-bin2c-path.patch + # see https://github.com/tensorflow/tensorflow/issues/40688 + (fetchpatch { + url = "https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch"; + sha256 = "1xp1icacig0xm0nmb05sbrf4nw4xbln9fhc308birrv8286zx7wv"; + }) + + # see https://github.com/tensorflow/tensorflow/issues/40884 + (fetchpatch { + url = "https://github.com/tensorflow/tensorflow/pull/41867/commits/65341f73d110bf173325768947343e1bb8f699fc.patch"; + sha256 = "18ykkycaag1pcarz53bz6ydxjlah92j4178qn58gcayx1fy7hvh3"; + }) ]; # On update, it can be useful to steal the changes from gentoo @@ -147,7 +139,7 @@ let git # libs taken from system through the TF_SYS_LIBS mechanism - # grpc + grpc sqlite openssl jsoncpp @@ -165,7 +157,6 @@ let ] ++ lib.optionals cudaSupport [ cudatoolkit cudnn - nvidia_x11 ] ++ lib.optionals mklSupport [ mkl ] ++ lib.optionals stdenv.isDarwin [ @@ -182,24 +173,26 @@ let TF_SYSTEM_LIBS = lib.concatStringsSep "," [ "absl_py" "astor_archive" + "astunparse_archive" "boringssl" # Not packaged in nixpkgs # "com_github_googleapis_googleapis" # "com_github_googlecloudplatform_google_cloud_cpp" + "com_github_grpc_grpc" "com_google_protobuf" "com_googlesource_code_re2" "curl" "cython" "double_conversion" + "enum34_archive" "flatbuffers" + "functools32_archive" "gast_archive" - # Lots of errors, requires an older version - # "grpc" + "gif" "hwloc" "icu" - "jpeg" "jsoncpp_git" - "keras_applications_archive" + "libjpeg_turbo" "lmdb" "nasm" # "nsync" # not packaged in nixpkgs @@ -207,12 +200,14 @@ let "org_sqlite" "pasta" "pcre" + "png" + "pybind11" "six_archive" "snappy" "swig" "termcolor_archive" "wrapt" - "zlib_archive" + "zlib" ]; INCLUDEDIR = "${includes_joined}/include"; @@ -235,13 +230,16 @@ let TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities; postPatch = '' - # https://github.com/tensorflow/tensorflow/issues/20919 - sed -i '/androidndk/d' tensorflow/lite/kernels/internal/BUILD - # Tensorboard pulls in a bunch of dependencies, some of which may # include security vulnerabilities. So we make it optional. # https://github.com/tensorflow/tensorflow/issues/20280#issuecomment-400230560 sed -i '/tensorboard >=/d' tensorflow/tools/pip_package/setup.py + + # numpy 1.19 added in https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch + sed -i 's/numpy >= 1.16.0, < 1.19.0/numpy >= 1.16.0/' tensorflow/tools/pip_package/setup.py + + # bazel 3.3 should work just as well as bazel 3.1 + rm -f .bazelversion ''; preConfigure = let @@ -272,15 +270,8 @@ let runHook postConfigure ''; - # FIXME: Tensorflow uses dlopen() for CUDA libraries. - NIX_LDFLAGS = lib.optionalString cudaSupport "-lcudart -lcublas -lcufft -lcurand -lcusolver -lcusparse -lcudnn"; - hardeningDisable = [ "format" ]; - bazelFlags = [ - # temporary fixes to make the build work with bazel 0.27 - "--incompatible_no_support_tools_in_action_inputs=false" - ]; bazelBuildFlags = [ "--config=opt" # optimize using the flags set in the configure phase ] @@ -288,15 +279,17 @@ let bazelTarget = "//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow"; + removeRulesCC = false; + fetchAttrs = { # So that checksums don't depend on these. TF_SYSTEM_LIBS = null; # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "1kqk1gx5g63kb2zdj392x6mnpbrmgqghrdv597aipn7s23xzj8pd" + "0pf8128chkm6fxnhd4956n6gvijlj00mjmvry33gq3xx3bayhs9g" else - "1plpcm2ydpajsrxdvmmpfy7l0gfdir78hap72w4k7ddm6d3rm2fv"; + "0mkgss2nyk21zlj8hp24cs3dmpdnxk8qi6qq4hyc18lp82p09xwa"; }; buildAttrs = { @@ -347,7 +340,7 @@ let in buildPythonPackage { inherit version pname; - disabled = isPy27 || (pythonAtLeast "3.8"); + disabled = isPy27; src = bazel-build.python; @@ -377,6 +370,8 @@ in buildPythonPackage { wrapt grpcio opt-einsum + astunparse + h5py ] ++ lib.optionals (!isPy3k) [ mock future @@ -392,6 +387,8 @@ in buildPythonPackage { postFixup = lib.optionalString cudaSupport '' find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do addOpenGLRunpath "$lib" + + patchelf --set-rpath "${cudatoolkit}/lib:${cudatoolkit.lib}/lib:${cudnn}/lib:${nccl}/lib:$(patchelf --print-rpath "$lib")" "$lib" done ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/lift-gast-restriction.patch b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/lift-gast-restriction.patch index e0d367f492..7b1b3b135b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/lift-gast-restriction.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/lift-gast-restriction.patch @@ -2,10 +2,10 @@ diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_packag index 992f2eae22..d9386f9b13 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py -@@ -54,5 +54,5 @@ REQUIRED_PACKAGES = [ - 'enum34 >= 1.1.6;python_version<"3.4"', -- 'gast == 0.2.2', -+ 'gast >= 0.2.2', - 'google_pasta >= 0.1.6', - 'keras_applications >= 1.0.8', - 'keras_preprocessing >= 1.0.5', +@@ -56,5 +56,5 @@ REQUIRED_PACKAGES = [ + 'astunparse == 1.6.3', +- 'gast == 0.3.3', ++ 'gast >= 0.3.3', + 'google_pasta >= 0.1.8', + 'h5py >= 2.10.0, < 2.11.0', + 'keras_preprocessing >= 1.1.1, < 1.2', diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorly/default.nix index 94acabe78d..54f32d182c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorly/default.nix @@ -22,7 +22,9 @@ buildPythonPackage rec { sha256 = "1ml91yaxwx4msisxbm92yf22qfrscvk58f3z2r1jhi96pw2k4i7x"; }; - propagatedBuildInputs = [ numpy scipy sparse ]; + propagatedBuildInputs = [ numpy scipy sparse ] + ++ lib.optionals (!doCheck) [ nose ]; # upstream added nose to install_requires + checkInputs = [ pytest nose pytorch ]; # also has a cupy backend, but the tests are currently broken # (e.g. attempts to access cupy.qr instead of cupy.linalg.qr) @@ -30,12 +32,16 @@ buildPythonPackage rec { # as well as tensorflow and mxnet backends, but the tests don't # seem to exercise these backend by default + # uses >= 140GB of ram to test + doCheck = false; checkPhase = '' runHook preCheck nosetests -e "test_cupy" runHook postCheck ''; + pythonImportsCheck = [ "tensorly" ]; + meta = with lib; { description = "Tensor learning in Python"; homepage = "https://tensorly.org/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/texttable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/texttable/default.nix index a8c20a0eea..a8c6d9dcfd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/texttable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/texttable/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "texttable"; - version = "1.6.2"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "1x5l77akfc20x52jma9573qp8l8r07q103pm4l0pbizvh4vp1wzg"; + sha256 = "ce0faf21aa77d806bbff22b107cc22cce68dc9438f97a2df32c93e9afa4ce436"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tinydb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tinydb/default.nix index 96b6242c85..b267fa8285 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tinydb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tinydb/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage +, pythonOlder , fetchFromGitHub -, pytest +, poetry +, pytestCheckHook , pytestcov , pytestrunner , pycodestyle @@ -10,21 +12,21 @@ buildPythonPackage rec { pname = "tinydb"; - version = "v3.14.1"; + version = "4.1.1"; + disabled = pythonOlder "3.5"; + format = "pyproject"; src = fetchFromGitHub { owner = "msiemens"; repo = pname; - rev = version; - sha256 = "02idbvrm8j4mwsjfkzy11f4png19k307p53s4qa2ifzssysxpb96"; + rev = "v${version}"; + sha256 = "09cwdmpj91c6q7jympip1lrcd3idbm9cqblgvmrh0v1vy1iv2ki7"; }; - nativeBuildInputs = [ - pytestrunner - ]; + nativeBuildInputs = [ poetry ]; checkInputs = [ - pytest + pytestCheckHook pytestcov pycodestyle pyyaml @@ -32,8 +34,9 @@ buildPythonPackage rec { meta = with lib; { description = "A lightweight document oriented database written in pure Python with no external dependencies"; - homepage = "https://github.com/msiemens/tinydb"; - license = licenses.asl20; + homepage = "https://tinydb.readthedocs.org/"; + changelog = "https://tinydb.readthedocs.io/en/latest/changelog.html"; + license = licenses.mit; maintainers = with maintainers; [ marcus7070 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix index 29715dd2f5..89c612abfe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix @@ -4,6 +4,7 @@ , factory_boy , faker , inquirer +, notify-py , pbr , pendulum , ptable @@ -11,7 +12,6 @@ , pytestcov , pytest-mock , requests -, setuptools , twine , validate-email }: @@ -19,22 +19,19 @@ buildPythonPackage rec { pname = "toggl-cli"; - version = "2.1.0"; - disabled = pythonOlder "3.5" || pythonAtLeast "3.8"; + version = "2.2.1"; + disabled = pythonOlder "3.5"; src = fetchPypi { pname = "togglCli"; inherit version; - sha256 = "0iirvvb8772569v28d36bnryksm1qkkw48d48fw26j7ka01qq6mm"; + sha256 = "1izsxag98lvivkwf7724g2ak6icjak9jdqphaq1a79kwdnqprx1m"; }; postPatch = '' substituteInPlace requirements.txt \ - --replace "pendulum==2.0.4" "pendulum>=2.0.4" \ - --replace "click-completion==0.5.0" "click-completion>=0.5.0" \ - --replace "click==7.0" "click>=7.0" \ - --replace "pbr==5.1.2" "pbr>=5.1.2" \ - --replace "inquirer==2.5.1" "inquirer>=2.5.1" + --replace "inquirer==2.6.3" "inquirer>=2.6.3" \ + --replace "notify-py==0.2.2" "notify-py>=0.2.2" ''; nativeBuildInputs = [ pbr twine ]; @@ -53,15 +50,15 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - setuptools click click-completion - validate-email + inquirer + notify-py pendulum ptable requests - inquirer pbr + validate-email ]; meta = with stdenv.lib; { @@ -71,4 +68,3 @@ buildPythonPackage rec { maintainers = [ maintainers.mmahut ]; }; } - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix index 328cfb0ba8..fdb807bd0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "transformers"; - version = "3.2.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - sha256 = "0jj94153kgdyklra30xcszxv11hwzfigzy82fgvgzvbwlxv3a1j5"; + sha256 = "1j9nzhl0zw5z9rnvzfih7v6bax353rxp05b3f0cvkii3b5dbkc2j"; }; propagatedBuildInputs = [ @@ -52,9 +52,12 @@ buildPythonPackage rec { preCheck = '' export HOME="$TMPDIR" - # This test requires the nlp module, which we haven't - # packaged yet. However, nlp is optional for transformers - # itself + # This test requires the `datasets` module to download test + # data. However, since we cannot download in the Nix sandbox + # and `dataset` is an optional dependency for transformers + # itself, we will just remove the tests files that import + # `dataset`. + rm tests/test_retrieval_rag.py rm tests/test_trainer.py ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index f9a2dfa6af..484fee26da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.8.4"; + version = "3.8.10"; src = fetchPypi { inherit pname version; - sha256 = "50d2e74f2047a50d097a394fb11b12443f764dfc7145140d5029f7019dea6d4d"; + sha256 = "24fb0f7f8b8745e181b215a294eb1b22acd3e739d757892394d4c32f74e5c069"; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix index 1b4e32de68..2dc819ac63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "tvnamer"; - version = "3.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "00ae7354dec9cca8e652139eba9cf6945371321cdf05ee903a6a59f6d31cef6b"; + sha256 = "5512cebb1e49103a1e4ea9629398092b4bbabef35a91007ae0dbed961ebe17dd"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix new file mode 100644 index 0000000000..61adcf9254 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchPypi +, click +, pytestCheckHook +, shellingham +, pytestcov +, pytest_xdist +, pytest-sugar +, coverage +, mypy +, black +, isort +}: + +buildPythonPackage rec { + pname = "typer"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "00v3h63dq8yxahp9vg3yb9r27l2niwv8gv0dbds9dzrc298dfmal"; + }; + + propagatedBuildInputs = [ click ]; + + checkInputs = [ + pytestCheckHook + pytestcov + pytest_xdist + pytest-sugar + shellingham + coverage + mypy + black + isort + ]; + pytestFlagsArray = [ + "--ignore=tests/test_completion/test_completion.py" + "--ignore=tests/test_completion/test_completion_install.py" + ]; + + meta = with lib; { + homepage = "https://typer.tiangolo.com/"; + description = "Typer, build great CLIs. Easy to code. Based on Python type hints."; + license = licenses.mit; + maintainers = [ maintainers.winpat ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unicodedata2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unicodedata2/default.nix index 09b75e0c77..565f0f5572 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unicodedata2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unicodedata2/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Backport and updates for the unicodedata module"; - homepage = "http://github.com/mikekap/unicodedata2"; + homepage = "https://github.com/mikekap/unicodedata2"; license = licenses.asl20; maintainers = [ maintainers.sternenseemann ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unicorn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unicorn/default.nix index 8654243943..e8f4b05916 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unicorn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unicorn/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for Unicorn CPU emulator engine"; - homepage = "http://www.unicorn-engine.org/"; + homepage = "https://www.unicorn-engine.org/"; license = [ licenses.gpl2 ]; maintainers = with maintainers; [ bennofs ris ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix index 22b5af442d..76f379ef84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "vulture"; - version = "2.0"; + version = "2.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ab0dce458ab746212cc02ac10cf31912c43bbfdcccb49025745b00850beab086"; + sha256 = "933bf7f3848e9e39ecab6a12faa59d5185471c887534abac13baea6fe8138cc2"; }; checkInputs = [ coverage pytest pytestcov ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix index ac2a323aed..d06bbd409b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix @@ -5,14 +5,14 @@ }: buildPythonPackage rec { - version = "1.2.3"; + version = "1.2.5"; pname = "xmlschema"; src = fetchFromGitHub { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "1lasi84d5v66xpd40fbj3lqwc5hfh3izxrr2wbfdbj4a3m996zc9"; + sha256 = "0rsa75x86gdjalvy4riq7613szb616hff80crx006chyppzdkxmq"; }; propagatedBuildInputs = [ elementpath ]; @@ -32,7 +32,7 @@ buildPythonPackage rec { --ignore=tests/test_schemas.py \ --ignore=tests/test_memory.py \ --ignore=tests/test_validation.py \ - -k 'not element_tree_import_script' + -k 'not element_tree_import_script and not export_remote' ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix index f795a8fdfa..05f608ff4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "yq"; - version = "2.11.0"; + version = "2.11.1"; src = fetchPypi { inherit pname version; - sha256 = "1gp9q5w1bjbw7wmba5hm8ippwvkind0p02n07fqa9jlqglhxhm46"; + sha256 = "1q4rky0a6n4izmq7slb91a54g8swry1xrbfqxwc8lkd3hhvlxxkl"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index 9e8d0853ec..3ef2738e71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.28.2"; + version = "0.28.5"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "447d6da0b6426c0c67d5c29339e51b2d75e2c1f129605ad35a0cb84a454f09bc"; + sha256 = "c08dbb90c116626cb6c5f19ebd14cd4846cffe7151f338c19215e6938d334980"; }; propagatedBuildInputs = [ ifaddr ] diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix index ca095faa97..396a5817c6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix @@ -3,11 +3,11 @@ with python3Packages; buildPythonApplication rec { pname = "autoflake"; - version = "1.3.1"; + version = "1.4"; src = fetchPypi { inherit pname version; - sha256 = "0nzr057dbmgprp4a52ymafdkdd5zp2wcqf42913xc7hhvvdbj338"; + sha256 = "61a353012cff6ab94ca062823d1fb2f692c4acda51c76ff83a8d77915fba51ea"; }; propagatedBuildInputs = [ pyflakes ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/ikos/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/ikos/default.nix index a7b7677484..7108e9311b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/ikos/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/ikos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, boost +{ stdenv, lib, fetchFromGitHub, cmake, boost, tbb , gmp, llvm, clang, sqlite, python3 , ocamlPackages, mpfr, ppl, doxygen, graphviz }: @@ -11,16 +11,16 @@ in stdenv.mkDerivation rec { name = "ikos"; - version = "2.1"; + version = "3.0"; src = fetchFromGitHub { owner = "NASA-SW-VnV"; repo = name; rev = "v${version}"; - sha256 = "09nf47hpk5w5az4c0hcr5hhwvpz8zg1byyg185542cpzbq1xj8cb"; + sha256 = "0k3kp1af0qx3l1x6a4sl4fm8qlwchjvwkvs2ck0fhfnc62q2im5f"; }; - buildInputs = [ cmake boost gmp clang llvm sqlite python + buildInputs = [ cmake boost tbb gmp clang llvm sqlite python ocamlPackages.apron mpfr ppl doxygen graphviz ]; cmakeFlags = [ "-DAPRON_ROOT=${ocamlPackages.apron}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix index 5895be0208..62de8bdfda 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix @@ -1,20 +1,18 @@ { lib , mkDerivation , fetchFromGitHub -, parallel-io , fixplate -, pandoc , tasty , tasty-hunit , tasty-th , streamly , mtl -, path-io , path , pretty-terminal , text , base , aeson +, path-io , cmdargs , containers , hnix @@ -23,19 +21,19 @@ mkDerivation rec { pname = "nix-linter-unstable"; - version = "2019-04-26"; + version = "2020-09-25"; src = fetchFromGitHub { owner = "Synthetica9"; repo = "nix-linter"; - rev = "4aaf60195cd2d9f9e2345fbdf4aac48e1451292c"; - sha256 = "0c7rcjaxd8z0grwambsw46snv7cg66h3pszw3549z4xz0i60yq87"; + rev = "2516a8cda41f9bb553a1c3eca38e3dd94ebf53de"; + sha256 = "07mn2c9v67wsm57jlxv9pqac9hahw4618vngmj2sfbgihx8997kb"; }; isLibrary = false; isExecutable = true; - libraryHaskellDepends = [ parallel-io fixplate pandoc ]; - executableHaskellDepends = [ streamly mtl path-io path pretty-terminal text base aeson cmdargs containers hnix bytestring ]; + libraryHaskellDepends = [ fixplate ]; + executableHaskellDepends = [ streamly mtl path pretty-terminal text base aeson cmdargs containers hnix bytestring path-io ]; testHaskellDepends = [ tasty tasty-hunit tasty-th ]; description = "Linter for Nix(pkgs), based on hnix"; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix index 5fde4e1f43..1cef52a344 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "radare2-cutter"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "0kscl0yf5qxacqnz3pp47r94yiwnc4rwirnr2x580z10fwhsivki"; + sha256 = "0ljj3j3apbbw628n2nyrxpbnclixx20bqjxm0xwggqzz9vywsar0"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/rr/unstable.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/rr/unstable.nix new file mode 100644 index 0000000000..82b644f76a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/rr/unstable.nix @@ -0,0 +1,23 @@ +# This is a temporary copy of the default.nix in this folder, with the version updated to the current tip of rr's master branch. +# This exists because rr has not had a release in a long time, but there have been a lot of improvements including UX. +# Some of the UX improvements help prevent foot shooting. +# Upstream has stated that it should be fine to use master. +# This file, and its attribute in all-packages, can be removed once rr makes a release. +# For further information, please see https://github.com/NixOS/nixpkgs/issues/99535 "Improve support for the rr debugger in nixos containers" + +{ callPackage, fetchFromGitHub }: + +let + rr = callPackage ./. {}; +in + + rr.overrideAttrs (old: { + version = "unstable-2020-10-04"; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = "rr"; + rev = "9ff375813a740a0a6ebcdfcebc58bd61ab68c667"; + sha256 = "0raifs6cg5ckpi2445inhy3hfhp4p89s1lkx9z17mcc2g1c1phf5"; + }; + }) diff --git a/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix b/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix index b1671b098b..46e54465ab 100644 --- a/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix @@ -1,40 +1,39 @@ -{ lib, buildPythonApplication, fetchFromGitHub -, arrow, futures, logfury, requests, six, tqdm +{ + fetchFromGitHub, + lib, + python3Packages, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "1.3.8"; + version = "2.0.2"; src = fetchFromGitHub { owner = "Backblaze"; repo = "B2_Command_Line_Tool"; rev = "v${version}"; - sha256 = "1y4z4w6fj92rh9mrjsi0nmnzcmrj5jikarq2vs5qznvjdjm62igw"; + sha256 = "00zs0a580vvfm2w4ja68mc46360p475wlgagjkq1hi4m8s4qwd75"; }; - propagatedBuildInputs = [ arrow futures logfury requests six tqdm ]; + propagatedBuildInputs = with python3Packages; [ + b2sdk + class-registry + setuptools + ]; + checkInputs = with python3Packages; [ + nose + ]; + + # doCheck = false; checkPhase = '' - python test_b2_command_line.py test - ''; - - postPatch = '' - # b2 uses an upper bound on arrow, because arrow 0.12.1 is not - # compatible with Python 2.6: - # - # https://github.com/crsmithdev/arrow/issues/517 - # - # However, since we use Python 2.7, newer versions of arrow are fine. - - sed -i 's/,<0.12.1//g' requirements.txt + nosetests ''; postInstall = '' mv "$out/bin/b2" "$out/bin/backblaze-b2" - sed 's/^_have b2 \&\&$/_have backblaze-b2 \&\&/' -i contrib/bash_completion/b2 - sed 's/^\(complete -F _b2\) b2/\1 backblaze-b2/' -i contrib/bash_completion/b2 + sed 's/b2/backblaze-b2/' -i contrib/bash_completion/b2 mkdir -p "$out/etc/bash_completion.d" cp contrib/bash_completion/b2 "$out/etc/bash_completion.d/backblaze-b2" diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix index 968907c0d5..49d18d9e85 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk }: let - rev = "fa06c268993aa72fc094dce06a71182827aad395"; - version = "2020-06-01"; + rev = "1e9230f35879ce23cbd8d16add07d2134fd479c9"; + version = "2020-09-24"; in stdenv.mkDerivation { name = "sbt-extras-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "0a4dxpvw21yi3pji1s31pp17xplmczn2f2yijn58an9m2angw83j"; + sha256 = "1k6vknjjbhr5jfpiyh2yzayn2ziqi1bb862l1q2786q59161ij3j"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix index 2eb3643440..0d8d059383 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre, autoPatchelfHook, zlib }: stdenv.mkDerivation rec { pname = "sbt"; - version = "1.3.13"; + version = "1.4.0"; src = fetchurl { - urls = [ - "https://piccolo.link/sbt-${version}.tgz" - "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" - ]; - sha256 = "08mx84kzpm750zjxm225nh9wqm7js5y2k6hgb8xw3n574zg58hc5"; + url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; + sha256 = "1mgfs732w1c1p7dna7h47x8h073lvjs224fqlpkkvq10153mnxxl"; }; patchPhase = '' echo -java-home ${jre.home} >>conf/sbtopts ''; + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ zlib ]; + installPhase = '' mkdir -p $out/share/sbt $out/bin cp -ra . $out/share/sbt - ln -s $out/share/sbt/bin/sbt $out/bin/ + ln -sT ../share/sbt/bin/sbt $out/bin/sbt + ln -sT ../share/sbt/bin/sbtn-x86_64-${ if (stdenv.isDarwin) then "apple-darwin" else "pc-linux"} $out/bin/sbtn ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix index 7c796b47f2..666437126a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.16.2"; + version = "1.16.4"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "0zvf060nsd8cvyclkaasqlc9bw699vh2004qrvcy8hf50b2z1bi2"; + sha256 = "1i7v4chbgl15n3vn1liinjd4lxaxk9q2lyi1l2ak7iazx9px6cn9"; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix b/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix index 2f661dd44a..ee048466a3 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.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; - sha256 = "0v9cya3x0v1fqpqswayskmm0xzbvfn4hbhz2k6b3j6fzcq2dnzj3"; + sha256 = "15xdsjv53hjgmdxzdakj07ggickw1jkcii31ycb3q8nh1ki05rhq"; }; - vendorSha256 = "1nxl00f8dbdiykwa54qm9r0cv16zcab880ay8mlmxba7srysvb1y"; + vendorSha256 = "0795npr09680nmxiz9riq5v6rp91qgkvw1lc2mn9gzakv1ywl5rq"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index af591a540d..b59a456172 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.4.0"; + version = "13.4.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 = "0rdnrnkm9pcdzi3ddmk0ia9r6lv548by08q1nrb7683jywr7bin3"; + sha256 = "0yc4yfqhh51p0nz0sl2qfp48n431qgp23wn3aqq3jg4fh9578prb"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1nd32vqp096h36p89c0v21yijn3dzz4ix5bwsbl20mc8m802wvg7"; + sha256 = "1n50izz21dmd14qm6y9fsgwf5f0r9829dv79mvlqxmh1q87acm93"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "124gplxs3a6kyc7b7mwsf0l02i9qi0ifjn3r2m7vq5wvk31qa97b"; + sha256 = "10k3xn3fapwx52s3r3pk972k1s7793cgja7g1fvm06pic8l7q05g"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix index 921c5194d5..46c57607a5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "coursier"; - version = "2.0.0-RC6-26"; + version = "2.0.0"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "0dpm1q4vxhv9ji87qdnsqvdmi0k5757kkd3p83g116skpkzmymvq"; + sha256 = "07j113cszd4wggm8js4jl1lhg88mfs46nl2xf1733icz7p5rvjim"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix index 553f9ce928..018d1310bd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = { description = "Version Control for your database"; - homepage = "http://www.liquibase.org/"; + homepage = "https://www.liquibase.org/"; changelog = "https://raw.githubusercontent.com/liquibase/liquibase/v${version}/changelog.txt"; license = licenses.asl20; maintainers = with maintainers; [ nequissimus ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-toml/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-toml/default.nix index 0cb16354b2..3d89237813 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-toml/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-toml/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "go-toml"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "0fxmjm85c9h43lvqz71wr93fcc63bhj82nwby80222xx8ja63g7y"; + sha256 = "1pi1r9ds0vxjza4qrbk52y98wxrzh1ghwzc9c2v1w6i02pdwdcz9"; }; goPackagePath = "github.com/pelletier/go-toml"; diff --git a/third_party/nixpkgs/pkgs/development/tools/goconst/default.nix b/third_party/nixpkgs/pkgs/development/tools/goconst/default.nix index 91a53830cb..5c2e40032e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/goconst/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/goconst/default.nix @@ -5,16 +5,17 @@ buildGoPackage rec { pname = "goconst"; - version = "1.1.0"; + version = "1.2.0"; goPackagePath = "github.com/jgautheron/goconst"; - excludedPackages = ''testdata''; + + excludedPackages = [ "tests" ]; src = fetchFromGitHub { owner = "jgautheron"; repo = "goconst"; rev = version; - sha256 = "0zhscvv9w54q1h2vs8xx3qkz98cf36qhxjvdq0xyz3qvn4vhnyw6"; + sha256 = "10yy9llmbznaq3v11sxywk1wpwhn0ddly7lxs31z1sf8paan7aig"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/godot/default.nix b/third_party/nixpkgs/pkgs/development/tools/godot/default.nix index 0d35ce253b..492430cc7c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/godot/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/godot/default.nix @@ -10,13 +10,13 @@ let }; in stdenv.mkDerivation rec { pname = "godot"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "1libz83mbyrkbbsmmi8z2rydv3ls0w9r4vb5v6diqqwn7ka8z804"; + sha256 = "19vrp5lhyvxbm6wjxzn28sn3i0s8j08ca7nani8l1nrhvlc8wi0v"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/gomplate/default.nix b/third_party/nixpkgs/pkgs/development/tools/gomplate/default.nix new file mode 100644 index 0000000000..2bef9d53ff --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gomplate/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gomplate"; + version = "3.8.0"; + owner = "hairyhenderson"; + rev = "v${version}"; + + src = fetchFromGitHub { + inherit owner rev; + repo = pname; + sha256 = "058shbrhpd8ghdj5qa6n7mf1bh8qvpmiv3yjj39jys359zhin06n"; + }; + + vendorSha256 = "0wqz3anxlzb0ds6xmpnaxq5rjgcmzkzrdqhnkfkjq32b7mj9mks3"; + + # some tests require network access + postPatch = '' + rm net/net_test.go + ''; + + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X github.com/${owner}/${pname}/v3/version.Version=${rev}" + ]; + + meta = with stdenv.lib; { + description = "A flexible commandline tool for template rendering"; + homepage = "https://gomplate.ca/"; + maintainers = with maintainers; [ ris jlesquembre ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/jpexs/default.nix b/third_party/nixpkgs/pkgs/development/tools/jpexs/default.nix new file mode 100644 index 0000000000..87bba3847b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/jpexs/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchzip, makeWrapper, makeDesktopItem, jdk8 }: + +stdenv.mkDerivation rec { + pname = "jpexs"; + version = "11.3.0"; + + src = fetchzip { + url = "${meta.homepage}/releases/download/version${version}/ffdec_${version}.zip"; + sha256 = "0d1xmq21vdpn0glwfzr00s62ic8jynmgmgxl0m1834xqf3ma0ihv"; + stripRoot = false; + }; + + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mkdir -p $out/share/{ffdec,icons/hicolor/512x512/apps} + + cp ffdec.jar $out/share/ffdec + cp -r lib $out/share/ffdec + cp icon.png $out/share/icons/hicolor/512x512/apps/ffdec.png + cp -r ${desktopItem}/share/applications $out/share + + makeWrapper ${jdk8}/bin/java $out/bin/ffdec \ + --add-flags "-jar $out/share/ffdec/ffdec.jar" + ''; + + desktopItem = makeDesktopItem rec { + name = "ffdec"; + exec = name; + icon = name; + desktopName = "JPEXS Free Flash Decompiler"; + genericName = "Flash Decompiler"; + comment = meta.description; + categories = "Development;Java;"; + extraEntries = '' + StartupWMClass=com-jpexs-decompiler-flash-gui-Main + ''; + }; + + meta = with stdenv.lib; { + description = "Flash SWF decompiler and editor"; + longDescription = '' + Open-source Flash SWF decompiler and editor. Extract resources, + convert SWF to FLA, edit ActionScript, replace images, sounds, + texts or fonts. + ''; + homepage = "https://github.com/jindrapetrik/jpexs-decompiler"; + license = licenses.gpl3; + platforms = jdk8.meta.platforms; + maintainers = with maintainers; [ samuelgrf ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/k6/default.nix b/third_party/nixpkgs/pkgs/development/tools/k6/default.nix index bf4f83f902..4dbd890df1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/k6/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/k6/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "k6"; - version = "0.27.1"; + version = "0.28.0"; goPackagePath = "github.com/loadimpact/k6"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "loadimpact"; repo = pname; rev = "v${version}"; - sha256 = "0ni7x64al49adzy6kwzxyi56w556qy34888hxsldjrnndlchc0vz"; + sha256 = "0zpkavl6sg6kcb7wc92lzi4svvv3284xs20zbmgq4i9i5z1njdkx"; }; subPackages = [ "./" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix new file mode 100644 index 0000000000..ed34053d83 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }: + + +stdenv.mkDerivation rec { + pname = "patchrom"; + + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "patchrom"; + rev = version; + sha256 = "0yc4q7n3k7k6rx3cxq5ddd5r0la8gw1287a74kql6gwkxjq0jmcv"; + }; + + nativeBuildInputs = [ cmake asciidoc docbook_xsl ]; + + buildInputs = [ libxslt ]; + + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "Patches jumptables into TI calculator ROM files and generates an include file"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/literate-programming/eweb/default.nix b/third_party/nixpkgs/pkgs/development/tools/literate-programming/eweb/default.nix index 39e309c4ce..82805af580 100644 --- a/third_party/nixpkgs/pkgs/development/tools/literate-programming/eweb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/literate-programming/eweb/default.nix @@ -1,25 +1,24 @@ { stdenv, fetchurl, python3, asciidoc }: stdenv.mkDerivation rec { - - name = "eweb-${meta.version}"; + pname = "eweb"; + version = "9.10"; src = fetchurl { - url = "mirror://sourceforge/project/eweb/${name}.tar.bz2"; + url = "mirror://sourceforge/project/eweb/${pname}-${version}.tar.bz2"; sha256 = "1xy7vm2sj5q6s620fm25klmnwnz9xkrxmx4q2f8h6c85ydisayd5"; }; buildInputs = [ python3 asciidoc ]; installPhase = '' - install -d $out/bin $out/share/doc/${name} + install -d $out/bin $out/share/doc/${pname}-${version} cp etangle.py $out/bin - cp etangle.w etangle.html $out/share/doc/${name} + cp etangle.w etangle.html $out/share/doc/${pname}-${version} ''; meta = with stdenv.lib; { - version = "9.10" ; - homepage = "http://eweb.sf.net"; + homepage = "http://eweb.sourceforge.net/"; description = "An Asciidoc-based literate programming tool, written in Python"; platforms = platforms.linux; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix b/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix index 308343c1ec..8cd4fc9f7f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix @@ -22,6 +22,16 @@ stdenv.mkDerivation { url = "https://github.com/MiniZinc/libminizinc/commit/d3136f6f198d3081943c17ac6890dbe14a81d112.diff"; sha256 = "1f4wxn9422ndgq6dd0vqdxm2313srm7gn9nh82aas2xijdxlmz2c"; }) + (fetchpatch { + name = "bison-3.7-compat-1.patch"; + url = "https://github.com/MiniZinc/libminizinc/commit/8d4dcf302e78231f7c2665150e8178cacd06f91c.patch"; + sha256 = "1wgciyrqijv7b4wqha94is5skji8j7b9wq6fkdsnsimfd3xpxhqw"; + }) + (fetchpatch { + name = "bison-3.7-compat-2.patch"; + url = "https://github.com/MiniZinc/libminizinc/commit/952ffda0bd23dc21f83d3e3f080ea5b3a414e8e0.patch"; + sha256 = "0cnsfqw0hwm7rmazqnb99725rm2vdwab75vdpr5x5l3kjwsn76rj"; + }) ]; meta = with stdenv.lib; { @@ -37,7 +47,7 @@ stdenv.mkDerivation { ''; license = licenses.mpl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.sheenobu ]; }; } 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 3864337bad..358fdd0369 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "act"; - version = "0.2.13"; + version = "0.2.15"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "112vmq9wg31alw9lw1jmsdvkd7kz1d9ak4p9dli7vgr9rhdf0hnb"; + sha256 = "17mh7nxzj597vn51c92ridnvfz17rq9sxynfpx9lj32hqw2r45ap"; }; vendorSha256 = "0bcrw3hf92m7n58lrlm0vj1wiwwy82q2rl1a725q3d6xwvi5kh9h"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/chruby-fish/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/chruby-fish/default.nix new file mode 100644 index 0000000000..6268c740e2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/chruby-fish/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, chruby }: + +stdenv.mkDerivation rec { + pname = "chruby-fish"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "JeanMertz"; + repo = "chruby-fish"; + rev = "v${version}"; + sha256 = "15q0ywsn9pcypbpvlq0wb41x4igxm9bsvhg9a05dqw1n437qjhyb"; + }; + + postInstall = '' + sed -i -e '1iset CHRUBY_ROOT ${chruby}' $out/share/chruby/auto.fish + sed -i -e '1iset CHRUBY_ROOT ${chruby}' $out/share/chruby/chruby.fish + ''; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "Thin wrapper around chruby to make it work with the Fish shell"; + homepage = "https://github.com/JeanMertz/chruby-fish"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.cohei ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix index 472e9c5857..6b7369a055 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://www.kdbg.org/"; + homepage = "https://www.kdbg.org/"; description = '' A graphical user interface to gdb, the GNU debugger. It provides an intuitive interface for setting breakpoints, inspecting variables, and diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix index ccbed6d430..14f4d5ef12 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "5.8"; + version = "5.9"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "1abs3svkg9985f4jrxx34sj1dcpsf95vv1a0g01c777zgygncjnz"; + sha256 = "1nb6bm6ll6cxd6a2fc67c0qn39gbh6rkqrpv83lw6ijm8sw3wirr"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -18,10 +18,6 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check"; - # fails 1 out of 523 tests with - # "strace-k.test: failed test: ../../strace -e getpid -k ../stack-fcall output mismatch" - doCheck = false; - meta = with stdenv.lib; { homepage = "https://strace.io/"; description = "A system call tracer for Linux"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix index 54712be2b6..34fcc9bb6c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,17 +1,22 @@ -{ lib, fetchurl, buildDunePackage, yojson }: +{ lib, fetchurl, buildDunePackage, substituteAll +, dot-merlin-reader, dune_2, yojson, csexp, result }: buildDunePackage rec { pname = "merlin"; - version = "3.3.9"; - minimumOCamlVersion = "4.02.1"; + inherit (dot-merlin-reader) src version; - src = fetchurl { - url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; - sha256 = "00ng8299l5rzpak8ljxzr6dgxw6z52ivm91159ahv09xk4d0y5x3"; - }; + minimumOCamlVersion = "4.02.3"; - buildInputs = [ yojson ]; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; + dune = "${dune_2}/bin/dune"; + }) + ]; + + buildInputs = [ dot-merlin-reader yojson csexp result ]; meta = with lib; { description = "An editor-independent tool to ease the development of programs in OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix new file mode 100644 index 0000000000..7af1b4513a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix @@ -0,0 +1,24 @@ +{ lib, fetchurl, ocamlPackages }: + +with ocamlPackages; + +buildDunePackage rec { + pname = "dot-merlin-reader"; + version = "3.4.0"; + + minimumOCamlVersion = "4.02.1"; + + src = fetchurl { + url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; + sha256 = "048rkpbvayksv8mgmkgi17vv0y9xplv7v2ww4d1hs7bkm5zzsvg2"; + }; + + buildInputs = [ yojson csexp result ]; + + meta = with lib; { + description = "Reads config files for merlin"; + homepage = "https://github.com/ocaml/merlin"; + license = licenses.mit; + maintainers = [ maintainers.hongchangwu ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/fix-paths.patch b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/fix-paths.patch new file mode 100644 index 0000000000..05fafacc09 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/fix-paths.patch @@ -0,0 +1,15 @@ +--- a/src/kernel/mconfig_dot.ml ++++ b/src/kernel/mconfig_dot.ml +@@ -126,10 +126,10 @@ module Configurator = struct + let prog, args = + match cfg with + | Dot_merlin -> +- let prog = "dot-merlin-reader" in ++ let prog = "@dot_merlin_reader@" in + prog, [| prog |] + | Dune -> +- let prog = "dune" in ++ let prog = "@dune@" in + prog, [| prog; "ocaml-merlin"; "--no-print-directory" |] + in + log ~title:"get_config" "Using %s configuration provider." (to_string cfg); diff --git a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix index cec885499b..79baecd74f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "1s59rgr0ssics1487mvx0h37zs7dfjimsvkbs2d8wqc3r8asw0g4"; + sha256 = "1p2ra7mqn7crip6sjgq2j49782ncvs4qahjwg6jk5rdvvi4hbyc7"; }; - vendorSha256 = "0xvjsiaa3qvlix1fm07z080vh79wg0xyx2s6jqnqn7fb3nh65kn7"; + vendorSha256 = "0zy540cbfm1kfc5sp802a9a5l2gkpgqprn8mlh9zg4d4shni61wa"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix index 909e821a6d..d6df39e7a2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packer"; - version = "1.6.2"; + version = "1.6.4"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "0kr9whv3s0f8866yjmwg311j3kcj29bp5xwpnv43ama4m1mq3bm7"; + sha256 = "0nkbm5iamkzi5x64107apnwmqxs4a75pxw935pwpm69ry4535r7w"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix index b91acdca68..7f48a6ad97 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -11,9 +11,9 @@ let # 1) change all these hashes # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) run the ./result script that is output by that (it updates ./grammars) - version = "0.16.4"; - sha256 = "1m0zxz7h4w2zny7yhrlxwqvizcf043cizg7ca5dn3h9k16adcxil"; - cargoSha256 = "0hxm73diwiybljm6yy3vmwfdpg33b4rlg0h7afq4xgccq2vkwafs"; + version = "0.16.9"; + sha256 = "sha256-e5Ft+jEpExLgBBFmiswW0VFrsKume4gmUiOiF4ODhhQ="; + cargoSha256 = "sha256-XbPLQEvf4JX517ddpx18eweiPrztS5E/X2pejkqmlCU="; src = fetchFromGitHub { owner = "tree-sitter"; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index ef0db9d68a..5898997dd6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -8,6 +8,7 @@ javascript = (builtins.fromJSON (builtins.readFile ./tree-sitter-javascript.json)); jsdoc = (builtins.fromJSON (builtins.readFile ./tree-sitter-jsdoc.json)); json = (builtins.fromJSON (builtins.readFile ./tree-sitter-json.json)); + php = (builtins.fromJSON (builtins.readFile ./tree-sitter-php.json)); python = (builtins.fromJSON (builtins.readFile ./tree-sitter-python.json)); ruby = (builtins.fromJSON (builtins.readFile ./tree-sitter-ruby.json)); rust = (builtins.fromJSON (builtins.readFile ./tree-sitter-rust.json)); diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json index c367d24d09..f1d5efbe7e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-bash", - "rev": "7b8adcf484e27b6c1a707ce28123e55dd4b7a844", - "date": "2019-07-26T14:05:41-06:00", - "sha256": "047p51ab4fqm55xqss6z74iyj1hlndql97dv9fifckczx3d5xn5g", - "fetchSubmodules": false + "rev": "e213464b5062017dc058cfb7effe2fc7a2eebb04", + "date": "2020-03-02T14:55:46+01:00", + "path": "/nix/store/napdz7i4k0gz469zsszdlvr5hmj8y7i9-tree-sitter-bash", + "sha256": "0wz9rmpd36g88l2hhy1xl3i5d6a6di1jlw11qkvccgg16kb9p4h7", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json index c44bd0344b..401bea63e0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c", - "rev": "6002fcd5e86bb1e8670157bb008b97dbaf656d95", - "date": "2019-12-17T10:25:11-08:00", - "sha256": "0bcsgwyv9nskkh26hl4hylb03py98d2m565bgvq7fn3f8gyx5w7v", - "fetchSubmodules": false + "rev": "99151b1e9293c9e025498fee7e6691e1a52e1d03", + "date": "2020-05-14T11:39:30-07:00", + "path": "/nix/store/b5xqnw967s9a58wcpyspbkgbph6jxarv-tree-sitter-c", + "sha256": "07ax01r3npw13jlv20k15q2hdhqa0rwm2km6f5j50byqvmgfc6fm", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index b17af74ac8..99af884be9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "c7b767ac5fce26301321f91fb83fe9392c02d51d", - "date": "2019-12-17T13:43:08-08:00", - "sha256": "16i9iggr7ff18bif81viy9rvn1z55ad6yaq6dj0znjgaq8q6aclx", - "fetchSubmodules": false + "rev": "5e7476bd014445abdae879661e9caf299215478a", + "date": "2020-05-14T11:46:56-07:00", + "path": "/nix/store/xz540ah1xx06n3wwmk3ym72nj0bz82hh-tree-sitter-cpp", + "sha256": "0v2l5269bhbpzcd929r3pn88gqcczx6spsq7p6ibsvsydbwj95wx", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json index a83a5a429e..f0ef7079bf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-embedded-template", - "rev": "3ca7c50fd3dd02df88cf120d8ab5b7b1f2efb270", - "date": "2020-01-16T16:31:20-08:00", - "sha256": "0vhmfn7jr5hdzksw808z99scqcyjr0i3qiybiq0yb644ysdmai05", - "fetchSubmodules": false + "rev": "8269c1360e5b1b9ba3e04e7896d9dd2f060de12f", + "date": "2020-07-20T12:50:27-07:00", + "path": "/nix/store/9ijnzv72vc1n56k6f1xp3kb7lc9hvlhh-tree-sitter-embedded-template", + "sha256": "03symsaxp8m128cn5h14pnm30ihpc49syb4vybpdvgcvraa408qq", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json index bf8c4408b5..67d58d6406 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-go", - "rev": "689cc8fbdc0613d267434f221af85aff91a31f8c", - "date": "2020-01-23T10:27:48-08:00", - "sha256": "04gpzi125akwgww5smw5x4dqr6jv5sq1165qn86bz15hwcmnybfj", - "fetchSubmodules": false + "rev": "34181774b3e86b7801c939c79c7b80a82df91a2b", + "date": "2020-08-13T12:21:50-07:00", + "path": "/nix/store/3a5w7pz1m74y0lhbzq3bw3k2297lypqs-tree-sitter-go", + "sha256": "0cfi7ghs0m3iqwd4jvsqgsj4gnfikn1j2q0wbkdfvz2j25l0qwq0", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json index 40d124b862..7e53e76c0d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-html", - "rev": "2147dd298a2b2e9593bfcb51a14c289a0dc7eb87", - "date": "2020-01-16T12:47:09-08:00", - "sha256": "0acg9v940xq4sw7019z2izc9qs10wwqipyiki243dws6z0wmwhdq", - "fetchSubmodules": false + "rev": "7f442e1c6163d450c69c75c7a621badc3a0ea98f", + "date": "2020-07-20T12:46:52-07:00", + "path": "/nix/store/qklk97krsas1kjbh8dp6ii1gj9sqz8h9-tree-sitter-html", + "sha256": "0z249nnxlal8g6zbrys6kb80vksgcw2j5nd737m6yna2h5bhl126", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index 04a6ae1056..9020e8a40b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "6e3692292adf8750fece625fc06fc1503e00d75e", - "date": "2020-01-27T13:47:50-08:00", - "sha256": "1i8m7v0859109bf2dz0dhf4cnhqmwc4947z49g4rs07k8h8dfk99", - "fetchSubmodules": false + "rev": "3d5493495b62b4ff8e8c24aee7519dd904e25813", + "date": "2020-09-21T17:18:41-07:00", + "path": "/nix/store/bhjws8yif1ihhvhfsrdrp4inf03ks08r-tree-sitter-javascript", + "sha256": "10fscmclcgl1a0314ppkfy0s7pmiiz5vjipbmks76608kic8nzpp", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json index 9795f600c8..5dca4a5f96 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-jsdoc", - "rev": "7b2dc910126d553cddd3b2318f39604d205b3a21", - "date": "2020-01-27T13:06:46-08:00", - "sha256": "04ahmbwfx3238dbsvlpg8xgb1c4bazdd8yw7dk4vph9cp8rq0dj5", - "fetchSubmodules": false + "rev": "77e7785739ad3e90c3de8ed5a55418a5fd2b8225", + "date": "2020-05-14T14:58:51-07:00", + "path": "/nix/store/3wp3hff203z15fvbnizcqzic1pjxmpg4-tree-sitter-jsdoc", + "sha256": "0i2ac7i0vs46668q56dpmd9c02vcyy3f8rh4i0dbvd3rvihifbgc", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json index 282e28c9be..a708093698 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-json", - "rev": "7b6a33f300e3e88c3017e0a9d88c77b50ea6d149", - "date": "2019-12-10T10:27:22-08:00", - "sha256": "17yc7spn8v64ll684634zmjq3130yxvb5bfgjwg0agcaklpx71dp", - "fetchSubmodules": false + "rev": "d3976b27df8622ed17bef6dd5e358b398e73c676", + "date": "2020-05-14T14:59:27-07:00", + "path": "/nix/store/ds2wnlrh289rsnjx828h3jy1706g3x21-tree-sitter-json", + "sha256": "1cbhsmzbjni0mynjcai6gshhg16nls82v9lcihxf350dz57f7sax", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json new file mode 100644 index 0000000000..1fb2a07984 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/tree-sitter/tree-sitter-php", + "rev": "b0c0367d4b7058921fdc4ba11e257441a64ab809", + "date": "2020-07-29T16:56:25-07:00", + "path": "/nix/store/la06yzcv5w1dpp31s4clllkfic8rs98a-tree-sitter-php", + "sha256": "0a47rr1d5dg70kfvk257g7mhpcwslv6prxc7012spxcrfiwbx89l", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index 4abdc3fe00..1c057f51ea 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-python", - "rev": "899ac8d5d6c883b2f05362c9953e14e78aac474c", - "date": "2020-01-16T16:30:41-08:00", - "sha256": "1mw23kfr33s6md701p0p2nrd04119204ir78i7j1s5cxiyvpjq33", - "fetchSubmodules": false + "rev": "30f538aa1f932a2864c102694761d3127a61dc68", + "date": "2020-09-21T13:21:51-07:00", + "path": "/nix/store/bxv85lm636xdsdqjf4n7sxjlhhh35qnv-tree-sitter-python", + "sha256": "0hzzz90pn1qwyl5xk03cah62rbvp1c1yp1pw2m3hifqflxg4rs1g", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json index db58c7eb3e..06418942b4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ruby", - "rev": "6540da2a79ceb7dc7afe50e9ac01eaad4378702d", - "date": "2019-12-09T14:56:14-08:00", - "sha256": "1i0ab1rm5hba0nnbmi4m37fbs368hk6wyby09pfmcmjwpi9zs0f9", - "fetchSubmodules": false + "rev": "a6fcb529e9097a2efbbb3f4857e42773e7f2474f", + "date": "2020-05-26T16:18:48-07:00", + "path": "/nix/store/yqd5b7ky21scahnhrik9psalbkwi3ab3-tree-sitter-ruby", + "sha256": "0bxg5lfdazz5mlfnf0amcygvc8b2ydzl2blvbbhnziyx92r8di6q", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index e3a906f076..9f037cdc09 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "1c37782a5528979a22991f8ed50dd3d3e423ac92", - "date": "2020-01-20T16:08:51-08:00", - "sha256": "04fzzn2rxpfg7pwymmarkdjabbp20yp10yzr4a5a1xcqx8hky9ix", - "fetchSubmodules": false + "rev": "40620bf4097cbc9cea79504d7e877865df43a19e", + "date": "2020-05-15T10:53:35-07:00", + "path": "/nix/store/r24bba6gxchb5zqzghna8yjvqnngbv4a-tree-sitter-rust", + "sha256": "0hjp6nsskw341g97x41481b3zfwh8g853fs9six6j1mh92irmv6y", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index 9995665c7c..7081d3036c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "aa950f58ea8aa112bc72f3481b98fc2d3c07b3e0", - "date": "2020-01-27T13:51:28-08:00", - "sha256": "0y64lls7hw7yc70d9i6p4n1kchg11sbgl2m6yafy7w2ymksb5iw5", - "fetchSubmodules": false + "rev": "5a38a5bd04364d9f48b902fd1514e075b98b0edc", + "date": "2020-09-17T10:19:01-07:00", + "path": "/nix/store/b3q7vz9zhgjdbv3c2xap4k2ghpdjp2yf-tree-sitter-typescript", + "sha256": "1mxwvzqbaaq11cz7zidiwr29fs0b6ycf3nadwdkgiz8c6x2xx398", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/library.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/library.nix index 2d5d3e7d0b..36245ff7d4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/library.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/library.nix @@ -18,7 +18,11 @@ stdenv.mkDerivation { configurePhase= ":"; buildPhase = '' runHook preBuild - $CC -I$src/src/ -shared -o parser -Os $src/src/parser.c + scanner_cc="$src/src/scanner.cc" + if [ ! -f "$scanner_cc" ]; then + scanner_cc="" + fi + $CC -I$src/src/ -shared -o parser -Os $src/src/parser.c $scanner_cc -lstdc++ runHook postBuild ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index cca876ca1e..e47dbc99f2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -20,11 +20,58 @@ let # Experimental withPlugins functionality toPluginAble = (import ./plugins.nix { inherit pkgs lib; }).toPluginAble; + + mkInputAttrs = + { py + , pyProject + , attrs + , includeBuildSystem ? true + }: + let + getInputs = attr: attrs.${attr} or [ ]; + + # Get dependencies and filter out depending on interpreter version + getDeps = depAttr: + let + compat = isCompatible (poetryLib.getPythonVersion py); + deps = pyProject.tool.poetry.${depAttr} or { }; + depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames deps); + in + ( + builtins.map + ( + dep: + let + pkg = py.pkgs."${moduleName dep}"; + constraints = deps.${dep}.python or ""; + isCompat = compat constraints; + in + if isCompat then pkg else null + ) + depAttrs + ); + + buildSystemPkgs = poetryLib.getBuildSystemPkgs { + inherit pyProject; + pythonPackages = py.pkgs; + }; + + mkInput = attr: extraInputs: getInputs attr ++ extraInputs; + + in + { + buildInputs = mkInput "buildInputs" (if includeBuildSystem then buildSystemPkgs else [ ]); + propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]); + nativeBuildInputs = mkInput "nativeBuildInputs" [ ]; + checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies"); + }; + + in lib.makeScope pkgs.newScope (self: { # Poetry2nix version - version = "1.12.0"; + version = "1.13.0"; /* Returns an attrset { python, poetryPackages, pyProject, poetryLock } for the given pyproject/lockfile. @@ -61,7 +108,7 @@ lib.makeScope pkgs.newScope (self: { # Filter packages by their PEP508 markers & pyproject interpreter version partitions = let - supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true; + supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true && isCompatible (poetryLib.getPythonVersion python) pkgMeta.python-versions; in lib.partition supportsPythonVersion poetryLock.package; compatible = partitions.right; @@ -91,7 +138,7 @@ lib.makeScope pkgs.newScope (self: { ); } ) - compatible + (lib.reverseList compatible) ); in lockPkgs; @@ -106,9 +153,13 @@ lib.makeScope pkgs.newScope (self: { in { mkPoetryDep = self.callPackage ./mk-poetry-dep.nix { - inherit pkgs lib python poetryLib; + inherit pkgs lib python poetryLib evalPep508; }; - poetry = poetryPkg; + + # Use poetry-core from the poetry build (pep517/518 build-system) + poetry-core = if __isBootstrap then null else poetryPkg.passthru.python.pkgs.poetry-core; + poetry = if __isBootstrap then null else poetryPkg; + # The canonical name is setuptools-scm setuptools-scm = super.setuptools_scm; @@ -126,10 +177,13 @@ lib.makeScope pkgs.newScope (self: { ); packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) overlays; py = python.override { inherit packageOverrides; self = py; }; + + inputAttrs = mkInputAttrs { inherit py pyProject; attrs = { }; includeBuildSystem = false; }; + in { python = py; - poetryPackages = map (pkg: py.pkgs.${moduleName pkg.name}) compatible; + poetryPackages = builtins.foldl' (acc: v: acc ++ v) [ ] (lib.attrValues inputAttrs); poetryLock = poetryLock; inherit pyProject; }; @@ -219,32 +273,12 @@ lib.makeScope pkgs.newScope (self: { ]; passedAttrs = builtins.removeAttrs attrs specialAttrs; - # Get dependencies and filter out depending on interpreter version - getDeps = depAttr: - let - compat = isCompatible (poetryLib.getPythonVersion py); - deps = pyProject.tool.poetry.${depAttr} or { }; - depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames deps); - in - builtins.map - ( - dep: - let - pkg = py.pkgs."${moduleName dep}"; - constraints = deps.${dep}.python or ""; - isCompat = compat constraints; - in - if isCompat then pkg else null - ) - depAttrs; - getInputs = attr: attrs.${attr} or [ ]; - mkInput = attr: extraInputs: getInputs attr ++ extraInputs; - buildSystemPkgs = poetryLib.getBuildSystemPkgs { - inherit pyProject; - pythonPackages = py.pkgs; - }; + inputAttrs = mkInputAttrs { inherit py pyProject attrs; }; + app = py.pkgs.buildPythonPackage ( - passedAttrs // { + passedAttrs // inputAttrs // { + nativeBuildInputs = inputAttrs.nativeBuildInputs ++ [ py.pkgs.removePathDependenciesHook ]; + } // { pname = moduleName pyProject.tool.poetry.name; version = pyProject.tool.poetry.version; @@ -256,11 +290,6 @@ lib.makeScope pkgs.newScope (self: { # provides python modules namePrefix = ""; - buildInputs = mkInput "buildInputs" buildSystemPkgs; - propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]); - nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj py.pkgs.removePathDependenciesHook ]; - checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies"); - passthru = { python = py; dependencyEnv = ( @@ -274,9 +303,10 @@ lib.makeScope pkgs.newScope (self: { ) { inherit app; }; }; - meta = lib.optionalAttrs (lib.hasAttr "description" pyProject.tool.poetry) { - inherit (pyProject.tool.poetry) description; - } // lib.optionalAttrs (lib.hasAttr "homepage" pyProject.tool.poetry) { + meta = lib.optionalAttrs (lib.hasAttr "description" pyProject.tool.poetry) + { + inherit (pyProject.tool.poetry) description; + } // lib.optionalAttrs (lib.hasAttr "homepage" pyProject.tool.poetry) { inherit (pyProject.tool.poetry) homepage; } // { inherit (py.meta) platforms; diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/editable.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/editable.nix index 8b0d933e44..12b659d4c3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/editable.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/editable.nix @@ -29,25 +29,26 @@ let # A python package that contains simple .egg-info and .pth files for an editable installation editablePackage = python.pkgs.toPythonModule (pkgs.runCommandNoCC "${name}-editable" { } '' - mkdir -p "$out/${python.sitePackages}" - cd "$out/${python.sitePackages}" + mkdir -p "$out/${python.sitePackages}" + cd "$out/${python.sitePackages}" - # See https://docs.python.org/3.8/library/site.html for info on such .pth files - # These add another site package path for each line - touch poetry2nix-editable.pth - ${lib.concatMapStringsSep "\n" (src: '' - echo "${toString src}" >> poetry2nix-editable.pth - '') - (lib.attrValues editablePackageSources)} + # See https://docs.python.org/3.8/library/site.html for info on such .pth files + # These add another site package path for each line + touch poetry2nix-editable.pth + ${lib.concatMapStringsSep "\n" + (src: '' + echo "${toString src}" >> poetry2nix-editable.pth + '') + (lib.attrValues editablePackageSources)} - # Create a very simple egg so pkg_resources can find this package - # See https://setuptools.readthedocs.io/en/latest/formats.html for more info on the egg format - mkdir "${name}.egg-info" - cd "${name}.egg-info" - ln -s ${pkgInfoFile} PKG-INFO - ${lib.optionalString (pyProject.tool.poetry ? plugins) '' - ln -s ${entryPointsFile} entry_points.txt - ''} + # Create a very simple egg so pkg_resources can find this package + # See https://setuptools.readthedocs.io/en/latest/formats.html for more info on the egg format + mkdir "${name}.egg-info" + cd "${name}.egg-info" + ln -s ${pkgInfoFile} PKG-INFO + ${lib.optionalString (pyProject.tool.poetry ? plugins) '' + ln -s ${entryPointsFile} entry_points.txt + ''} '' ); in diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix index e248a5e223..6d60df2847 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix @@ -24,7 +24,8 @@ in pyprojectPatchScript = "${./pyproject-without-path.py}"; }; } ./remove-path-dependencies.sh - ) { }; + ) + { }; pipBuildHook = callPackage ( @@ -37,7 +38,8 @@ in inherit pythonInterpreter pythonSitePackages; }; } ./pip-build-hook.sh - ) { }; + ) + { }; poetry2nixFixupHook = callPackage ( @@ -47,7 +49,8 @@ in name = "fixup-hook.sh"; deps = [ ]; } ./fixup-hook.sh - ) { }; + ) + { }; # When the "wheel" package itself is a wheel the nixpkgs hook (which pulls in "wheel") leads to infinite recursion # It doesn't _really_ depend on wheel though, it just copies the wheel. @@ -58,7 +61,8 @@ in name = "wheel-unpack-hook.sh"; deps = [ ]; } ./wheel-unpack-hook.sh - ) { }; + ) + { }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix index bdd30cbffa..6a0ee70f86 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix @@ -156,12 +156,10 @@ let let missingBuildBackendError = "No build-system.build-backend section in pyproject.toml. " + "Add such a section as described in https://python-poetry.org/docs/pyproject/#poetry-and-pep-517"; - buildSystem = lib.attrByPath [ "build-system" "build-backend" ] (throw missingBuildBackendError) pyProject; - drvAttr = moduleName (builtins.elemAt (builtins.split "\\.|:" buildSystem) 0); + requires = lib.attrByPath [ "build-system" "requires" ] (throw missingBuildBackendError) pyProject; + requiredPkgs = builtins.map (n: lib.elemAt (builtins.match "([^!=<>~\[]+).*" n) 0) requires; in - if buildSystem == "" then [ ] else ( - [ pythonPackages.${drvAttr} or (throw "unsupported build system ${buildSystem}") ] - ); + builtins.map (drvAttr: pythonPackages.${drvAttr} or (throw "unsupported build system requirement ${drvAttr}")) requiredPkgs; # Find gitignore files recursively in parent directory stopping with .git findGitIgnores = path: diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 2791d7dfcb..9619e36493 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -3,8 +3,8 @@ , lib , python , buildPythonPackage -, pythonPackages , poetryLib +, evalPep508 }: { name , version @@ -53,9 +53,11 @@ pythonPackages.callPackage pyProjectPath = localDepPath + "/pyproject.toml"; pyProject = poetryLib.readTOML pyProjectPath; in - if builtins.pathExists pyProjectPath then poetryLib.getBuildSystemPkgs { - inherit pythonPackages pyProject; - } else [ ]; + if builtins.pathExists pyProjectPath then + poetryLib.getBuildSystemPkgs + { + inherit pythonPackages pyProject; + } else [ ]; fileInfo = let @@ -127,8 +129,9 @@ pythonPackages.callPackage n: v: let constraints = v.python or ""; + pep508Markers = v.markers or ""; in - compat constraints + compat constraints && evalPep508 pep508Markers ) dependencies ); @@ -150,15 +153,18 @@ pythonPackages.callPackage # Interpreters should declare what wheel types they're compatible with (python type + ABI) # Here we can then choose a file based on that info. src = - if isGit then ( - builtins.fetchGit { - inherit (source) url; - rev = source.reference; - ref = sourceSpec.branch or sourceSpec.rev or sourceSpec.tag or "HEAD"; - } - ) else if isLocal then (poetryLib.cleanPythonSources { src = localDepPath; }) else fetchFromPypi { + if isGit then + ( + builtins.fetchGit { + inherit (source) url; + rev = source.reference; + ref = sourceSpec.branch or sourceSpec.rev or sourceSpec.tag or "HEAD"; + } + ) else if isLocal then (poetryLib.cleanPythonSources { src = localDepPath; }) else + fetchFromPypi { pname = name; inherit (fileInfo) file hash kind; }; } - ) { } + ) +{ } diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index d722ec71b9..ca6c0c7cc4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -68,9 +68,29 @@ self: super: } ); + cairocffi = super.cairocffi.overridePythonAttrs ( + old: { + inherit (pkgs.python3.pkgs.cairocffi) patches; + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + } + ); + + cairosvg = super.cairosvg.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + } + ); + + cssselect2 = super.cssselect2.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + } + ); + cffi = # cffi is bundled with pypy - if self.python.implementation == "pypy" then null else ( + if self.python.implementation == "pypy" then null else + ( super.cffi.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ pkgs.libffi ]; @@ -104,6 +124,13 @@ self: super: } ); + dictdiffer = super.dictdiffer.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ]; + } + ); + django = ( super.django.overridePythonAttrs ( old: { @@ -139,6 +166,24 @@ self: super: # Environment markers are not always included (depending on how a dep was defined) enum34 = if self.pythonAtLeast "3.4" then null else super.enum34; + eth-hash = super.eth-hash.overridePythonAttrs { + preConfigure = '' + substituteInPlace setup.py --replace \'setuptools-markdown\' "" + ''; + }; + + eth-keyfile = super.eth-keyfile.overridePythonAttrs { + preConfigure = '' + substituteInPlace setup.py --replace \'setuptools-markdown\' "" + ''; + }; + + eth-keys = super.eth-keys.overridePythonAttrs { + preConfigure = '' + substituteInPlace setup.py --replace \'setuptools-markdown\' "" + ''; + }; + faker = super.faker.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.pytest-runner ]; @@ -272,6 +317,19 @@ self: super: } ); + # disable the removal of pyproject.toml, required because of setuptools_scm + jaraco-functools = super.jaraco-functools.overridePythonAttrs ( + old: { + dontPreferSetupPy = true; + } + ); + + jsonpickle = super.jsonpickle.overridePythonAttrs ( + old: { + dontPreferSetupPy = true; + } + ); + jupyter = super.jupyter.overridePythonAttrs ( old: rec { # jupyter is a meta-package. Everything relevant comes from the @@ -281,6 +339,17 @@ self: super: } ); + keyring = super.keyring.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ + self.toml + ]; + postPatch = '' + substituteInPlace setup.py --replace 'setuptools.setup()' 'setuptools.setup(version="${old.version}")' + ''; + } + ); + kiwisolver = super.kiwisolver.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ @@ -408,21 +477,33 @@ self: super: ); molecule = - if lib.versionOlder super.molecule.version "3.0.0" then (super.molecule.overridePythonAttrs ( - old: { - patches = (old.patches or [ ]) ++ [ - # Fix build with more recent setuptools versions - (pkgs.fetchpatch { - url = "https://github.com/ansible-community/molecule/commit/c9fee498646a702c77b5aecf6497cff324acd056.patch"; - sha256 = "1g1n45izdz0a3c9akgxx14zhdw6c3dkb48j8pq64n82fa6ndl1b7"; - excludes = [ "pyproject.toml" ]; - }) - ]; + if lib.versionOlder super.molecule.version "3.0.0" then + (super.molecule.overridePythonAttrs ( + old: { + patches = (old.patches or [ ]) ++ [ + # Fix build with more recent setuptools versions + (pkgs.fetchpatch { + url = "https://github.com/ansible-community/molecule/commit/c9fee498646a702c77b5aecf6497cff324acd056.patch"; + sha256 = "1g1n45izdz0a3c9akgxx14zhdw6c3dkb48j8pq64n82fa6ndl1b7"; + excludes = [ "pyproject.toml" ]; + }) + ]; + buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; + } + )) else + super.molecule.overridePythonAttrs (old: { buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; - } - )) else super.molecule.overridePythonAttrs (old: { - buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; - }); + }); + + mongomock = super.mongomock.overridePythonAttrs (oa: { + buildInputs = oa.buildInputs ++ [ self.pbr ]; + }); + + multiaddr = super.multiaddr.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + } + ); netcdf4 = super.netcdf4.overridePythonAttrs ( old: { @@ -456,15 +537,16 @@ self: super: name = "site.cfg"; text = ( lib.generators.toINI - { } { - ${blasImplementation} = { - include_dirs = "${blas}/include"; - library_dirs = "${blas}/lib"; - } // lib.optionalAttrs (blasImplementation == "mkl") { - mkl_libs = "mkl_rt"; - lapack_libs = ""; - }; - } + { } + { + ${blasImplementation} = { + include_dirs = "${blas}/include"; + library_dirs = "${blas}/lib"; + } // lib.optionalAttrs (blasImplementation == "mkl") { + mkl_libs = "mkl_rt"; + lapack_libs = ""; + }; + } ); }; in @@ -516,6 +598,29 @@ self: super: } ); + poetry-core = super.poetry-core.overridePythonAttrs (old: { + # "Vendor" dependencies (for build-system support) + postPatch = '' + echo "import sys" >> poetry/__init__.py + for path in ''${PYTHONPATH//:/ }; do echo $path; done | uniq | while read path; do + echo "sys.path.insert(0, \"$path\")" >> poetry/__init__.py + done + ''; + + # Propagating dependencies leads to issues downstream + # We've already patched poetry to prefer "vendored" dependencies + postFixup = '' + rm $out/nix-support/propagated-build-inputs + ''; + }); + + # disable the removal of pyproject.toml, required because of setuptools_scm + portend = super.portend.overridePythonAttrs ( + old: { + dontPreferSetupPy = true; + } + ); + psycopg2 = super.psycopg2.overridePythonAttrs ( old: { buildInputs = old.buildInputs @@ -533,61 +638,65 @@ self: super: ); pyarrow = - if lib.versionAtLeast super.pyarrow.version "0.16.0" then super.pyarrow.overridePythonAttrs ( - old: - let - parseMinor = drv: lib.concatStringsSep "." (lib.take 2 (lib.splitVersion drv.version)); + if lib.versionAtLeast super.pyarrow.version "0.16.0" then + super.pyarrow.overridePythonAttrs + ( + old: + let + parseMinor = drv: lib.concatStringsSep "." (lib.take 2 (lib.splitVersion drv.version)); - # Starting with nixpkgs revision f149c7030a7, pyarrow takes "python3" as an argument - # instead of "python". Below we inspect function arguments to maintain compatibilitiy. - _arrow-cpp = pkgs.arrow-cpp.override ( - builtins.intersectAttrs - (lib.functionArgs pkgs.arrow-cpp.override) { python = self.python; python3 = self.python; } - ); + # Starting with nixpkgs revision f149c7030a7, pyarrow takes "python3" as an argument + # instead of "python". Below we inspect function arguments to maintain compatibilitiy. + _arrow-cpp = pkgs.arrow-cpp.override ( + builtins.intersectAttrs + (lib.functionArgs pkgs.arrow-cpp.override) + { python = self.python; python3 = self.python; } + ); - ARROW_HOME = _arrow-cpp; - arrowCppVersion = parseMinor pkgs.arrow-cpp; - pyArrowVersion = parseMinor super.pyarrow; - errorMessage = "arrow-cpp version (${arrowCppVersion}) mismatches pyarrow version (${pyArrowVersion})"; - in - if arrowCppVersion != pyArrowVersion then throw errorMessage else { + ARROW_HOME = _arrow-cpp; + arrowCppVersion = parseMinor pkgs.arrow-cpp; + pyArrowVersion = parseMinor super.pyarrow; + errorMessage = "arrow-cpp version (${arrowCppVersion}) mismatches pyarrow version (${pyArrowVersion})"; + in + if arrowCppVersion != pyArrowVersion then throw errorMessage else { - nativeBuildInputs = old.nativeBuildInputs ++ [ - self.cython - pkgs.pkgconfig - pkgs.cmake - ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ + self.cython + pkgs.pkgconfig + pkgs.cmake + ]; - preBuild = '' - export PYARROW_PARALLEL=$NIX_BUILD_CORES - ''; + preBuild = '' + export PYARROW_PARALLEL=$NIX_BUILD_CORES + ''; - PARQUET_HOME = _arrow-cpp; - inherit ARROW_HOME; + PARQUET_HOME = _arrow-cpp; + inherit ARROW_HOME; - buildInputs = old.buildInputs ++ [ - pkgs.arrow-cpp - ]; + buildInputs = old.buildInputs ++ [ + pkgs.arrow-cpp + ]; - PYARROW_BUILD_TYPE = "release"; - PYARROW_WITH_PARQUET = true; - PYARROW_CMAKE_OPTIONS = [ - "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" + PYARROW_BUILD_TYPE = "release"; + PYARROW_WITH_PARQUET = true; + PYARROW_CMAKE_OPTIONS = [ + "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" - # This doesn't use setup hook to call cmake so we need to workaround #54606 - # ourselves - "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" - ]; + # This doesn't use setup hook to call cmake so we need to workaround #54606 + # ourselves + "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" + ]; - dontUseCmakeConfigure = true; - } - ) else super.pyarrow.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ - self.cython - ]; - } - ); + dontUseCmakeConfigure = true; + } + ) else + super.pyarrow.overridePythonAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + self.cython + ]; + } + ); pycairo = ( drv: ( @@ -647,20 +756,22 @@ self: super: # Tests fail because of no audio device and display. doCheck = false; preConfigure = '' - sed \ - -e "s/origincdirs = .*/origincdirs = []/" \ - -e "s/origlibdirs = .*/origlibdirs = []/" \ - -e "/'\/lib\/i386-linux-gnu', '\/lib\/x86_64-linux-gnu']/d" \ - -e "/\/include\/smpeg/d" \ - -i buildconfig/config_unix.py - ${lib.concatMapStrings (dep: '' - sed \ - -e "/origincdirs =/a\ origincdirs += ['${lib.getDev dep}/include']" \ - -e "/origlibdirs =/a\ origlibdirs += ['${lib.getLib dep}/lib']" \ - -i buildconfig/config_unix.py - '') buildInputs - } - LOCALBASE=/ ${self.python.interpreter} buildconfig/config.py + sed \ + -e "s/origincdirs = .*/origincdirs = []/" \ + -e "s/origlibdirs = .*/origlibdirs = []/" \ + -e "/'\/lib\/i386-linux-gnu', '\/lib\/x86_64-linux-gnu']/d" \ + -e "/\/include\/smpeg/d" \ + -i buildconfig/config_unix.py + ${lib.concatMapStrings + (dep: '' + sed \ + -e "/origincdirs =/a\ origincdirs += ['${lib.getDev dep}/include']" \ + -e "/origlibdirs =/a\ origlibdirs += ['${lib.getLib dep}/lib']" \ + -i buildconfig/config_unix.py + '') + buildInputs + } + LOCALBASE=/ ${self.python.interpreter} buildconfig/config.py ''; } ); @@ -884,6 +995,12 @@ self: super: } ); + rlp = super.rlp.overridePythonAttrs { + preConfigure = '' + substituteInPlace setup.py --replace \'setuptools-markdown\' "" + ''; + }; + scipy = super.scipy.overridePythonAttrs ( old: if old.format != "wheel" then { @@ -927,13 +1044,14 @@ self: super: ); shellingham = - if lib.versionAtLeast super.shellingham.version "1.3.2" then ( - super.shellingham.overridePythonAttrs ( - old: { - format = "pyproject"; - } - ) - ) else super.shellingham; + if lib.versionAtLeast super.shellingham.version "1.3.2" then + ( + super.shellingham.overridePythonAttrs ( + old: { + format = "pyproject"; + } + ) + ) else super.shellingham; tables = super.tables.overridePythonAttrs ( old: { @@ -943,6 +1061,13 @@ self: super: } ); + # disable the removal of pyproject.toml, required because of setuptools_scm + tempora = super.tempora.overridePythonAttrs ( + old: { + dontPreferSetupPy = true; + } + ); + tensorflow = super.tensorflow.overridePythonAttrs ( old: { postInstall = '' @@ -959,6 +1084,12 @@ self: super: } ); + tinycss2 = super.tinycss2.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + } + ); + # nix uses a dash, poetry uses an underscore typing_extensions = super.typing_extensions or self.typing-extensions; @@ -1004,6 +1135,20 @@ self: super: python = self.python; }).wheel; }; + + weasyprint = super.weasyprint.overridePythonAttrs ( + old: { + inherit (pkgs.python3.pkgs.weasyprint) patches; + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + } + ); + + web3 = super.web3.overridePythonAttrs { + preConfigure = '' + substituteInPlace setup.py --replace \'setuptools-markdown\' "" + ''; + }; + wheel = let isWheel = super.wheel.src.isWheel or false; @@ -1026,9 +1171,10 @@ self: super: in if isWheel then wheelPackage else sourcePackage; - zipp = - ( - if lib.versionAtLeast super.zipp.version "2.0.0" then ( + zipp = if super.zipp == null then null else + ( + if lib.versionAtLeast super.zipp.version "2.0.0" then + ( super.zipp.overridePythonAttrs ( old: { prePatch = '' @@ -1039,12 +1185,12 @@ self: super: } ) ) else super.zipp - ).overridePythonAttrs ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - self.toml - ]; - } - ); + ).overridePythonAttrs ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.toml + ]; + } + ); } diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix index ffa78c5dc0..d32e3aacce 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix @@ -71,12 +71,13 @@ let withPython = ver: abi: x: (isPyVersionCompatible ver x.pyVer) && (isPyAbiCompatible abi x.abi); withPlatform = if isLinux - then ( - x: x.platform == "manylinux1_${stdenv.platform.kernelArch}" - || x.platform == "manylinux2010_${stdenv.platform.kernelArch}" - || x.platform == "manylinux2014_${stdenv.platform.kernelArch}" - || x.platform == "any" - ) + then + ( + x: x.platform == "manylinux1_${stdenv.platform.kernelArch}" + || x.platform == "manylinux2010_${stdenv.platform.kernelArch}" + || x.platform == "manylinux2014_${stdenv.platform.kernelArch}" + || x.platform == "any" + ) else (x: hasInfix "macosx" x.platform || x.platform == "any"); filterWheel = x: let diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix index fad0b782c4..ba8145398f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix @@ -8,35 +8,38 @@ let # Strip leading/trailing whitespace from string stripStr = s: lib.elemAt (builtins.split "^ *" (lib.elemAt (builtins.split " *$" s) 0)) 2; findSubExpressionsFun = acc: c: ( - if c == "(" then ( - let - posNew = acc.pos + 1; - isOpen = acc.openP == 0; - startPos = if isOpen then posNew else acc.startPos; - in - acc // { - inherit startPos; - exprs = acc.exprs ++ [ (substr acc.exprPos (acc.pos - 1) acc.expr) ]; - pos = posNew; - openP = acc.openP + 1; - } - ) else if c == ")" then ( - let - openP = acc.openP - 1; - exprs = findSubExpressions (substr acc.startPos acc.pos acc.expr); - in - acc // { - inherit openP; - pos = acc.pos + 1; - exprs = if openP == 0 then acc.exprs ++ [ exprs ] else acc.exprs; - exprPos = if openP == 0 then acc.pos + 1 else acc.exprPos; - } - ) else acc // { pos = acc.pos + 1; } + if c == "(" then + ( + let + posNew = acc.pos + 1; + isOpen = acc.openP == 0; + startPos = if isOpen then posNew else acc.startPos; + in + acc // { + inherit startPos; + exprs = acc.exprs ++ [ (substr acc.exprPos (acc.pos - 1) acc.expr) ]; + pos = posNew; + openP = acc.openP + 1; + } + ) else if c == ")" then + ( + let + openP = acc.openP - 1; + exprs = findSubExpressions (substr acc.startPos acc.pos acc.expr); + in + acc // { + inherit openP; + pos = acc.pos + 1; + exprs = if openP == 0 then acc.exprs ++ [ exprs ] else acc.exprs; + exprPos = if openP == 0 then acc.pos + 1 else acc.exprPos; + } + ) else acc // { pos = acc.pos + 1; } ); # Make a tree out of expression groups (parens) - findSubExpressions = expr: + findSubExpressions = expr': let + expr = " " + expr'; acc = builtins.foldl' findSubExpressionsFun { @@ -113,7 +116,7 @@ let python_full_version = python.version; implementation_name = python.implementation; implementation_version = python.version; - extra = ""; + # extra = ""; }; substituteVar = value: if builtins.hasAttr value variables then (builtins.toJSON variables."${value}") else value; processVar = value: builtins.foldl' (acc: v: v acc) value [ @@ -121,26 +124,28 @@ let substituteVar ]; in - if builtins.typeOf exprs == "set" then ( - if exprs.type == "expr" then ( - let - mVal = ''[a-zA-Z0-9\'"_\. ]+''; - mOp = "in|[!=<>]+"; - e = stripStr exprs.value; - m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e); - in - { - type = "expr"; - value = { - op = builtins.elemAt m 1; - values = [ - (processVar (builtins.elemAt m 0)) - (processVar (builtins.elemAt m 2)) - ]; - }; - } - ) else exprs - ) else builtins.map transformExpressions exprs; + if builtins.typeOf exprs == "set" then + ( + if exprs.type == "expr" then + ( + let + mVal = ''[a-zA-Z0-9\'"_\. ]+''; + mOp = "in|[!=<>]+"; + e = stripStr exprs.value; + m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e); + m0 = processVar (builtins.elemAt m 0); + m2 = processVar (builtins.elemAt m 2); + in + { + type = "expr"; + value = { + # HACK: We don't know extra at eval time, so we assume the expression is always true + op = if m0 == "extra" then "true" else builtins.elemAt m 1; + values = [ m0 m2 ]; + }; + } + ) else exprs + ) else builtins.map transformExpressions exprs; # Recursively eval all expressions evalExpressions = exprs: @@ -153,6 +158,7 @@ let ); hasElem = needle: haystack: builtins.elem needle (builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " haystack)); op = { + "true" = x: y: true; "<=" = x: y: (unmarshal x) <= (unmarshal y); "<" = x: y: (unmarshal x) < (unmarshal y); "!=" = x: y: x != y; @@ -177,18 +183,20 @@ let builtins.elem (unmarshal x) values; }; in - if builtins.typeOf exprs == "set" then ( - if exprs.type == "expr" then ( - let - expr = exprs; - result = (op."${expr.value.op}") (builtins.elemAt expr.value.values 0) (builtins.elemAt expr.value.values 1); - in - { - type = "value"; - value = result; - } - ) else exprs - ) else builtins.map evalExpressions exprs; + if builtins.typeOf exprs == "set" then + ( + if exprs.type == "expr" then + ( + let + expr = exprs; + result = (op."${expr.value.op}") (builtins.elemAt expr.value.values 0) (builtins.elemAt expr.value.values 1); + in + { + type = "value"; + value = result; + } + ) else exprs + ) else builtins.map evalExpressions exprs; # Now that we have performed an eval all that's left to do is to concat the graph into a single bool reduceExpressions = exprs: @@ -198,30 +206,34 @@ let "or" = x: y: x || y; }; reduceExpressionsFun = acc: v: ( - if builtins.typeOf v == "set" then ( - if v.type == "value" then ( + if builtins.typeOf v == "set" then + ( + if v.type == "value" then + ( + acc // { + value = cond."${acc.cond}" acc.value v.value; + } + ) else if v.type == "bool" then + ( + acc // { + cond = v.value; + } + ) else throw "Unsupported type" + ) else if builtins.typeOf v == "list" then + ( + let + ret = builtins.foldl' + reduceExpressionsFun + { + value = true; + cond = "and"; + } + v; + in acc // { - value = cond."${acc.cond}" acc.value v.value; - } - ) else if v.type == "bool" then ( - acc // { - cond = v.value; + value = cond."${acc.cond}" acc.value ret.value; } ) else throw "Unsupported type" - ) else if builtins.typeOf v == "list" then ( - let - ret = builtins.foldl' - reduceExpressionsFun - { - value = true; - cond = "and"; - } - v; - in - acc // { - value = cond."${acc.cond}" acc.value ret.value; - } - ) else throw "Unsupported type" ); in ( diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix index d06a1c1d6a..f93eb119b2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix @@ -14,12 +14,18 @@ poetry2nix.mkPoetryApplication { # "Vendor" dependencies (for build-system support) postPatch = '' + echo "import sys" >> poetry/__init__.py for path in ''${PYTHONPATH//:/ }; do echo $path; done | uniq | while read path; do echo "sys.path.insert(0, \"$path\")" >> poetry/__init__.py done ''; postInstall = '' + # Figure out the location of poetry.core + # As poetry.core is using the same root import name as the poetry package and the python module system wont look for the root + # in the separate second location we need to link poetry.core to poetry + ln -s $(python -c 'import poetry.core; import os.path; print(os.path.dirname(poetry.core.__file__))') $out/${python.sitePackages}/poetry/core + mkdir -p "$out/share/bash-completion/completions" "$out/bin/poetry" completions bash > "$out/share/bash-completion/completions/poetry" mkdir -p "$out/share/zsh/vendor-completions" diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock index 1ec0c9260d..973733a6d6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock @@ -1,430 +1,279 @@ [[package]] -category = "dev" -description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." name = "appdirs" +version = "1.4.4" +description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." +category = "main" optional = false python-versions = "*" -version = "1.4.4" [[package]] -category = "dev" -description = "A few extensions to pyyaml." -name = "aspy.yaml" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "1.3.0" - -[package.dependencies] -pyyaml = "*" - -[[package]] -category = "dev" -description = "Atomic file writes." -marker = "python_version >= \"3.5\" and sys_platform == \"win32\" or python_version < \"3.5\"" name = "atomicwrites" +version = "1.4.0" +description = "Atomic file writes." +category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "1.4.0" [[package]] -category = "main" -description = "Classes Without Boilerplate" name = "attrs" +version = "20.2.0" +description = "Classes Without Boilerplate" +category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "19.3.0" [package.extras] -azure-pipelines = ["coverage", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "pytest-azurepipelines"] -dev = ["coverage", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "sphinx", "pre-commit"] -docs = ["sphinx", "zope.interface"] -tests = ["coverage", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"] +dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "sphinx", "sphinx-rtd-theme", "pre-commit"] +docs = ["sphinx", "sphinx-rtd-theme", "zope.interface"] +tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"] +tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six"] [[package]] -category = "dev" -description = "Backport of functools.lru_cache" -marker = "python_version < \"3.2\"" name = "backports.functools-lru-cache" +version = "1.6.1" +description = "Backport of functools.lru_cache" +category = "dev" optional = false python-versions = ">=2.6" -version = "1.6.1" [package.extras] docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov"] [[package]] -category = "dev" -description = "The uncompromising code formatter." -marker = "python_version >= \"3.6\" and python_version < \"4.0\"" -name = "black" -optional = false -python-versions = ">=3.6" -version = "19.10b0" - -[package.dependencies] -appdirs = "*" -attrs = ">=18.1.0" -click = ">=6.5" -pathspec = ">=0.6,<1" -regex = "*" -toml = ">=0.9.4" -typed-ast = ">=1.4.0" - -[package.extras] -d = ["aiohttp (>=3.3.2)", "aiohttp-cors"] - -[[package]] -category = "main" -description = "httplib2 caching for requests" name = "cachecontrol" +version = "0.12.6" +description = "httplib2 caching for requests" +category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "0.12.6" [package.dependencies] +lockfile = {version = ">=0.9", optional = true, markers = "extra == \"filecache\""} msgpack = ">=0.5.2" requests = "*" -[package.dependencies.lockfile] -optional = true -version = ">=0.9" - [package.extras] filecache = ["lockfile (>=0.9)"] redis = ["redis (>=2.10.5)"] [[package]] -category = "main" -description = "Cachy provides a simple yet effective caching library." name = "cachy" +version = "0.3.0" +description = "Cachy provides a simple yet effective caching library." +category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "0.3.0" [package.extras] +redis = ["redis (>=3.3.6,<4.0.0)"] memcached = ["python-memcached (>=1.59,<2.0)"] msgpack = ["msgpack-python (>=0.5,<0.6)"] -redis = ["redis (>=3.3.6,<4.0.0)"] [[package]] -category = "main" -description = "Python package for providing Mozilla's CA Bundle." name = "certifi" +version = "2020.6.20" +description = "Python package for providing Mozilla's CA Bundle." +category = "main" optional = false python-versions = "*" -version = "2020.6.20" [[package]] -category = "main" -description = "Foreign Function Interface for Python calling C code." -marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.4\" and python_version < \"3.5\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.5\" and python_version < \"4.0\" and sys_platform == \"linux\"" name = "cffi" +version = "1.14.3" +description = "Foreign Function Interface for Python calling C code." +category = "main" optional = false python-versions = "*" -version = "1.14.0" [package.dependencies] pycparser = "*" [[package]] -category = "dev" -description = "Validate configuration and produce human readable error messages." name = "cfgv" +version = "3.2.0" +description = "Validate configuration and produce human readable error messages." +category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "2.0.1" - -[package.dependencies] -six = "*" +python-versions = ">=3.6.1" [[package]] -category = "main" -description = "Universal encoding detector for Python 2 and 3" name = "chardet" +version = "3.0.4" +description = "Universal encoding detector for Python 2 and 3" +category = "main" optional = false python-versions = "*" -version = "3.0.4" [[package]] -category = "main" -description = "Cleo allows you to create beautiful and testable command-line interfaces." name = "cleo" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "0.7.6" - -[package.dependencies] -clikit = ">=0.4.0,<0.5.0" - -[[package]] -category = "dev" -description = "Composable command line interface toolkit" -marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" and python_full_version >= \"2.7.9\" and python_full_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\" and python_full_version >= \"2.7.9\" and python_full_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\" or python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.6\" and python_version < \"4.0\"" -name = "click" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -version = "7.1.2" - -[[package]] -category = "dev" -description = "Composable command line interface toolkit" -marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" and python_full_version >= \"2.7.9\" and python_full_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\" and python_full_version >= \"2.7.9\" and python_full_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" -name = "click" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "7.0" - -[[package]] +version = "0.8.1" +description = "Cleo allows you to create beautiful and testable command-line interfaces." category = "main" -description = "CliKit is a group of utilities to build beautiful and testable command line interfaces." -name = "clikit" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "0.4.3" [package.dependencies] +clikit = ">=0.6.0,<0.7.0" + +[[package]] +name = "clikit" +version = "0.6.2" +description = "CliKit is a group of utilities to build beautiful and testable command line interfaces." +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[package.dependencies] +crashtest = {version = ">=0.3.0,<0.4.0", markers = "python_version >= \"3.6\" and python_version < \"4.0\""} +enum34 = {version = ">=1.1,<2.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\""} pastel = ">=0.2.0,<0.3.0" pylev = ">=1.3,<2.0" - -[package.dependencies.enum34] -python = ">=2.7,<2.8" -version = ">=1.1,<2.0" - -[package.dependencies.typing] -python = ">=2.7,<2.8 || >=3.4,<3.5" -version = ">=3.6,<4.0" - -[package.dependencies.typing-extensions] -python = ">=3.5.0,<3.5.4" -version = ">=3.6,<4.0" +typing = {version = ">=3.6,<4.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\""} +typing-extensions = {version = ">=3.6,<4.0", markers = "python_version >= \"3.5\" and python_full_version < \"3.5.4\""} [[package]] -category = "dev" -description = "Cross-platform colored terminal text." -marker = "sys_platform == \"win32\" and python_version == \"3.4\"" name = "colorama" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "0.4.1" - -[[package]] -category = "dev" +version = "0.4.3" description = "Cross-platform colored terminal text." -marker = "sys_platform == \"win32\" and python_version != \"3.4\" and python_version < \"3.5\" or platform_system == \"Windows\" or python_version >= \"3.5\" and sys_platform == \"win32\"" -name = "colorama" +category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -version = "0.4.3" [[package]] -category = "main" -description = "Updated configparser from Python 3.7 for Python 2.6+." -marker = "python_version == \"2.7\" and python_version == \"2.7\" or python_version < \"3\"" name = "configparser" +version = "4.0.2" +description = "Updated configparser from Python 3.7 for Python 2.6+." +category = "main" optional = false python-versions = ">=2.6" -version = "4.0.2" [package.extras] docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2)", "pytest-flake8", "pytest-black-multipy"] [[package]] -category = "main" -description = "Backports and enhancements for the contextlib module" -marker = "python_version < \"3.4\"" name = "contextlib2" +version = "0.6.0.post1" +description = "Backports and enhancements for the contextlib module" +category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "0.6.0.post1" [[package]] -category = "dev" -description = "Code coverage measurement for Python" name = "coverage" -optional = false -python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, <4" -version = "4.5.4" - -[[package]] -category = "dev" +version = "5.3" description = "Code coverage measurement for Python" -name = "coverage" +category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" -version = "5.2" [package.extras] toml = ["toml"] [[package]] +name = "crashtest" +version = "0.3.1" +description = "Manage Python errors with ease" category = "main" -description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." -marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.4\" and python_version < \"3.5\" and (sys_platform == \"linux2\" or sys_platform == \"linux\")" -name = "cryptography" optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" -version = "2.8" - -[package.dependencies.enum34] -python = "<3" -version = "*" - -[package.dependencies.ipaddress] -python = "<3" -version = "*" - -[package.dependencies] -cffi = ">=1.8,<1.11.3 || >1.11.3" -six = ">=1.4.1" - -[package.extras] -docs = ["sphinx (>=1.6.5,<1.8.0 || >1.8.0)", "sphinx-rtd-theme"] -docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"] -idna = ["idna (>=2.1)"] -pep8test = ["flake8", "flake8-import-order", "pep8-naming"] -test = ["pytest (>=3.6.0,<3.9.0 || >3.9.0,<3.9.1 || >3.9.1,<3.9.2 || >3.9.2)", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,<3.79.2 || >3.79.2)"] +python-versions = ">=3.6,<4.0" [[package]] -category = "main" -description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." -marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.4\" and python_version < \"3.5\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.5\" and python_version < \"4.0\" and sys_platform == \"linux\"" name = "cryptography" +version = "3.1.1" +description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." +category = "main" optional = false python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*" -version = "3.0" [package.dependencies] cffi = ">=1.8,<1.11.3 || >1.11.3" +enum34 = {version = "*", markers = "python_version < \"3\""} +ipaddress = {version = "*", markers = "python_version < \"3\""} six = ">=1.4.1" -[package.dependencies.enum34] -python = "<3" -version = "*" - -[package.dependencies.ipaddress] -python = "<3" -version = "*" - [package.extras] docs = ["sphinx (>=1.6.5,<1.8.0 || >1.8.0,<3.1.0 || >3.1.0,<3.1.1 || >3.1.1)", "sphinx-rtd-theme"] docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"] -idna = ["idna (>=2.1)"] pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"] ssh = ["bcrypt (>=3.1.5)"] test = ["pytest (>=3.6.0,<3.9.0 || >3.9.0,<3.9.1 || >3.9.1,<3.9.2 || >3.9.2)", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,<3.79.2 || >3.79.2)"] [[package]] -category = "dev" -description = "Distribution utilities" name = "distlib" +version = "0.3.1" +description = "Distribution utilities" +category = "main" optional = false python-versions = "*" -version = "0.3.1" [[package]] -category = "main" -description = "Discover and load entry points from installed packages." -marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\"" name = "entrypoints" +version = "0.3" +description = "Discover and load entry points from installed packages." +category = "main" optional = false python-versions = ">=2.7" -version = "0.3" [package.dependencies] -[package.dependencies.configparser] -python = ">=2.7,<2.8" -version = ">=3.5" +configparser = {version = ">=3.5", markers = "python_version == \"2.7\""} [[package]] -category = "main" -description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4" -marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\")" name = "enum34" -optional = false -python-versions = "*" version = "1.1.10" - -[[package]] -category = "dev" -description = "A platform independent file lock." -name = "filelock" -optional = false -python-versions = "*" -version = "3.0.12" - -[[package]] -category = "dev" -description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+" -marker = "python_version < \"3.0\"" -name = "funcsigs" -optional = false -python-versions = "*" -version = "1.0.2" - -[[package]] +description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4" category = "main" -description = "Backport of the functools module from Python 3.2.3 for use on 2.7 and PyPy." -marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version < \"3\"" -name = "functools32" optional = false python-versions = "*" -version = "3.2.3-2" [[package]] -category = "dev" -description = "Clean single-source support for Python 3 and 2" -marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" -name = "future" +name = "filelock" +version = "3.0.12" +description = "A platform independent file lock." +category = "main" optional = false -python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" -version = "0.18.2" +python-versions = "*" [[package]] +name = "funcsigs" +version = "1.0.2" +description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+" category = "dev" -description = "Backport of the concurrent.futures package from Python 3" -marker = "python_version < \"3.2\"" +optional = false +python-versions = "*" + +[[package]] +name = "functools32" +version = "3.2.3-2" +description = "Backport of the functools module from Python 3.2.3 for use on 2.7 and PyPy." +category = "main" +optional = false +python-versions = "*" + +[[package]] name = "futures" +version = "3.3.0" +description = "Backport of the concurrent.futures package from Python 3" +category = "main" optional = false python-versions = ">=2.6, <3" -version = "3.3.0" [[package]] -category = "main" -description = "Version of the glob module that can capture patterns and supports recursive wildcards" -marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\"" name = "glob2" -optional = false -python-versions = "*" version = "0.6" - -[[package]] +description = "Version of the glob module that can capture patterns and supports recursive wildcards" category = "main" -description = "HTML parser based on the WHATWG HTML specification" -name = "html5lib" optional = false python-versions = "*" -version = "1.0.1" - -[package.dependencies] -six = ">=1.9" -webencodings = "*" - -[package.extras] -all = ["genshi", "chardet (>=2.2)", "datrie", "lxml"] -chardet = ["chardet (>=2.2)"] -datrie = ["datrie"] -genshi = ["genshi"] -lxml = ["lxml"] [[package]] -category = "main" -description = "HTML parser based on the WHATWG HTML specification" name = "html5lib" +version = "1.1" +description = "HTML parser based on the WHATWG HTML specification" +category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -version = "1.1" [package.dependencies] six = ">=1.9" @@ -437,841 +286,402 @@ genshi = ["genshi"] lxml = ["lxml"] [[package]] -category = "dev" -description = "HTTP client mock for Python" name = "httpretty" +version = "0.9.7" +description = "HTTP client mock for Python" +category = "dev" optional = false python-versions = "*" -version = "0.9.7" [package.dependencies] six = "*" [[package]] -category = "dev" -description = "File identification library for Python" name = "identify" +version = "1.5.5" +description = "File identification library for Python" +category = "dev" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" -version = "1.4.24" [package.extras] license = ["editdistance"] [[package]] -category = "main" -description = "Internationalized Domain Names in Applications (IDNA)" name = "idna" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "2.8" - -[[package]] -category = "main" -description = "Internationalized Domain Names in Applications (IDNA)" -name = "idna" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" version = "2.10" +description = "Internationalized Domain Names in Applications (IDNA)" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] -category = "main" -description = "Read metadata from Python packages" name = "importlib-metadata" +version = "1.7.0" +description = "Read metadata from Python packages" +category = "main" optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" -version = "1.1.3" +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" [package.dependencies] +configparser = {version = ">=3.5", markers = "python_version < \"3\""} +contextlib2 = {version = "*", markers = "python_version < \"3\""} +pathlib2 = {version = "*", markers = "python_version < \"3\""} zipp = ">=0.5" -[package.dependencies.configparser] -python = "<3" -version = ">=3.5" - -[package.dependencies.contextlib2] -python = "<3" -version = "*" - [package.extras] docs = ["sphinx", "rst.linker"] -testing = ["packaging", "importlib-resources"] +testing = ["packaging", "pep517", "importlib-resources (>=1.3)"] [[package]] -category = "dev" -description = "Read resources from Python packages" -marker = "python_version < \"3.7\"" name = "importlib-resources" -optional = false -python-versions = ">=2.7,!=3.0,!=3.1,!=3.2,!=3.3" -version = "1.0.2" - -[package.dependencies] -[package.dependencies.typing] -python = "<3.5" -version = "*" - -[[package]] -category = "dev" +version = "3.0.0" description = "Read resources from Python packages" -marker = "python_version < \"3.7\"" -name = "importlib-resources" +category = "main" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" -version = "3.0.0" [package.dependencies] -[package.dependencies.contextlib2] -python = "<3" -version = "*" - -[package.dependencies.pathlib2] -python = "<3" -version = "*" - -[package.dependencies.singledispatch] -python = "<3.4" -version = "*" - -[package.dependencies.typing] -python = "<3.5" -version = "*" - -[package.dependencies.zipp] -python = "<3.8" -version = ">=0.4" +contextlib2 = {version = "*", markers = "python_version < \"3\""} +pathlib2 = {version = "*", markers = "python_version < \"3\""} +singledispatch = {version = "*", markers = "python_version < \"3.4\""} +typing = {version = "*", markers = "python_version < \"3.5\""} +zipp = {version = ">=0.4", markers = "python_version < \"3.8\""} [package.extras] docs = ["sphinx", "rst.linker", "jaraco.packaging"] [[package]] -category = "main" -description = "IPv4/IPv6 manipulation library" -marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\")" name = "ipaddress" +version = "1.0.23" +description = "IPv4/IPv6 manipulation library" +category = "main" optional = false python-versions = "*" -version = "1.0.23" [[package]] -category = "main" -description = "Low-level, pure Python DBus protocol wrapper." -marker = "python_version >= \"3.5\" and python_version < \"4.0\" and sys_platform == \"linux\"" name = "jeepney" +version = "0.4.3" +description = "Low-level, pure Python DBus protocol wrapper." +category = "main" optional = false python-versions = ">=3.5" -version = "0.4.3" [package.extras] dev = ["testpath"] [[package]] -category = "dev" -description = "A very fast and expressive template engine." -marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" and python_full_version >= \"2.7.9\" and python_full_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\" and python_full_version >= \"2.7.9\" and python_full_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" -name = "jinja2" -optional = false -python-versions = "*" -version = "2.10.3" - -[package.dependencies] -MarkupSafe = ">=0.23" - -[package.extras] -i18n = ["Babel (>=0.8)"] - -[[package]] -category = "dev" -description = "A very fast and expressive template engine." -marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" and python_full_version >= \"2.7.9\" and python_full_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\" and python_full_version >= \"2.7.9\" and python_full_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\" or python_version >= \"2.7.9\" and python_version < \"2.8.0\"" -name = "jinja2" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -version = "2.11.2" - -[package.dependencies] -MarkupSafe = ">=0.23" - -[package.extras] -i18n = ["Babel (>=0.8)"] - -[[package]] -category = "dev" -description = "Lightweight pipelining: using Python functions as pipeline jobs." -marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" -name = "joblib" -optional = false -python-versions = "*" -version = "0.14.1" - -[[package]] -category = "main" -description = "An implementation of JSON Schema validation for Python" -name = "jsonschema" -optional = false -python-versions = "*" -version = "3.2.0" - -[package.dependencies] -attrs = ">=17.4.0" -pyrsistent = ">=0.14.0" -setuptools = "*" -six = ">=1.11.0" - -[package.dependencies.functools32] -python = "<3" -version = "*" - -[package.dependencies.importlib-metadata] -python = "<3.8" -version = "*" - -[package.extras] -format = ["idna", "jsonpointer (>1.13)", "rfc3987", "strict-rfc3339", "webcolors"] -format_nongpl = ["idna", "jsonpointer (>1.13)", "webcolors", "rfc3986-validator (>0.1.0)", "rfc3339-validator"] - -[[package]] -category = "main" -description = "Store and access your passwords safely." -marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\"" name = "keyring" +version = "18.0.1" +description = "Store and access your passwords safely." +category = "main" optional = false python-versions = ">=2.7" -version = "18.0.1" [package.dependencies] entrypoints = "*" -pywin32-ctypes = "<0.1.0 || >0.1.0,<0.1.1 || >0.1.1" - -[package.dependencies.secretstorage] -python = "<3.5" -version = "<3" +pywin32-ctypes = {version = "<0.1.0 || >0.1.0,<0.1.1 || >0.1.1", markers = "sys_platform == \"win32\""} +secretstorage = {version = "<3", markers = "(sys_platform == \"linux2\" or sys_platform == \"linux\") and python_version < \"3.5\""} [package.extras] docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs", "pytest-flake8"] [[package]] -category = "main" -description = "Store and access your passwords safely." -marker = "python_version >= \"3.5\" and python_version < \"4.0\"" name = "keyring" +version = "20.0.1" +description = "Store and access your passwords safely." +category = "main" optional = false python-versions = ">=3.5" -version = "20.0.1" [package.dependencies] -pywin32-ctypes = "<0.1.0 || >0.1.0,<0.1.1 || >0.1.1" -secretstorage = "*" - -[package.dependencies.importlib-metadata] -python = "<3.8" -version = "*" +importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} +pywin32-ctypes = {version = "<0.1.0 || >0.1.0,<0.1.1 || >0.1.1", markers = "sys_platform == \"win32\""} +secretstorage = {version = "*", markers = "sys_platform == \"linux\""} [package.extras] docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov"] [[package]] -category = "dev" -description = "Python LiveReload is an awesome tool for web developers" -marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" and python_full_version >= \"2.7.9\" and python_full_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\" and python_full_version >= \"2.7.9\" and python_full_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\" or python_version >= \"2.7.9\" and python_version < \"2.8.0\"" -name = "livereload" -optional = false -python-versions = "*" -version = "2.6.2" - -[package.dependencies] -six = "*" - -[[package.dependencies.tornado]] -python = ">=2.7,<2.8" -version = "<6" - -[[package.dependencies.tornado]] -python = ">=2.8" -version = "*" - -[[package]] +name = "keyring" +version = "21.4.0" +description = "Store and access your passwords safely." category = "main" -description = "Platform-independent file locking module" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} +jeepney = {version = ">=0.4.2", markers = "sys_platform == \"linux\""} +pywin32-ctypes = {version = "<0.1.0 || >0.1.0,<0.1.1 || >0.1.1", markers = "sys_platform == \"win32\""} +SecretStorage = {version = ">=3", markers = "sys_platform == \"linux\""} + +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] +testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black (>=0.3.7)", "pytest-cov", "pytest-mypy"] + +[[package]] name = "lockfile" -optional = false -python-versions = "*" version = "0.12.2" - -[[package]] -category = "dev" -description = "A Python implementation of Lunr.js" -marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" -name = "lunr" +description = "Platform-independent file locking module" +category = "main" optional = false python-versions = "*" -version = "0.5.8" - -[package.dependencies] -future = ">=0.16.0" -six = ">=1.11.0" - -[package.dependencies.nltk] -optional = true -python = ">=2.8" -version = ">=3.2.5" - -[package.extras] -languages = ["nltk (>=3.2.5,<3.5)", "nltk (>=3.2.5)"] [[package]] -category = "dev" -description = "Python implementation of Markdown." -name = "markdown" -optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" -version = "3.0.1" - -[[package]] -category = "dev" -description = "Python implementation of Markdown." -name = "markdown" -optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*" -version = "3.1.1" - -[package.dependencies] -setuptools = ">=36" - -[package.extras] -testing = ["coverage", "pyyaml"] - -[[package]] -category = "dev" -description = "Python implementation of Markdown." -name = "markdown" -optional = false -python-versions = ">=3.5" -version = "3.2.2" - -[package.dependencies] -[package.dependencies.importlib-metadata] -python = "<3.8" -version = "*" - -[package.extras] -testing = ["coverage", "pyyaml"] - -[[package]] -category = "dev" -description = "This is an extension to Python-Markdown which provides an \"include\" function, similar to that found in LaTeX (and also the C pre-processor and Fortran). I originally wrote it for my FORD Fortran auto-documentation generator." -name = "markdown-include" -optional = false -python-versions = "*" -version = "0.5.1" - -[package.dependencies] -markdown = "*" - -[[package]] -category = "dev" -description = "Safely add untrusted strings to HTML/XML markup." -marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" and python_full_version >= \"2.7.9\" and python_full_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\" and python_full_version >= \"2.7.9\" and python_full_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\" or python_version >= \"2.7.9\" and python_version < \"2.8.0\"" -name = "markupsafe" -optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" -version = "1.1.1" - -[[package]] -category = "dev" -description = "Project documentation with Markdown." -marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" -name = "mkdocs" -optional = false -python-versions = ">=2.7.9,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" -version = "1.0.4" - -[package.dependencies] -Jinja2 = ">=2.7.1" -Markdown = ">=2.3.1" -PyYAML = ">=3.10" -click = ">=3.3" -livereload = ">=2.5.1" -tornado = ">=5.0" - -[[package]] -category = "dev" -description = "Project documentation with Markdown." -marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" -name = "mkdocs" -optional = false -python-versions = ">=3.5" -version = "1.1.2" - -[package.dependencies] -Jinja2 = ">=2.10.1" -Markdown = ">=3.2.1" -PyYAML = ">=3.10" -click = ">=3.3" -livereload = ">=2.5.1" -tornado = ">=5.0" - -[package.dependencies.lunr] -extras = ["languages"] -version = "0.5.8" - -[[package]] -category = "dev" -description = "Rolling backport of unittest.mock for all Pythons" -marker = "python_version < \"3.0\"" name = "mock" +version = "3.0.5" +description = "Rolling backport of unittest.mock for all Pythons" +category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "3.0.5" [package.dependencies] +funcsigs = {version = ">=1", markers = "python_version < \"3.3\""} six = "*" -[package.dependencies.funcsigs] -python = "<3.3" -version = ">=1" - [package.extras] build = ["twine", "wheel", "blurb"] docs = ["sphinx"] test = ["pytest", "pytest-cov"] [[package]] -category = "dev" -description = "More routines for operating on iterables, beyond itertools" -marker = "python_version <= \"2.7\"" name = "more-itertools" +version = "5.0.0" +description = "More routines for operating on iterables, beyond itertools" +category = "dev" optional = false python-versions = "*" -version = "5.0.0" [package.dependencies] six = ">=1.0.0,<2.0.0" [[package]] -category = "dev" -description = "More routines for operating on iterables, beyond itertools" -marker = "python_version < \"3.5\" and python_version > \"2.7\"" name = "more-itertools" -optional = false -python-versions = ">=3.4" -version = "7.2.0" - -[[package]] -category = "dev" +version = "8.5.0" description = "More routines for operating on iterables, beyond itertools" -marker = "python_version >= \"3.5\"" -name = "more-itertools" +category = "dev" optional = false python-versions = ">=3.5" -version = "8.4.0" [[package]] -category = "main" -description = "MessagePack (de)serializer." name = "msgpack" -optional = false -python-versions = "*" version = "1.0.0" - -[[package]] -category = "dev" -description = "Natural Language Toolkit" -marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" -name = "nltk" +description = "MessagePack (de)serializer." +category = "main" optional = false python-versions = "*" -version = "3.5" - -[package.dependencies] -click = "*" -joblib = "*" -regex = "*" -tqdm = "*" - -[package.extras] -all = ["requests", "numpy", "python-crfsuite", "scikit-learn", "twython", "pyparsing", "scipy", "matplotlib", "gensim"] -corenlp = ["requests"] -machine_learning = ["gensim", "numpy", "python-crfsuite", "scikit-learn", "scipy"] -plot = ["matplotlib"] -tgrep = ["pyparsing"] -twitter = ["twython"] [[package]] -category = "dev" -description = "Node.js virtual environment builder" name = "nodeenv" +version = "1.5.0" +description = "Node.js virtual environment builder" +category = "dev" optional = false python-versions = "*" -version = "1.4.0" [[package]] -category = "dev" -description = "Core utilities for Python packages" name = "packaging" +version = "20.4" +description = "Core utilities for Python packages" +category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "20.4" [package.dependencies] pyparsing = ">=2.0.2" six = "*" [[package]] -category = "main" -description = "Bring colors to your terminal." name = "pastel" +version = "0.2.1" +description = "Bring colors to your terminal." +category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "0.2.0" [[package]] -category = "main" -description = "Object-oriented filesystem paths" -marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\" or python_version < \"3.5\" or python_version >= \"3.5\" and python_version < \"3.6\"" name = "pathlib2" +version = "2.3.5" +description = "Object-oriented filesystem paths" +category = "main" optional = false python-versions = "*" -version = "2.3.5" [package.dependencies] +scandir = {version = "*", markers = "python_version < \"3.5\""} six = "*" -[package.dependencies.scandir] -python = "<3.5" -version = "*" - [[package]] -category = "dev" -description = "Utility library for gitignore style pattern matching of file paths." -marker = "python_version >= \"3.6\" and python_version < \"4.0\"" -name = "pathspec" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -version = "0.8.0" - -[[package]] -category = "dev" -description = "Backport of PEP 562." -name = "pep562" -optional = false -python-versions = "*" -version = "1.0" - -[[package]] -category = "main" -description = "Pexpect allows easy control of interactive console applications." name = "pexpect" +version = "4.8.0" +description = "Pexpect allows easy control of interactive console applications." +category = "main" optional = false python-versions = "*" -version = "4.8.0" [package.dependencies] ptyprocess = ">=0.5" [[package]] -category = "main" -description = "Query metadatdata from sdists / bdists / installed packages." name = "pkginfo" +version = "1.5.0.1" +description = "Query metadatdata from sdists / bdists / installed packages." +category = "main" optional = false python-versions = "*" -version = "1.5.0.1" [package.extras] testing = ["nose", "coverage"] [[package]] -category = "dev" -description = "plugin and hook calling mechanisms for python" name = "pluggy" +version = "0.13.1" +description = "plugin and hook calling mechanisms for python" +category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "0.13.1" [package.dependencies] -[package.dependencies.importlib-metadata] -python = "<3.8" -version = ">=0.12" +importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} [package.extras] dev = ["pre-commit", "tox"] [[package]] -category = "dev" -description = "A framework for managing and maintaining multi-language pre-commit hooks." -name = "pre-commit" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "1.18.3" - -[package.dependencies] -"aspy.yaml" = "*" -cfgv = ">=2.0.0" -identify = ">=1.0.0" -importlib-metadata = "*" -nodeenv = ">=0.11.1" -pyyaml = "*" -six = "*" -toml = "*" -virtualenv = ">=15.2" - -[package.dependencies.importlib-resources] -python = "<3.7" -version = "*" - -[[package]] -category = "dev" -description = "A framework for managing and maintaining multi-language pre-commit hooks." -name = "pre-commit" -optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" -version = "1.21.0" - -[package.dependencies] -"aspy.yaml" = "*" -cfgv = ">=2.0.0" -identify = ">=1.0.0" -nodeenv = ">=0.11.1" -pyyaml = "*" -six = "*" -toml = "*" -virtualenv = ">=15.2" - -[package.dependencies.futures] -python = "<3.2" -version = "*" - -[package.dependencies.importlib-metadata] -python = "<3.8" -version = "*" - -[package.dependencies.importlib-resources] -python = "<3.7" -version = "*" - -[[package]] +name = "poetry-core" +version = "1.0.0" +description = "Poetry PEP 517 Build Backend" category = "main" -description = "Run a subprocess in a pseudo terminal" -name = "ptyprocess" -optional = false -python-versions = "*" -version = "0.6.0" - -[[package]] -category = "dev" -description = "library with cross-python path, ini-parsing, io, code, log facilities" -name = "py" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "1.9.0" - -[[package]] -category = "main" -description = "C parser in Python" -marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.4\" and python_version < \"3.5\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.5\" and python_version < \"4.0\" and sys_platform == \"linux\"" -name = "pycparser" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "2.20" - -[[package]] -category = "dev" -description = "Pygments is a syntax highlighting package written in Python." -name = "pygments" -optional = false -python-versions = "*" -version = "2.3.1" - -[[package]] -category = "dev" -description = "Pygments is a syntax highlighting package written in Python." -name = "pygments" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -version = "2.5.2" - -[[package]] -category = "dev" -description = "Pygments is a syntax highlighting package written in Python." -name = "pygments" -optional = false -python-versions = ">=3.5" -version = "2.6.1" - -[[package]] -category = "dev" -description = "Pygments Github custom lexers." -name = "pygments-github-lexers" -optional = false -python-versions = "*" -version = "0.0.5" [package.dependencies] -pygments = ">=2.0.2" +enum34 = {version = ">=1.1.10,<2.0.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\""} +functools32 = {version = ">=3.2.3-2,<4.0.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\""} +importlib-metadata = {version = ">=1.7.0,<2.0.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.5\" and python_version < \"3.8\""} +pathlib2 = {version = ">=2.3.5,<3.0.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\""} +typing = {version = ">=3.7.4.1,<4.0.0.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\""} [[package]] +name = "pre-commit" +version = "2.7.1" +description = "A framework for managing and maintaining multi-language pre-commit hooks." +category = "dev" +optional = false +python-versions = ">=3.6.1" + +[package.dependencies] +cfgv = ">=2.0.0" +identify = ">=1.0.0" +importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} +importlib-resources = {version = "*", markers = "python_version < \"3.7\""} +nodeenv = ">=0.11.1" +pyyaml = ">=5.1" +toml = "*" +virtualenv = ">=20.0.8" + +[[package]] +name = "ptyprocess" +version = "0.6.0" +description = "Run a subprocess in a pseudo terminal" category = "main" -description = "A pure Python Levenshtein implementation that's not freaking GPL'd." +optional = false +python-versions = "*" + +[[package]] +name = "py" +version = "1.9.0" +description = "library with cross-python path, ini-parsing, io, code, log facilities" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[[package]] +name = "pycparser" +version = "2.20" +description = "C parser in Python" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[[package]] name = "pylev" -optional = false -python-versions = "*" version = "1.3.0" - -[[package]] -category = "dev" -description = "Extension pack for Python Markdown." -name = "pymdown-extensions" +description = "A pure Python Levenshtein implementation that's not freaking GPL'd." +category = "main" optional = false python-versions = "*" -version = "6.0" - -[package.dependencies] -Markdown = ">=3.0.1" [[package]] -category = "dev" -description = "Extension pack for Python Markdown." -name = "pymdown-extensions" -optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*" -version = "6.2.1" - -[package.dependencies] -Markdown = ">=3.0.1" -pep562 = "*" - -[[package]] -category = "dev" -description = "Extension pack for Python Markdown." -name = "pymdown-extensions" -optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*" -version = "6.3" - -[package.dependencies] -Markdown = ">=3.2" - -[[package]] -category = "main" -description = "Python parsing module" name = "pyparsing" +version = "2.4.7" +description = "Python parsing module" +category = "main" optional = false python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" -version = "2.4.7" [[package]] -category = "main" -description = "Persistent/Functional/Immutable data structures" -name = "pyrsistent" -optional = false -python-versions = "*" -version = "0.14.11" - -[package.dependencies] -six = "*" - -[[package]] -category = "dev" -description = "pytest: simple powerful testing with Python" name = "pytest" +version = "4.6.11" +description = "pytest: simple powerful testing with Python" +category = "dev" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" -version = "4.6.11" [package.dependencies] atomicwrites = ">=1.0" attrs = ">=17.4.0" +colorama = {version = "*", markers = "sys_platform == \"win32\" and python_version != \"3.4\""} +funcsigs = {version = ">=1.0", markers = "python_version < \"3.0\""} +importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} +more-itertools = [ + {version = ">=4.0.0,<6.0.0", markers = "python_version <= \"2.7\""}, + {version = ">=4.0.0", markers = "python_version > \"2.7\""}, +] packaging = "*" +pathlib2 = {version = ">=2.2.0", markers = "python_version < \"3.6\""} pluggy = ">=0.12,<1.0" py = ">=1.5.0" six = ">=1.10.0" wcwidth = "*" -[[package.dependencies.colorama]] -python = "<3.4.0 || >=3.5.0" -version = "*" - -[[package.dependencies.colorama]] -python = ">=3.4,<3.5" -version = "<=0.4.1" - -[[package.dependencies.more-itertools]] -python = "<2.8" -version = ">=4.0.0,<6.0.0" - -[[package.dependencies.more-itertools]] -python = ">=2.8" -version = ">=4.0.0" - -[package.dependencies.funcsigs] -python = "<3.0" -version = ">=1.0" - -[package.dependencies.importlib-metadata] -python = "<3.8" -version = ">=0.12" - -[package.dependencies.pathlib2] -python = "<3.6" -version = ">=2.2.0" - [package.extras] testing = ["argcomplete", "hypothesis (>=3.56)", "nose", "requests", "mock"] [[package]] -category = "dev" -description = "pytest: simple powerful testing with Python" name = "pytest" +version = "5.4.3" +description = "pytest: simple powerful testing with Python" +category = "dev" optional = false python-versions = ">=3.5" -version = "5.4.3" [package.dependencies] -atomicwrites = ">=1.0" +atomicwrites = {version = ">=1.0", markers = "sys_platform == \"win32\""} attrs = ">=17.4.0" -colorama = "*" +colorama = {version = "*", markers = "sys_platform == \"win32\""} +importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} more-itertools = ">=4.0.0" packaging = "*" +pathlib2 = {version = ">=2.2.0", markers = "python_version < \"3.6\""} pluggy = ">=0.12,<1.0" py = ">=1.5.0" wcwidth = "*" -[package.dependencies.importlib-metadata] -python = "<3.8" -version = ">=0.12" - -[package.dependencies.pathlib2] -python = "<3.6" -version = ">=2.2.0" - [package.extras] checkqa-mypy = ["mypy (v0.761)"] testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"] [[package]] -category = "dev" -description = "Pytest plugin for measuring coverage." name = "pytest-cov" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "2.8.1" - -[package.dependencies] -coverage = ">=4.4" -pytest = ">=3.6" - -[package.extras] -testing = ["fields", "hunter", "process-tests (2.0.2)", "six", "virtualenv"] - -[[package]] -category = "dev" +version = "2.10.1" description = "Pytest plugin for measuring coverage." -name = "pytest-cov" +category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -version = "2.10.0" [package.dependencies] coverage = ">=4.4" @@ -1281,30 +691,27 @@ pytest = ">=4.6" testing = ["fields", "hunter", "process-tests (2.0.2)", "six", "pytest-xdist", "virtualenv"] [[package]] -category = "dev" -description = "Thin-wrapper around the mock package for easier use with py.test" name = "pytest-mock" +version = "1.13.0" +description = "Thin-wrapper around the mock package for easier use with py.test" +category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "1.13.0" [package.dependencies] +mock = {version = "*", markers = "python_version < \"3.0\""} pytest = ">=2.7" -[package.dependencies.mock] -python = "<3.0" -version = "*" - [package.extras] dev = ["pre-commit", "tox"] [[package]] -category = "dev" -description = "pytest-sugar is a plugin for pytest that changes the default look and feel of pytest (e.g. progressbar, show tests that fail instantly)." name = "pytest-sugar" +version = "0.9.4" +description = "pytest-sugar is a plugin for pytest that changes the default look and feel of pytest (e.g. progressbar, show tests that fail instantly)." +category = "dev" optional = false python-versions = "*" -version = "0.9.4" [package.dependencies] packaging = ">=14.1" @@ -1312,64 +719,28 @@ pytest = ">=2.9" termcolor = ">=1.1.0" [[package]] -category = "main" -description = "" -marker = "python_version >= \"2.7\" and python_version < \"2.8\" and sys_platform == \"win32\" or python_version >= \"3.4\" and python_version < \"3.5\" and sys_platform == \"win32\" or python_version >= \"3.5\" and python_version < \"4.0\" and sys_platform == \"win32\"" name = "pywin32-ctypes" -optional = false -python-versions = "*" version = "0.2.0" - -[[package]] -category = "dev" -description = "YAML parser and emitter for Python" -name = "pyyaml" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "5.2" - -[[package]] -category = "dev" -description = "YAML parser and emitter for Python" -name = "pyyaml" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -version = "5.3.1" - -[[package]] -category = "dev" -description = "Alternative regular expression module, to replace re." -marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\" or python_version >= \"3.6\" and python_version < \"4.0\"" -name = "regex" +description = "" +category = "main" optional = false python-versions = "*" -version = "2020.7.14" [[package]] -category = "main" -description = "Python HTTP for Humans." -name = "requests" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "2.21.0" - -[package.dependencies] -certifi = ">=2017.4.17" -chardet = ">=3.0.2,<3.1.0" -idna = ">=2.5,<2.9" -urllib3 = ">=1.21.1,<1.25" - -[package.extras] -security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)"] -socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7)", "win-inet-pton"] - -[[package]] -category = "main" -description = "Python HTTP for Humans." -name = "requests" +name = "pyyaml" +version = "5.3.1" +description = "YAML parser and emitter for Python" +category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[[package]] +name = "requests" version = "2.24.0" +description = "Python HTTP for Humans." +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [package.dependencies] certifi = ">=2017.4.17" @@ -1382,33 +753,31 @@ security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"] socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7)", "win-inet-pton"] [[package]] -category = "main" -description = "A utility belt for advanced users of python-requests" name = "requests-toolbelt" +version = "0.9.1" +description = "A utility belt for advanced users of python-requests" +category = "main" optional = false python-versions = "*" -version = "0.8.0" [package.dependencies] requests = ">=2.0.1,<3.0.0" [[package]] -category = "main" -description = "scandir, a better directory iterator and faster os.walk()" -marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\"" name = "scandir" +version = "1.10.0" +description = "scandir, a better directory iterator and faster os.walk()" +category = "main" optional = false python-versions = "*" -version = "1.10.0" [[package]] -category = "main" -description = "Python bindings to FreeDesktop.org Secret Service API" -marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.4\" and python_version < \"3.5\" and (sys_platform == \"linux2\" or sys_platform == \"linux\")" name = "secretstorage" +version = "2.3.1" +description = "Python bindings to FreeDesktop.org Secret Service API" +category = "main" optional = false python-versions = "*" -version = "2.3.1" [package.dependencies] cryptography = "*" @@ -1417,142 +786,93 @@ cryptography = "*" dbus-python = ["dbus-python"] [[package]] -category = "main" -description = "Python bindings to FreeDesktop.org Secret Service API" -marker = "python_version >= \"3.5\" and python_version < \"4.0\" and sys_platform == \"linux\"" name = "secretstorage" +version = "3.1.2" +description = "Python bindings to FreeDesktop.org Secret Service API" +category = "main" optional = false python-versions = ">=3.5" -version = "3.1.2" [package.dependencies] cryptography = "*" jeepney = ">=0.4.2" [[package]] -category = "main" -description = "Tool to Detect Surrounding Shell" name = "shellingham" +version = "1.3.2" +description = "Tool to Detect Surrounding Shell" +category = "main" optional = false python-versions = "!=3.0,!=3.1,!=3.2,!=3.3,>=2.6" -version = "1.3.2" [[package]] -category = "dev" -description = "This library brings functools.singledispatch from Python 3.4 to Python 2.6-3.3." -marker = "python_version < \"3.4\"" name = "singledispatch" +version = "3.4.0.3" +description = "This library brings functools.singledispatch from Python 3.4 to Python 2.6-3.3." +category = "main" optional = false python-versions = "*" -version = "3.4.0.3" [package.dependencies] six = "*" [[package]] -category = "main" -description = "Python 2 and 3 compatibility utilities" name = "six" +version = "1.15.0" +description = "Python 2 and 3 compatibility utilities" +category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" -version = "1.15.0" [[package]] -category = "main" -description = "A backport of the subprocess module from Python 3 for use on 2.x." -marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\"" name = "subprocess32" +version = "3.5.4" +description = "A backport of the subprocess module from Python 3 for use on 2.x." +category = "main" optional = false python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, <4" -version = "3.5.4" [[package]] -category = "dev" -description = "ANSII Color formatting for output in terminal." name = "termcolor" -optional = false -python-versions = "*" version = "1.1.0" - -[[package]] +description = "ANSII Color formatting for output in terminal." category = "dev" -description = "Python Library for Tom's Obvious, Minimal Language" -name = "toml" optional = false python-versions = "*" + +[[package]] +name = "toml" version = "0.10.1" +description = "Python Library for Tom's Obvious, Minimal Language" +category = "dev" +optional = false +python-versions = "*" [[package]] -category = "main" -description = "Style preserving TOML library" name = "tomlkit" +version = "0.7.0" +description = "Style preserving TOML library" +category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "0.5.11" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [package.dependencies] -[package.dependencies.enum34] -python = ">=2.7,<2.8" -version = ">=1.1,<2.0" - -[package.dependencies.functools32] -python = ">=2.7,<2.8" -version = ">=3.2.3,<4.0.0" - -[package.dependencies.typing] -python = ">=2.7,<2.8 || >=3.4,<3.5" -version = ">=3.6,<4.0" +enum34 = {version = ">=1.1,<2.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\""} +functools32 = {version = ">=3.2.3,<4.0.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\""} +typing = {version = ">=3.6,<4.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\""} [[package]] -category = "dev" -description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed." -marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" and python_full_version >= \"2.7.9\" and python_full_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\" and python_full_version >= \"2.7.9\" and python_full_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" -name = "tornado" -optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, != 3.3.*" -version = "5.1.1" - -[[package]] -category = "dev" -description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed." -marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" -name = "tornado" -optional = false -python-versions = ">= 3.5" -version = "6.0.4" - -[[package]] -category = "dev" -description = "tox is a generic virtualenv management and test command line tool" name = "tox" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "3.12.1" - -[package.dependencies] -filelock = ">=3.0.0,<4" -pluggy = ">=0.3.0,<1" -py = ">=1.4.17,<2" -setuptools = ">=30.0.0" -six = ">=1.0.0,<2" -toml = ">=0.9.4" -virtualenv = ">=14.0.0" - -[package.extras] -docs = ["sphinx (>=2.0.0,<3)", "towncrier (>=18.5.0)", "pygments-github-lexers (>=0.0.5)", "sphinxcontrib-autoprogram (>=0.1.5)"] -testing = ["freezegun (>=0.3.11,<1)", "pathlib2 (>=2.3.3,<3)", "pytest (>=3.0.0,<5)", "pytest-cov (>=2.5.1,<3)", "pytest-mock (>=1.10.0,<2)", "pytest-xdist (>=1.22.2,<2)", "pytest-randomly (>=1.2.3,<2)", "flaky (>=3.4.0,<4)", "psutil (>=5.6.1,<6)"] - -[[package]] -category = "dev" +version = "3.20.0" description = "tox is a generic virtualenv management and test command line tool" -name = "tox" +category = "dev" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" -version = "3.17.1" [package.dependencies] -colorama = ">=0.4.1" +colorama = {version = ">=0.4.1", markers = "platform_system == \"Windows\""} filelock = ">=3.0.0" +importlib-metadata = {version = ">=0.12,<2", markers = "python_version < \"3.8\""} packaging = ">=14" pluggy = ">=0.12.0" py = ">=1.4.17" @@ -1560,72 +880,36 @@ six = ">=1.14.0" toml = ">=0.9.4" virtualenv = ">=16.0.0,<20.0.0 || >20.0.0,<20.0.1 || >20.0.1,<20.0.2 || >20.0.2,<20.0.3 || >20.0.3,<20.0.4 || >20.0.4,<20.0.5 || >20.0.5,<20.0.6 || >20.0.6,<20.0.7 || >20.0.7" -[package.dependencies.importlib-metadata] -python = "<3.8" -version = ">=0.12,<2" - [package.extras] -docs = ["sphinx (>=2.0.0)", "towncrier (>=18.5.0)", "pygments-github-lexers (>=0.0.5)", "sphinxcontrib-autoprogram (>=0.1.5)"] -testing = ["freezegun (>=0.3.11)", "pathlib2 (>=2.3.3)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-xdist (>=1.22.2)", "pytest-randomly (>=1.0.0)", "flaky (>=3.4.0)", "psutil (>=5.6.1)"] +docs = ["pygments-github-lexers (>=0.0.5)", "sphinx (>=2.0.0)", "sphinxcontrib-autoprogram (>=0.1.5)", "towncrier (>=18.5.0)"] +testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pathlib2 (>=2.3.3)", "psutil (>=5.6.1)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "pytest-xdist (>=1.22.2)"] [[package]] -category = "dev" -description = "Fast, Extensible Progress Meter" -marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" -name = "tqdm" -optional = false -python-versions = ">=2.6, !=3.0.*, !=3.1.*" -version = "4.48.0" - -[package.extras] -dev = ["py-make (>=0.1.0)", "twine", "argopt", "pydoc-markdown"] - -[[package]] -category = "dev" -description = "a fork of Python 2 and 3 ast modules with type comment support" -marker = "python_version >= \"3.6\" and python_version < \"4.0\"" -name = "typed-ast" -optional = false -python-versions = "*" -version = "1.4.1" - -[[package]] -category = "main" -description = "Type Hints for Python" -marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\" or python_version < \"3.5\"" name = "typing" +version = "3.7.4.3" +description = "Type Hints for Python" +category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "3.7.4.3" [[package]] -category = "main" -description = "Backported and Experimental Type Hints for Python 3.5+" -marker = "python_version >= \"3.5.0\" and python_version < \"3.5.4\"" name = "typing-extensions" +version = "3.7.4.3" +description = "Backported and Experimental Type Hints for Python 3.5+" +category = "main" optional = false python-versions = "*" -version = "3.7.4.2" + +[package.dependencies] +typing = {version = ">=3.7.4", markers = "python_version < \"3.5\""} [[package]] -category = "main" -description = "HTTP library with thread-safe connection pooling, file post, and more." name = "urllib3" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4" -version = "1.24.3" - -[package.extras] -secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"] -socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7,<2.0)"] - -[[package]] -category = "main" +version = "1.25.10" description = "HTTP library with thread-safe connection pooling, file post, and more." -name = "urllib3" +category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" -version = "1.25.9" [package.extras] brotli = ["brotlipy (>=0.6.0)"] @@ -1633,112 +917,82 @@ secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "pyOpenSSL (>=0 socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7,<2.0)"] [[package]] +name = "virtualenv" +version = "20.0.31" +description = "Virtual Python Environment builder" category = "main" -description = "Virtual Python Environment builder" -name = "virtualenv" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" -version = "16.7.10" - -[package.extras] -docs = ["sphinx (>=1.8.0,<2)", "towncrier (>=18.5.0)", "sphinx-rtd-theme (>=0.4.2,<1)"] -testing = ["pytest (>=4.0.0,<5)", "coverage (>=4.5.0,<5)", "pytest-timeout (>=1.3.0,<2)", "six (>=1.10.0,<2)", "pytest-xdist", "pytest-localserver", "pypiserver", "mock", "xonsh"] - -[[package]] -category = "dev" -description = "Virtual Python Environment builder" -name = "virtualenv" -optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" -version = "20.0.27" [package.dependencies] appdirs = ">=1.4.3,<2" distlib = ">=0.3.1,<1" filelock = ">=3.0.0,<4" +importlib-metadata = {version = ">=0.12,<2", markers = "python_version < \"3.8\""} +importlib-resources = {version = ">=1.0", markers = "python_version < \"3.7\""} +pathlib2 = {version = ">=2.3.3,<3", markers = "python_version < \"3.4\" and sys_platform != \"win32\""} six = ">=1.9.0,<2" -[package.dependencies.importlib-metadata] -python = "<3.8" -version = ">=0.12,<2" - -[package.dependencies.importlib-resources] -python = "<3.7" -version = ">=1.0" - [package.extras] -docs = ["sphinx (>=3)", "sphinx-argparse (>=0.2.5)", "sphinx-rtd-theme (>=0.4.3)", "towncrier (>=19.9.0rc1)", "proselint (>=0.10.2)"] -testing = ["pytest (>=4)", "coverage (>=5)", "coverage-enable-subprocess (>=1)", "pytest-xdist (>=1.31.0)", "pytest-mock (>=2)", "pytest-env (>=0.6.2)", "pytest-randomly (>=1)", "pytest-timeout (>=1)", "pytest-freezegun (>=0.4.1)", "flaky (>=3)", "packaging (>=20.0)", "xonsh (>=0.9.16)"] +docs = ["proselint (>=0.10.2)", "sphinx (>=3)", "sphinx-argparse (>=0.2.5)", "sphinx-rtd-theme (>=0.4.3)", "towncrier (>=19.9.0rc1)"] +testing = ["coverage (>=5)", "coverage-enable-subprocess (>=1)", "flaky (>=3)", "pytest (>=4)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.1)", "pytest-mock (>=2)", "pytest-randomly (>=1)", "pytest-timeout (>=1)", "pytest-xdist (>=1.31.0)", "packaging (>=20.0)", "xonsh (>=0.9.16)"] [[package]] -category = "dev" -description = "Measures the displayed width of unicode strings in a terminal" -marker = "python_version < \"3.5\" or python_version >= \"3.5\"" name = "wcwidth" +version = "0.2.5" +description = "Measures the displayed width of unicode strings in a terminal" +category = "dev" optional = false python-versions = "*" -version = "0.2.5" [package.dependencies] -[package.dependencies."backports.functools-lru-cache"] -python = "<3.2" -version = ">=1.2.1" +"backports.functools-lru-cache" = {version = ">=1.2.1", markers = "python_version < \"3.2\""} [[package]] -category = "main" -description = "Character encoding aliases for legacy web content" name = "webencodings" +version = "0.5.1" +description = "Character encoding aliases for legacy web content" +category = "main" optional = false python-versions = "*" -version = "0.5.1" [[package]] -category = "main" -description = "Backport of pathlib-compatible object wrapper for zip files" -marker = "python_version < \"3.8\" or python_version >= \"3.5\" and python_version < \"3.8\" or python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"3.8\"" name = "zipp" +version = "1.2.0" +description = "Backport of pathlib-compatible object wrapper for zip files" +category = "main" optional = false python-versions = ">=2.7" -version = "1.2.0" [package.dependencies] -[package.dependencies.contextlib2] -python = "<3.4" -version = "*" +contextlib2 = {version = "*", markers = "python_version < \"3.4\""} [package.extras] docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] testing = ["pathlib2", "unittest2", "jaraco.itertools", "func-timeout"] [metadata] -content-hash = "f585f9479c9551e48768249cc80ec8f217539b42fcc3822543fdd0789f9f9d87" -python-versions = "~2.7 || ^3.4" +lock-version = "1.1" +python-versions = "~2.7 || ^3.5" +content-hash = "1e774c9d8b7f6812d721cff08b51554f9a0cd051e2ae0e884421bcb56718d131" [metadata.files] appdirs = [ {file = "appdirs-1.4.4-py2.py3-none-any.whl", hash = "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"}, {file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"}, ] -"aspy.yaml" = [ - {file = "aspy.yaml-1.3.0-py2.py3-none-any.whl", hash = "sha256:463372c043f70160a9ec950c3f1e4c3a82db5fca01d334b6bc89c7164d744bdc"}, - {file = "aspy.yaml-1.3.0.tar.gz", hash = "sha256:e7c742382eff2caed61f87a39d13f99109088e5e93f04d76eb8d4b28aa143f45"}, -] atomicwrites = [ {file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"}, {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"}, ] attrs = [ - {file = "attrs-19.3.0-py2.py3-none-any.whl", hash = "sha256:08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c"}, - {file = "attrs-19.3.0.tar.gz", hash = "sha256:f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72"}, + {file = "attrs-20.2.0-py2.py3-none-any.whl", hash = "sha256:fce7fc47dfc976152e82d53ff92fa0407700c21acd20886a13777a0d20e655dc"}, + {file = "attrs-20.2.0.tar.gz", hash = "sha256:26b54ddbbb9ee1d34d5d3668dd37d6cf74990ab23c828c2888dccdceee395594"}, ] "backports.functools-lru-cache" = [ {file = "backports.functools_lru_cache-1.6.1-py2.py3-none-any.whl", hash = "sha256:0bada4c2f8a43d533e4ecb7a12214d9420e66eb206d54bf2d682581ca4b80848"}, {file = "backports.functools_lru_cache-1.6.1.tar.gz", hash = "sha256:8fde5f188da2d593bd5bc0be98d9abc46c95bb8a9dde93429570192ee6cc2d4a"}, ] -black = [ - {file = "black-19.10b0-py36-none-any.whl", hash = "sha256:1b30e59be925fafc1ee4565e5e08abef6b03fe455102883820fe5ee2e4734e0b"}, - {file = "black-19.10b0.tar.gz", hash = "sha256:c2edb73a08e9e0e6f65a0e6af18b059b8b1cdd5bef997d7a0b181df93dc81539"}, -] cachecontrol = [ {file = "CacheControl-0.12.6-py2.py3-none-any.whl", hash = "sha256:10d056fa27f8563a271b345207402a6dcce8efab7e5b377e270329c62471b10d"}, {file = "CacheControl-0.12.6.tar.gz", hash = "sha256:be9aa45477a134aee56c8fac518627e1154df063e85f67d4f83ce0ccc23688e8"}, @@ -1752,60 +1006,60 @@ certifi = [ {file = "certifi-2020.6.20.tar.gz", hash = "sha256:5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3"}, ] cffi = [ - {file = "cffi-1.14.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:1cae98a7054b5c9391eb3249b86e0e99ab1e02bb0cc0575da191aedadbdf4384"}, - {file = "cffi-1.14.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:cf16e3cf6c0a5fdd9bc10c21687e19d29ad1fe863372b5543deaec1039581a30"}, - {file = "cffi-1.14.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:f2b0fa0c01d8a0c7483afd9f31d7ecf2d71760ca24499c8697aeb5ca37dc090c"}, - {file = "cffi-1.14.0-cp27-cp27m-win32.whl", hash = "sha256:99f748a7e71ff382613b4e1acc0ac83bf7ad167fb3802e35e90d9763daba4d78"}, - {file = "cffi-1.14.0-cp27-cp27m-win_amd64.whl", hash = "sha256:c420917b188a5582a56d8b93bdd8e0f6eca08c84ff623a4c16e809152cd35793"}, - {file = "cffi-1.14.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:399aed636c7d3749bbed55bc907c3288cb43c65c4389964ad5ff849b6370603e"}, - {file = "cffi-1.14.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:cab50b8c2250b46fe738c77dbd25ce017d5e6fb35d3407606e7a4180656a5a6a"}, - {file = "cffi-1.14.0-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:001bf3242a1bb04d985d63e138230802c6c8d4db3668fb545fb5005ddf5bb5ff"}, - {file = "cffi-1.14.0-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:e56c744aa6ff427a607763346e4170629caf7e48ead6921745986db3692f987f"}, - {file = "cffi-1.14.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:b8c78301cefcf5fd914aad35d3c04c2b21ce8629b5e4f4e45ae6812e461910fa"}, - {file = "cffi-1.14.0-cp35-cp35m-win32.whl", hash = "sha256:8c0ffc886aea5df6a1762d0019e9cb05f825d0eec1f520c51be9d198701daee5"}, - {file = "cffi-1.14.0-cp35-cp35m-win_amd64.whl", hash = "sha256:8a6c688fefb4e1cd56feb6c511984a6c4f7ec7d2a1ff31a10254f3c817054ae4"}, - {file = "cffi-1.14.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:95cd16d3dee553f882540c1ffe331d085c9e629499ceadfbda4d4fde635f4b7d"}, - {file = "cffi-1.14.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:66e41db66b47d0d8672d8ed2708ba91b2f2524ece3dee48b5dfb36be8c2f21dc"}, - {file = "cffi-1.14.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:028a579fc9aed3af38f4892bdcc7390508adabc30c6af4a6e4f611b0c680e6ac"}, - {file = "cffi-1.14.0-cp36-cp36m-win32.whl", hash = "sha256:cef128cb4d5e0b3493f058f10ce32365972c554572ff821e175dbc6f8ff6924f"}, - {file = "cffi-1.14.0-cp36-cp36m-win_amd64.whl", hash = "sha256:337d448e5a725bba2d8293c48d9353fc68d0e9e4088d62a9571def317797522b"}, - {file = "cffi-1.14.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:e577934fc5f8779c554639376beeaa5657d54349096ef24abe8c74c5d9c117c3"}, - {file = "cffi-1.14.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:62ae9af2d069ea2698bf536dcfe1e4eed9090211dbaafeeedf5cb6c41b352f66"}, - {file = "cffi-1.14.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:14491a910663bf9f13ddf2bc8f60562d6bc5315c1f09c704937ef17293fb85b0"}, - {file = "cffi-1.14.0-cp37-cp37m-win32.whl", hash = "sha256:c43866529f2f06fe0edc6246eb4faa34f03fe88b64a0a9a942561c8e22f4b71f"}, - {file = "cffi-1.14.0-cp37-cp37m-win_amd64.whl", hash = "sha256:2089ed025da3919d2e75a4d963d008330c96751127dd6f73c8dc0c65041b4c26"}, - {file = "cffi-1.14.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:3b911c2dbd4f423b4c4fcca138cadde747abdb20d196c4a48708b8a2d32b16dd"}, - {file = "cffi-1.14.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:7e63cbcf2429a8dbfe48dcc2322d5f2220b77b2e17b7ba023d6166d84655da55"}, - {file = "cffi-1.14.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:3d311bcc4a41408cf5854f06ef2c5cab88f9fded37a3b95936c9879c1640d4c2"}, - {file = "cffi-1.14.0-cp38-cp38-win32.whl", hash = "sha256:675686925a9fb403edba0114db74e741d8181683dcf216be697d208857e04ca8"}, - {file = "cffi-1.14.0-cp38-cp38-win_amd64.whl", hash = "sha256:00789914be39dffba161cfc5be31b55775de5ba2235fe49aa28c148236c4e06b"}, - {file = "cffi-1.14.0.tar.gz", hash = "sha256:2d384f4a127a15ba701207f7639d94106693b6cd64173d6c8988e2c25f3ac2b6"}, + {file = "cffi-1.14.3-2-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3eeeb0405fd145e714f7633a5173318bd88d8bbfc3dd0a5751f8c4f70ae629bc"}, + {file = "cffi-1.14.3-2-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:cb763ceceae04803adcc4e2d80d611ef201c73da32d8f2722e9d0ab0c7f10768"}, + {file = "cffi-1.14.3-2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:44f60519595eaca110f248e5017363d751b12782a6f2bd6a7041cba275215f5d"}, + {file = "cffi-1.14.3-2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c53af463f4a40de78c58b8b2710ade243c81cbca641e34debf3396a9640d6ec1"}, + {file = "cffi-1.14.3-2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:33c6cdc071ba5cd6d96769c8969a0531be2d08c2628a0143a10a7dcffa9719ca"}, + {file = "cffi-1.14.3-2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c11579638288e53fc94ad60022ff1b67865363e730ee41ad5e6f0a17188b327a"}, + {file = "cffi-1.14.3-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:3cb3e1b9ec43256c4e0f8d2837267a70b0e1ca8c4f456685508ae6106b1f504c"}, + {file = "cffi-1.14.3-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:f0620511387790860b249b9241c2f13c3a80e21a73e0b861a2df24e9d6f56730"}, + {file = "cffi-1.14.3-cp27-cp27m-win32.whl", hash = "sha256:005f2bfe11b6745d726dbb07ace4d53f057de66e336ff92d61b8c7e9c8f4777d"}, + {file = "cffi-1.14.3-cp27-cp27m-win_amd64.whl", hash = "sha256:2f9674623ca39c9ebe38afa3da402e9326c245f0f5ceff0623dccdac15023e05"}, + {file = "cffi-1.14.3-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:09e96138280241bd355cd585148dec04dbbedb4f46128f340d696eaafc82dd7b"}, + {file = "cffi-1.14.3-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:3363e77a6176afb8823b6e06db78c46dbc4c7813b00a41300a4873b6ba63b171"}, + {file = "cffi-1.14.3-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:0ef488305fdce2580c8b2708f22d7785ae222d9825d3094ab073e22e93dfe51f"}, + {file = "cffi-1.14.3-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:0b1ad452cc824665ddc682400b62c9e4f5b64736a2ba99110712fdee5f2505c4"}, + {file = "cffi-1.14.3-cp35-cp35m-win32.whl", hash = "sha256:85ba797e1de5b48aa5a8427b6ba62cf69607c18c5d4eb747604b7302f1ec382d"}, + {file = "cffi-1.14.3-cp35-cp35m-win_amd64.whl", hash = "sha256:e66399cf0fc07de4dce4f588fc25bfe84a6d1285cc544e67987d22663393926d"}, + {file = "cffi-1.14.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:15f351bed09897fbda218e4db5a3d5c06328862f6198d4fb385f3e14e19decb3"}, + {file = "cffi-1.14.3-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4d7c26bfc1ea9f92084a1d75e11999e97b62d63128bcc90c3624d07813c52808"}, + {file = "cffi-1.14.3-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:23e5d2040367322824605bc29ae8ee9175200b92cb5483ac7d466927a9b3d537"}, + {file = "cffi-1.14.3-cp36-cp36m-win32.whl", hash = "sha256:a624fae282e81ad2e4871bdb767e2c914d0539708c0f078b5b355258293c98b0"}, + {file = "cffi-1.14.3-cp36-cp36m-win_amd64.whl", hash = "sha256:de31b5164d44ef4943db155b3e8e17929707cac1e5bd2f363e67a56e3af4af6e"}, + {file = "cffi-1.14.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:f92cdecb618e5fa4658aeb97d5eb3d2f47aa94ac6477c6daf0f306c5a3b9e6b1"}, + {file = "cffi-1.14.3-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:22399ff4870fb4c7ef19fff6eeb20a8bbf15571913c181c78cb361024d574579"}, + {file = "cffi-1.14.3-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:f4eae045e6ab2bb54ca279733fe4eb85f1effda392666308250714e01907f394"}, + {file = "cffi-1.14.3-cp37-cp37m-win32.whl", hash = "sha256:b0358e6fefc74a16f745afa366acc89f979040e0cbc4eec55ab26ad1f6a9bfbc"}, + {file = "cffi-1.14.3-cp37-cp37m-win_amd64.whl", hash = "sha256:6642f15ad963b5092d65aed022d033c77763515fdc07095208f15d3563003869"}, + {file = "cffi-1.14.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:2791f68edc5749024b4722500e86303a10d342527e1e3bcac47f35fbd25b764e"}, + {file = "cffi-1.14.3-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:529c4ed2e10437c205f38f3691a68be66c39197d01062618c55f74294a4a4828"}, + {file = "cffi-1.14.3-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:8f0f1e499e4000c4c347a124fa6a27d37608ced4fe9f7d45070563b7c4c370c9"}, + {file = "cffi-1.14.3-cp38-cp38-win32.whl", hash = "sha256:3b8eaf915ddc0709779889c472e553f0d3e8b7bdf62dab764c8921b09bf94522"}, + {file = "cffi-1.14.3-cp38-cp38-win_amd64.whl", hash = "sha256:bbd2f4dfee1079f76943767fce837ade3087b578aeb9f69aec7857d5bf25db15"}, + {file = "cffi-1.14.3-cp39-cp39-manylinux1_i686.whl", hash = "sha256:cc75f58cdaf043fe6a7a6c04b3b5a0e694c6a9e24050967747251fb80d7bce0d"}, + {file = "cffi-1.14.3-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:bf39a9e19ce7298f1bd6a9758fa99707e9e5b1ebe5e90f2c3913a47bc548747c"}, + {file = "cffi-1.14.3-cp39-cp39-win32.whl", hash = "sha256:d80998ed59176e8cba74028762fbd9b9153b9afc71ea118e63bbf5d4d0f9552b"}, + {file = "cffi-1.14.3-cp39-cp39-win_amd64.whl", hash = "sha256:c150eaa3dadbb2b5339675b88d4573c1be3cb6f2c33a6c83387e10cc0bf05bd3"}, + {file = "cffi-1.14.3.tar.gz", hash = "sha256:f92f789e4f9241cd262ad7a555ca2c648a98178a953af117ef7fad46aa1d5591"}, ] cfgv = [ - {file = "cfgv-2.0.1-py2.py3-none-any.whl", hash = "sha256:fbd93c9ab0a523bf7daec408f3be2ed99a980e20b2d19b50fc184ca6b820d289"}, - {file = "cfgv-2.0.1.tar.gz", hash = "sha256:edb387943b665bf9c434f717bf630fa78aecd53d5900d2e05da6ad6048553144"}, + {file = "cfgv-3.2.0-py2.py3-none-any.whl", hash = "sha256:32e43d604bbe7896fe7c248a9c2276447dbef840feb28fe20494f62af110211d"}, + {file = "cfgv-3.2.0.tar.gz", hash = "sha256:cf22deb93d4bcf92f345a5c3cd39d3d41d6340adc60c78bbbd6588c384fda6a1"}, ] chardet = [ {file = "chardet-3.0.4-py2.py3-none-any.whl", hash = "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"}, {file = "chardet-3.0.4.tar.gz", hash = "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae"}, ] cleo = [ - {file = "cleo-0.7.6-py2.py3-none-any.whl", hash = "sha256:9443d67e5b2da79b32d820ae41758dd6a25618345cb10b9a022a695e26b291b9"}, - {file = "cleo-0.7.6.tar.gz", hash = "sha256:99cf342406f3499cec43270fcfaf93c126c5164092eca201dfef0f623360b409"}, -] -click = [ - {file = "click-7.1.2-py2.py3-none-any.whl", hash = "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc"}, - {file = "click-7.1.2.tar.gz", hash = "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"}, - {file = "Click-7.0-py2.py3-none-any.whl", hash = "sha256:2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13"}, - {file = "Click-7.0.tar.gz", hash = "sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7"}, + {file = "cleo-0.8.1-py2.py3-none-any.whl", hash = "sha256:141cda6dc94a92343be626bb87a0b6c86ae291dfc732a57bf04310d4b4201753"}, + {file = "cleo-0.8.1.tar.gz", hash = "sha256:3d0e22d30117851b45970b6c14aca4ab0b18b1b53c8af57bed13208147e4069f"}, ] clikit = [ - {file = "clikit-0.4.3-py2.py3-none-any.whl", hash = "sha256:71e321b7795a2a6c4888629f43365d52db071737e668ab16861121d7dd3ada09"}, - {file = "clikit-0.4.3.tar.gz", hash = "sha256:6e2d7e115e7c7b35bceb0209109935ab2f9ab50910e9ff2293f7fa0b7abf973e"}, + {file = "clikit-0.6.2-py2.py3-none-any.whl", hash = "sha256:71268e074e68082306e23d7369a7b99f824a0ef926e55ba2665e911f7208489e"}, + {file = "clikit-0.6.2.tar.gz", hash = "sha256:442ee5db9a14120635c5990bcdbfe7c03ada5898291f0c802f77be71569ded59"}, ] colorama = [ - {file = "colorama-0.4.1-py2.py3-none-any.whl", hash = "sha256:f8ac84de7840f5b9c4e3347b3c1eaa50f7e49c2b07596221daec5edaabbd7c48"}, - {file = "colorama-0.4.1.tar.gz", hash = "sha256:05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d"}, {file = "colorama-0.4.3-py2.py3-none-any.whl", hash = "sha256:7d73d2a99753107a36ac6b455ee49046802e59d9d076ef8e47b61499fa29afff"}, {file = "colorama-0.4.3.tar.gz", hash = "sha256:e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1"}, ] @@ -1818,114 +1072,68 @@ contextlib2 = [ {file = "contextlib2-0.6.0.post1.tar.gz", hash = "sha256:01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e"}, ] coverage = [ - {file = "coverage-4.5.4-cp26-cp26m-macosx_10_12_x86_64.whl", hash = "sha256:eee64c616adeff7db37cc37da4180a3a5b6177f5c46b187894e633f088fb5b28"}, - {file = "coverage-4.5.4-cp27-cp27m-macosx_10_12_x86_64.whl", hash = "sha256:ef824cad1f980d27f26166f86856efe11eff9912c4fed97d3804820d43fa550c"}, - {file = "coverage-4.5.4-cp27-cp27m-macosx_10_13_intel.whl", hash = "sha256:9a334d6c83dfeadae576b4d633a71620d40d1c379129d587faa42ee3e2a85cce"}, - {file = "coverage-4.5.4-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:7494b0b0274c5072bddbfd5b4a6c6f18fbbe1ab1d22a41e99cd2d00c8f96ecfe"}, - {file = "coverage-4.5.4-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:826f32b9547c8091679ff292a82aca9c7b9650f9fda3e2ca6bf2ac905b7ce888"}, - {file = "coverage-4.5.4-cp27-cp27m-win32.whl", hash = "sha256:63a9a5fc43b58735f65ed63d2cf43508f462dc49857da70b8980ad78d41d52fc"}, - {file = "coverage-4.5.4-cp27-cp27m-win_amd64.whl", hash = "sha256:e2ede7c1d45e65e209d6093b762e98e8318ddeff95317d07a27a2140b80cfd24"}, - {file = "coverage-4.5.4-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:dd579709a87092c6dbee09d1b7cfa81831040705ffa12a1b248935274aee0437"}, - {file = "coverage-4.5.4-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:08907593569fe59baca0bf152c43f3863201efb6113ecb38ce7e97ce339805a6"}, - {file = "coverage-4.5.4-cp33-cp33m-macosx_10_10_x86_64.whl", hash = "sha256:6b62544bb68106e3f00b21c8930e83e584fdca005d4fffd29bb39fb3ffa03cb5"}, - {file = "coverage-4.5.4-cp34-cp34m-macosx_10_12_x86_64.whl", hash = "sha256:331cb5115673a20fb131dadd22f5bcaf7677ef758741312bee4937d71a14b2ef"}, - {file = "coverage-4.5.4-cp34-cp34m-manylinux1_i686.whl", hash = "sha256:bf1ef9eb901113a9805287e090452c05547578eaab1b62e4ad456fcc049a9b7e"}, - {file = "coverage-4.5.4-cp34-cp34m-manylinux1_x86_64.whl", hash = "sha256:386e2e4090f0bc5df274e720105c342263423e77ee8826002dcffe0c9533dbca"}, - {file = "coverage-4.5.4-cp34-cp34m-win32.whl", hash = "sha256:fa964bae817babece5aa2e8c1af841bebb6d0b9add8e637548809d040443fee0"}, - {file = "coverage-4.5.4-cp34-cp34m-win_amd64.whl", hash = "sha256:df6712284b2e44a065097846488f66840445eb987eb81b3cc6e4149e7b6982e1"}, - {file = "coverage-4.5.4-cp35-cp35m-macosx_10_12_x86_64.whl", hash = "sha256:efc89291bd5a08855829a3c522df16d856455297cf35ae827a37edac45f466a7"}, - {file = "coverage-4.5.4-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:e4ef9c164eb55123c62411f5936b5c2e521b12356037b6e1c2617cef45523d47"}, - {file = "coverage-4.5.4-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:ff37757e068ae606659c28c3bd0d923f9d29a85de79bf25b2b34b148473b5025"}, - {file = "coverage-4.5.4-cp35-cp35m-win32.whl", hash = "sha256:bf0a7aed7f5521c7ca67febd57db473af4762b9622254291fbcbb8cd0ba5e33e"}, - {file = "coverage-4.5.4-cp35-cp35m-win_amd64.whl", hash = "sha256:19e4df788a0581238e9390c85a7a09af39c7b539b29f25c89209e6c3e371270d"}, - {file = "coverage-4.5.4-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:60851187677b24c6085248f0a0b9b98d49cba7ecc7ec60ba6b9d2e5574ac1ee9"}, - {file = "coverage-4.5.4-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:245388cda02af78276b479f299bbf3783ef0a6a6273037d7c60dc73b8d8d7755"}, - {file = "coverage-4.5.4-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:c0afd27bc0e307a1ffc04ca5ec010a290e49e3afbe841c5cafc5c5a80ecd81c9"}, - {file = "coverage-4.5.4-cp36-cp36m-win32.whl", hash = "sha256:6ba744056423ef8d450cf627289166da65903885272055fb4b5e113137cfa14f"}, - {file = "coverage-4.5.4-cp36-cp36m-win_amd64.whl", hash = "sha256:af7ed8a8aa6957aac47b4268631fa1df984643f07ef00acd374e456364b373f5"}, - {file = "coverage-4.5.4-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:3a794ce50daee01c74a494919d5ebdc23d58873747fa0e288318728533a3e1ca"}, - {file = "coverage-4.5.4-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0be0f1ed45fc0c185cfd4ecc19a1d6532d72f86a2bac9de7e24541febad72650"}, - {file = "coverage-4.5.4-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:eca2b7343524e7ba246cab8ff00cab47a2d6d54ada3b02772e908a45675722e2"}, - {file = "coverage-4.5.4-cp37-cp37m-win32.whl", hash = "sha256:93715dffbcd0678057f947f496484e906bf9509f5c1c38fc9ba3922893cda5f5"}, - {file = "coverage-4.5.4-cp37-cp37m-win_amd64.whl", hash = "sha256:23cc09ed395b03424d1ae30dcc292615c1372bfba7141eb85e11e50efaa6b351"}, - {file = "coverage-4.5.4-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:141f08ed3c4b1847015e2cd62ec06d35e67a3ac185c26f7635f4406b90afa9c5"}, - {file = "coverage-4.5.4.tar.gz", hash = "sha256:e07d9f1a23e9e93ab5c62902833bf3e4b1f65502927379148b6622686223125c"}, - {file = "coverage-5.2-cp27-cp27m-macosx_10_13_intel.whl", hash = "sha256:d9ad0a988ae20face62520785ec3595a5e64f35a21762a57d115dae0b8fb894a"}, - {file = "coverage-5.2-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:4bb385a747e6ae8a65290b3df60d6c8a692a5599dc66c9fa3520e667886f2e10"}, - {file = "coverage-5.2-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:9702e2cb1c6dec01fb8e1a64c015817c0800a6eca287552c47a5ee0ebddccf62"}, - {file = "coverage-5.2-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:42fa45a29f1059eda4d3c7b509589cc0343cd6bbf083d6118216830cd1a51613"}, - {file = "coverage-5.2-cp27-cp27m-win32.whl", hash = "sha256:41d88736c42f4a22c494c32cc48a05828236e37c991bd9760f8923415e3169e4"}, - {file = "coverage-5.2-cp27-cp27m-win_amd64.whl", hash = "sha256:bbb387811f7a18bdc61a2ea3d102be0c7e239b0db9c83be7bfa50f095db5b92a"}, - {file = "coverage-5.2-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:3740b796015b889e46c260ff18b84683fa2e30f0f75a171fb10d2bf9fb91fc70"}, - {file = "coverage-5.2-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:ebf2431b2d457ae5217f3a1179533c456f3272ded16f8ed0b32961a6d90e38ee"}, - {file = "coverage-5.2-cp35-cp35m-macosx_10_13_x86_64.whl", hash = "sha256:d54d7ea74cc00482a2410d63bf10aa34ebe1c49ac50779652106c867f9986d6b"}, - {file = "coverage-5.2-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:87bdc8135b8ee739840eee19b184804e5d57f518578ffc797f5afa2c3c297913"}, - {file = "coverage-5.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:ed9a21502e9223f563e071759f769c3d6a2e1ba5328c31e86830368e8d78bc9c"}, - {file = "coverage-5.2-cp35-cp35m-win32.whl", hash = "sha256:509294f3e76d3f26b35083973fbc952e01e1727656d979b11182f273f08aa80b"}, - {file = "coverage-5.2-cp35-cp35m-win_amd64.whl", hash = "sha256:ca63dae130a2e788f2b249200f01d7fa240f24da0596501d387a50e57aa7075e"}, - {file = "coverage-5.2-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:5c74c5b6045969b07c9fb36b665c9cac84d6c174a809fc1b21bdc06c7836d9a0"}, - {file = "coverage-5.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:c32aa13cc3fe86b0f744dfe35a7f879ee33ac0a560684fef0f3e1580352b818f"}, - {file = "coverage-5.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:1e58fca3d9ec1a423f1b7f2aa34af4f733cbfa9020c8fe39ca451b6071237405"}, - {file = "coverage-5.2-cp36-cp36m-win32.whl", hash = "sha256:3b2c34690f613525672697910894b60d15800ac7e779fbd0fccf532486c1ba40"}, - {file = "coverage-5.2-cp36-cp36m-win_amd64.whl", hash = "sha256:a4d511012beb967a39580ba7d2549edf1e6865a33e5fe51e4dce550522b3ac0e"}, - {file = "coverage-5.2-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:32ecee61a43be509b91a526819717d5e5650e009a8d5eda8631a59c721d5f3b6"}, - {file = "coverage-5.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:6f91b4492c5cde83bfe462f5b2b997cdf96a138f7c58b1140f05de5751623cf1"}, - {file = "coverage-5.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:bfcc811883699ed49afc58b1ed9f80428a18eb9166422bce3c31a53dba00fd1d"}, - {file = "coverage-5.2-cp37-cp37m-win32.whl", hash = "sha256:60a3d36297b65c7f78329b80120f72947140f45b5c7a017ea730f9112b40f2ec"}, - {file = "coverage-5.2-cp37-cp37m-win_amd64.whl", hash = "sha256:12eaccd86d9a373aea59869bc9cfa0ab6ba8b1477752110cb4c10d165474f703"}, - {file = "coverage-5.2-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:d82db1b9a92cb5c67661ca6616bdca6ff931deceebb98eecbd328812dab52032"}, - {file = "coverage-5.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:214eb2110217f2636a9329bc766507ab71a3a06a8ea30cdeebb47c24dce5972d"}, - {file = "coverage-5.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8a3decd12e7934d0254939e2bf434bf04a5890c5bf91a982685021786a08087e"}, - {file = "coverage-5.2-cp38-cp38-win32.whl", hash = "sha256:1dcebae667b73fd4aa69237e6afb39abc2f27520f2358590c1b13dd90e32abe7"}, - {file = "coverage-5.2-cp38-cp38-win_amd64.whl", hash = "sha256:f50632ef2d749f541ca8e6c07c9928a37f87505ce3a9f20c8446ad310f1aa87b"}, - {file = "coverage-5.2-cp39-cp39-macosx_10_13_x86_64.whl", hash = "sha256:7403675df5e27745571aba1c957c7da2dacb537c21e14007ec3a417bf31f7f3d"}, - {file = "coverage-5.2-cp39-cp39-manylinux1_i686.whl", hash = "sha256:0fc4e0d91350d6f43ef6a61f64a48e917637e1dcfcba4b4b7d543c628ef82c2d"}, - {file = "coverage-5.2-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:25fe74b5b2f1b4abb11e103bb7984daca8f8292683957d0738cd692f6a7cc64c"}, - {file = "coverage-5.2-cp39-cp39-win32.whl", hash = "sha256:d67599521dff98ec8c34cd9652cbcfe16ed076a2209625fca9dc7419b6370e5c"}, - {file = "coverage-5.2-cp39-cp39-win_amd64.whl", hash = "sha256:10f2a618a6e75adf64329f828a6a5b40244c1c50f5ef4ce4109e904e69c71bd2"}, - {file = "coverage-5.2.tar.gz", hash = "sha256:1874bdc943654ba46d28f179c1846f5710eda3aeb265ff029e0ac2b52daae404"}, + {file = "coverage-5.3-cp27-cp27m-macosx_10_13_intel.whl", hash = "sha256:bd3166bb3b111e76a4f8e2980fa1addf2920a4ca9b2b8ca36a3bc3dedc618270"}, + {file = "coverage-5.3-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:9342dd70a1e151684727c9c91ea003b2fb33523bf19385d4554f7897ca0141d4"}, + {file = "coverage-5.3-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:63808c30b41f3bbf65e29f7280bf793c79f54fb807057de7e5238ffc7cc4d7b9"}, + {file = "coverage-5.3-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:4d6a42744139a7fa5b46a264874a781e8694bb32f1d76d8137b68138686f1729"}, + {file = "coverage-5.3-cp27-cp27m-win32.whl", hash = "sha256:86e9f8cd4b0cdd57b4ae71a9c186717daa4c5a99f3238a8723f416256e0b064d"}, + {file = "coverage-5.3-cp27-cp27m-win_amd64.whl", hash = "sha256:7858847f2d84bf6e64c7f66498e851c54de8ea06a6f96a32a1d192d846734418"}, + {file = "coverage-5.3-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:530cc8aaf11cc2ac7430f3614b04645662ef20c348dce4167c22d99bec3480e9"}, + {file = "coverage-5.3-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:381ead10b9b9af5f64646cd27107fb27b614ee7040bb1226f9c07ba96625cbb5"}, + {file = "coverage-5.3-cp35-cp35m-macosx_10_13_x86_64.whl", hash = "sha256:71b69bd716698fa62cd97137d6f2fdf49f534decb23a2c6fc80813e8b7be6822"}, + {file = "coverage-5.3-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:1d44bb3a652fed01f1f2c10d5477956116e9b391320c94d36c6bf13b088a1097"}, + {file = "coverage-5.3-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:1c6703094c81fa55b816f5ae542c6ffc625fec769f22b053adb42ad712d086c9"}, + {file = "coverage-5.3-cp35-cp35m-win32.whl", hash = "sha256:cedb2f9e1f990918ea061f28a0f0077a07702e3819602d3507e2ff98c8d20636"}, + {file = "coverage-5.3-cp35-cp35m-win_amd64.whl", hash = "sha256:7f43286f13d91a34fadf61ae252a51a130223c52bfefb50310d5b2deb062cf0f"}, + {file = "coverage-5.3-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:c851b35fc078389bc16b915a0a7c1d5923e12e2c5aeec58c52f4aa8085ac8237"}, + {file = "coverage-5.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:aac1ba0a253e17889550ddb1b60a2063f7474155465577caa2a3b131224cfd54"}, + {file = "coverage-5.3-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:2b31f46bf7b31e6aa690d4c7a3d51bb262438c6dcb0d528adde446531d0d3bb7"}, + {file = "coverage-5.3-cp36-cp36m-win32.whl", hash = "sha256:c5f17ad25d2c1286436761b462e22b5020d83316f8e8fcb5deb2b3151f8f1d3a"}, + {file = "coverage-5.3-cp36-cp36m-win_amd64.whl", hash = "sha256:aef72eae10b5e3116bac6957de1df4d75909fc76d1499a53fb6387434b6bcd8d"}, + {file = "coverage-5.3-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:e8caf961e1b1a945db76f1b5fa9c91498d15f545ac0ababbe575cfab185d3bd8"}, + {file = "coverage-5.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:29a6272fec10623fcbe158fdf9abc7a5fa032048ac1d8631f14b50fbfc10d17f"}, + {file = "coverage-5.3-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:2d43af2be93ffbad25dd959899b5b809618a496926146ce98ee0b23683f8c51c"}, + {file = "coverage-5.3-cp37-cp37m-win32.whl", hash = "sha256:c3888a051226e676e383de03bf49eb633cd39fc829516e5334e69b8d81aae751"}, + {file = "coverage-5.3-cp37-cp37m-win_amd64.whl", hash = "sha256:9669179786254a2e7e57f0ecf224e978471491d660aaca833f845b72a2df3709"}, + {file = "coverage-5.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0203acd33d2298e19b57451ebb0bed0ab0c602e5cf5a818591b4918b1f97d516"}, + {file = "coverage-5.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:582ddfbe712025448206a5bc45855d16c2e491c2dd102ee9a2841418ac1c629f"}, + {file = "coverage-5.3-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:0f313707cdecd5cd3e217fc68c78a960b616604b559e9ea60cc16795c4304259"}, + {file = "coverage-5.3-cp38-cp38-win32.whl", hash = "sha256:78e93cc3571fd928a39c0b26767c986188a4118edc67bc0695bc7a284da22e82"}, + {file = "coverage-5.3-cp38-cp38-win_amd64.whl", hash = "sha256:8f264ba2701b8c9f815b272ad568d555ef98dfe1576802ab3149c3629a9f2221"}, + {file = "coverage-5.3-cp39-cp39-macosx_10_13_x86_64.whl", hash = "sha256:50691e744714856f03a86df3e2bff847c2acede4c191f9a1da38f088df342978"}, + {file = "coverage-5.3-cp39-cp39-manylinux1_i686.whl", hash = "sha256:9361de40701666b034c59ad9e317bae95c973b9ff92513dd0eced11c6adf2e21"}, + {file = "coverage-5.3-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:c1b78fb9700fc961f53386ad2fd86d87091e06ede5d118b8a50dea285a071c24"}, + {file = "coverage-5.3-cp39-cp39-win32.whl", hash = "sha256:cb7df71de0af56000115eafd000b867d1261f786b5eebd88a0ca6360cccfaca7"}, + {file = "coverage-5.3-cp39-cp39-win_amd64.whl", hash = "sha256:47a11bdbd8ada9b7ee628596f9d97fbd3851bd9999d398e9436bd67376dbece7"}, + {file = "coverage-5.3.tar.gz", hash = "sha256:280baa8ec489c4f542f8940f9c4c2181f0306a8ee1a54eceba071a449fb870a0"}, +] +crashtest = [ + {file = "crashtest-0.3.1-py3-none-any.whl", hash = "sha256:300f4b0825f57688b47b6d70c6a31de33512eb2fa1ac614f780939aa0cf91680"}, + {file = "crashtest-0.3.1.tar.gz", hash = "sha256:42ca7b6ce88b6c7433e2ce47ea884e91ec93104a4b754998be498a8e6c3d37dd"}, ] cryptography = [ - {file = "cryptography-2.8-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:fb81c17e0ebe3358486cd8cc3ad78adbae58af12fc2bf2bc0bb84e8090fa5ce8"}, - {file = "cryptography-2.8-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:44ff04138935882fef7c686878e1c8fd80a723161ad6a98da31e14b7553170c2"}, - {file = "cryptography-2.8-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:369d2346db5934345787451504853ad9d342d7f721ae82d098083e1f49a582ad"}, - {file = "cryptography-2.8-cp27-cp27m-win32.whl", hash = "sha256:df6b4dca2e11865e6cfbfb708e800efb18370f5a46fd601d3755bc7f85b3a8a2"}, - {file = "cryptography-2.8-cp27-cp27m-win_amd64.whl", hash = "sha256:7f09806ed4fbea8f51585231ba742b58cbcfbfe823ea197d8c89a5e433c7e912"}, - {file = "cryptography-2.8-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:58363dbd966afb4f89b3b11dfb8ff200058fbc3b947507675c19ceb46104b48d"}, - {file = "cryptography-2.8-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:6ec280fb24d27e3d97aa731e16207d58bd8ae94ef6eab97249a2afe4ba643d42"}, - {file = "cryptography-2.8-cp34-abi3-macosx_10_6_intel.whl", hash = "sha256:b43f53f29816ba1db8525f006fa6f49292e9b029554b3eb56a189a70f2a40879"}, - {file = "cryptography-2.8-cp34-abi3-manylinux1_x86_64.whl", hash = "sha256:7270a6c29199adc1297776937a05b59720e8a782531f1f122f2eb8467f9aab4d"}, - {file = "cryptography-2.8-cp34-abi3-manylinux2010_x86_64.whl", hash = "sha256:de96157ec73458a7f14e3d26f17f8128c959084931e8997b9e655a39c8fde9f9"}, - {file = "cryptography-2.8-cp34-cp34m-win32.whl", hash = "sha256:02079a6addc7b5140ba0825f542c0869ff4df9a69c360e339ecead5baefa843c"}, - {file = "cryptography-2.8-cp34-cp34m-win_amd64.whl", hash = "sha256:b0de590a8b0979649ebeef8bb9f54394d3a41f66c5584fff4220901739b6b2f0"}, - {file = "cryptography-2.8-cp35-cp35m-win32.whl", hash = "sha256:ecadccc7ba52193963c0475ac9f6fa28ac01e01349a2ca48509667ef41ffd2cf"}, - {file = "cryptography-2.8-cp35-cp35m-win_amd64.whl", hash = "sha256:90df0cc93e1f8d2fba8365fb59a858f51a11a394d64dbf3ef844f783844cc793"}, - {file = "cryptography-2.8-cp36-cp36m-win32.whl", hash = "sha256:1df22371fbf2004c6f64e927668734070a8953362cd8370ddd336774d6743595"}, - {file = "cryptography-2.8-cp36-cp36m-win_amd64.whl", hash = "sha256:a518c153a2b5ed6b8cc03f7ae79d5ffad7315ad4569b2d5333a13c38d64bd8d7"}, - {file = "cryptography-2.8-cp37-cp37m-win32.whl", hash = "sha256:4b1030728872c59687badcca1e225a9103440e467c17d6d1730ab3d2d64bfeff"}, - {file = "cryptography-2.8-cp37-cp37m-win_amd64.whl", hash = "sha256:d31402aad60ed889c7e57934a03477b572a03af7794fa8fb1780f21ea8f6551f"}, - {file = "cryptography-2.8-cp38-cp38-win32.whl", hash = "sha256:73fd30c57fa2d0a1d7a49c561c40c2f79c7d6c374cc7750e9ac7c99176f6428e"}, - {file = "cryptography-2.8-cp38-cp38-win_amd64.whl", hash = "sha256:971221ed40f058f5662a604bd1ae6e4521d84e6cad0b7b170564cc34169c8f13"}, - {file = "cryptography-2.8.tar.gz", hash = "sha256:3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651"}, - {file = "cryptography-3.0-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:ab49edd5bea8d8b39a44b3db618e4783ef84c19c8b47286bf05dfdb3efb01c83"}, - {file = "cryptography-3.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:124af7255ffc8e964d9ff26971b3a6153e1a8a220b9a685dc407976ecb27a06a"}, - {file = "cryptography-3.0-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:51e40123083d2f946794f9fe4adeeee2922b581fa3602128ce85ff813d85b81f"}, - {file = "cryptography-3.0-cp27-cp27m-win32.whl", hash = "sha256:dea0ba7fe6f9461d244679efa968d215ea1f989b9c1957d7f10c21e5c7c09ad6"}, - {file = "cryptography-3.0-cp27-cp27m-win_amd64.whl", hash = "sha256:8ecf9400d0893836ff41b6f977a33972145a855b6efeb605b49ee273c5e6469f"}, - {file = "cryptography-3.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:0c608ff4d4adad9e39b5057de43657515c7da1ccb1807c3a27d4cf31fc923b4b"}, - {file = "cryptography-3.0-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:bec7568c6970b865f2bcebbe84d547c52bb2abadf74cefce396ba07571109c67"}, - {file = "cryptography-3.0-cp35-abi3-macosx_10_10_x86_64.whl", hash = "sha256:0cbfed8ea74631fe4de00630f4bb592dad564d57f73150d6f6796a24e76c76cd"}, - {file = "cryptography-3.0-cp35-abi3-manylinux1_x86_64.whl", hash = "sha256:a09fd9c1cca9a46b6ad4bea0a1f86ab1de3c0c932364dbcf9a6c2a5eeb44fa77"}, - {file = "cryptography-3.0-cp35-abi3-manylinux2010_x86_64.whl", hash = "sha256:ce82cc06588e5cbc2a7df3c8a9c778f2cb722f56835a23a68b5a7264726bb00c"}, - {file = "cryptography-3.0-cp35-cp35m-win32.whl", hash = "sha256:9367d00e14dee8d02134c6c9524bb4bd39d4c162456343d07191e2a0b5ec8b3b"}, - {file = "cryptography-3.0-cp35-cp35m-win_amd64.whl", hash = "sha256:384d7c681b1ab904fff3400a6909261cae1d0939cc483a68bdedab282fb89a07"}, - {file = "cryptography-3.0-cp36-cp36m-win32.whl", hash = "sha256:4d355f2aee4a29063c10164b032d9fa8a82e2c30768737a2fd56d256146ad559"}, - {file = "cryptography-3.0-cp36-cp36m-win_amd64.whl", hash = "sha256:45741f5499150593178fc98d2c1a9c6722df88b99c821ad6ae298eff0ba1ae71"}, - {file = "cryptography-3.0-cp37-cp37m-win32.whl", hash = "sha256:8ecef21ac982aa78309bb6f092d1677812927e8b5ef204a10c326fc29f1367e2"}, - {file = "cryptography-3.0-cp37-cp37m-win_amd64.whl", hash = "sha256:4b9303507254ccb1181d1803a2080a798910ba89b1a3c9f53639885c90f7a756"}, - {file = "cryptography-3.0-cp38-cp38-win32.whl", hash = "sha256:8713ddb888119b0d2a1462357d5946b8911be01ddbf31451e1d07eaa5077a261"}, - {file = "cryptography-3.0-cp38-cp38-win_amd64.whl", hash = "sha256:bea0b0468f89cdea625bb3f692cd7a4222d80a6bdafd6fb923963f2b9da0e15f"}, - {file = "cryptography-3.0.tar.gz", hash = "sha256:8e924dbc025206e97756e8903039662aa58aa9ba357d8e1d8fc29e3092322053"}, + {file = "cryptography-3.1.1-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:65beb15e7f9c16e15934569d29fb4def74ea1469d8781f6b3507ab896d6d8719"}, + {file = "cryptography-3.1.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:983c0c3de4cb9fcba68fd3f45ed846eb86a2a8b8d8bc5bb18364c4d00b3c61fe"}, + {file = "cryptography-3.1.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:e97a3b627e3cb63c415a16245d6cef2139cca18bb1183d1b9375a1c14e83f3b3"}, + {file = "cryptography-3.1.1-cp27-cp27m-win32.whl", hash = "sha256:cb179acdd4ae1e4a5a160d80b87841b3d0e0be84af46c7bb2cd7ece57a39c4ba"}, + {file = "cryptography-3.1.1-cp27-cp27m-win_amd64.whl", hash = "sha256:b372026ebf32fe2523159f27d9f0e9f485092e43b00a5adacf732192a70ba118"}, + {file = "cryptography-3.1.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:680da076cad81cdf5ffcac50c477b6790be81768d30f9da9e01960c4b18a66db"}, + {file = "cryptography-3.1.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:5d52c72449bb02dd45a773a203196e6d4fae34e158769c896012401f33064396"}, + {file = "cryptography-3.1.1-cp35-abi3-macosx_10_10_x86_64.whl", hash = "sha256:f0e099fc4cc697450c3dd4031791559692dd941a95254cb9aeded66a7aa8b9bc"}, + {file = "cryptography-3.1.1-cp35-abi3-manylinux1_x86_64.whl", hash = "sha256:a7597ffc67987b37b12e09c029bd1dc43965f75d328076ae85721b84046e9ca7"}, + {file = "cryptography-3.1.1-cp35-abi3-manylinux2010_x86_64.whl", hash = "sha256:4549b137d8cbe3c2eadfa56c0c858b78acbeff956bd461e40000b2164d9167c6"}, + {file = "cryptography-3.1.1-cp35-abi3-manylinux2014_aarch64.whl", hash = "sha256:89aceb31cd5f9fc2449fe8cf3810797ca52b65f1489002d58fe190bfb265c536"}, + {file = "cryptography-3.1.1-cp35-cp35m-win32.whl", hash = "sha256:559d622aef2a2dff98a892eef321433ba5bc55b2485220a8ca289c1ecc2bd54f"}, + {file = "cryptography-3.1.1-cp35-cp35m-win_amd64.whl", hash = "sha256:451cdf60be4dafb6a3b78802006a020e6cd709c22d240f94f7a0696240a17154"}, + {file = "cryptography-3.1.1-cp36-abi3-win32.whl", hash = "sha256:762bc5a0df03c51ee3f09c621e1cee64e3a079a2b5020de82f1613873d79ee70"}, + {file = "cryptography-3.1.1-cp36-abi3-win_amd64.whl", hash = "sha256:b12e715c10a13ca1bd27fbceed9adc8c5ff640f8e1f7ea76416352de703523c8"}, + {file = "cryptography-3.1.1-cp36-cp36m-win32.whl", hash = "sha256:21b47c59fcb1c36f1113f3709d37935368e34815ea1d7073862e92f810dc7499"}, + {file = "cryptography-3.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:48ee615a779ffa749d7d50c291761dc921d93d7cf203dca2db663b4f193f0e49"}, + {file = "cryptography-3.1.1-cp37-cp37m-win32.whl", hash = "sha256:b2bded09c578d19e08bd2c5bb8fed7f103e089752c9cf7ca7ca7de522326e921"}, + {file = "cryptography-3.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:f99317a0fa2e49917689b8cf977510addcfaaab769b3f899b9c481bbd76730c2"}, + {file = "cryptography-3.1.1-cp38-cp38-win32.whl", hash = "sha256:ab010e461bb6b444eaf7f8c813bb716be2d78ab786103f9608ffd37a4bd7d490"}, + {file = "cryptography-3.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:99d4984aabd4c7182050bca76176ce2dbc9fa9748afe583a7865c12954d714ba"}, + {file = "cryptography-3.1.1.tar.gz", hash = "sha256:9d9fc6a16357965d282dd4ab6531013935425d0dc4950df2e0cf2a1b1ac1017d"}, ] distlib = [ {file = "distlib-0.3.1-py2.py3-none-any.whl", hash = "sha256:8c09de2c67b3e7deef7184574fc060ab8a793e7adbb183d942c389c8b13c52fb"}, @@ -1952,9 +1160,6 @@ functools32 = [ {file = "functools32-3.2.3-2.tar.gz", hash = "sha256:f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d"}, {file = "functools32-3.2.3-2.zip", hash = "sha256:89d824aa6c358c421a234d7f9ee0bd75933a67c29588ce50aaa3acdf4d403fa0"}, ] -future = [ - {file = "future-0.18.2.tar.gz", hash = "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"}, -] futures = [ {file = "futures-3.3.0-py2-none-any.whl", hash = "sha256:49b3f5b064b6e3afc3316421a3f25f66c137ae88f068abbf72830170033c5e16"}, {file = "futures-3.3.0.tar.gz", hash = "sha256:7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794"}, @@ -1963,8 +1168,6 @@ glob2 = [ {file = "glob2-0.6.tar.gz", hash = "sha256:f5b0a686ff21f820c4d3f0c4edd216704cea59d79d00fa337e244a2f2ff83ed6"}, ] html5lib = [ - {file = "html5lib-1.0.1-py2.py3-none-any.whl", hash = "sha256:20b159aa3badc9d5ee8f5c647e5efd02ed2a66ab8d354930bd9ff139fc1dc0a3"}, - {file = "html5lib-1.0.1.tar.gz", hash = "sha256:66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736"}, {file = "html5lib-1.1-py2.py3-none-any.whl", hash = "sha256:0d78f8fde1c230e99fe37986a60526d7049ed4bf8a9fadbad5f00e22e58e041d"}, {file = "html5lib-1.1.tar.gz", hash = "sha256:b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f"}, ] @@ -1972,22 +1175,18 @@ httpretty = [ {file = "httpretty-0.9.7.tar.gz", hash = "sha256:66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe"}, ] identify = [ - {file = "identify-1.4.24-py2.py3-none-any.whl", hash = "sha256:5519601b70c831011fb425ffd214101df7639ba3980f24dc283f7675b19127b3"}, - {file = "identify-1.4.24.tar.gz", hash = "sha256:06b4373546ae55eaaefdac54f006951dbd968fe2912846c00e565b09cfaed101"}, + {file = "identify-1.5.5-py2.py3-none-any.whl", hash = "sha256:da683bfb7669fa749fc7731f378229e2dbf29a1d1337cbde04106f02236eb29d"}, + {file = "identify-1.5.5.tar.gz", hash = "sha256:7c22c384a2c9b32c5cc891d13f923f6b2653aa83e2d75d8f79be240d6c86c4f4"}, ] idna = [ - {file = "idna-2.8-py2.py3-none-any.whl", hash = "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c"}, - {file = "idna-2.8.tar.gz", hash = "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407"}, {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"}, ] importlib-metadata = [ - {file = "importlib_metadata-1.1.3-py2.py3-none-any.whl", hash = "sha256:7c7f8ac40673f507f349bef2eed21a0e5f01ddf5b2a7356a6c65eb2099b53764"}, - {file = "importlib_metadata-1.1.3.tar.gz", hash = "sha256:7a99fb4084ffe6dae374961ba7a6521b79c1d07c658ab3a28aa264ee1d1b14e3"}, + {file = "importlib_metadata-1.7.0-py2.py3-none-any.whl", hash = "sha256:dc15b2969b4ce36305c51eebe62d418ac7791e9a157911d58bfb1f9ccd8e2070"}, + {file = "importlib_metadata-1.7.0.tar.gz", hash = "sha256:90bb658cdbbf6d1735b6341ce708fc7024a3e14e99ffdc5783edea9f9b077f83"}, ] importlib-resources = [ - {file = "importlib_resources-1.0.2-py2.py3-none-any.whl", hash = "sha256:6e2783b2538bd5a14678284a3962b0660c715e5a0f10243fd5e00a4b5974f50b"}, - {file = "importlib_resources-1.0.2.tar.gz", hash = "sha256:d3279fd0f6f847cced9f7acc19bd3e5df54d34f93a2e7bb5f238f81545787078"}, {file = "importlib_resources-3.0.0-py2.py3-none-any.whl", hash = "sha256:d028f66b66c0d5732dae86ba4276999855e162a749c92620a38c1d779ed138a7"}, {file = "importlib_resources-3.0.0.tar.gz", hash = "sha256:19f745a6eca188b490b1428c8d1d4a0d2368759f32370ea8fb89cad2ab1106c3"}, ] @@ -1999,89 +1198,18 @@ jeepney = [ {file = "jeepney-0.4.3-py3-none-any.whl", hash = "sha256:d6c6b49683446d2407d2fe3acb7a368a77ff063f9182fe427da15d622adc24cf"}, {file = "jeepney-0.4.3.tar.gz", hash = "sha256:3479b861cc2b6407de5188695fa1a8d57e5072d7059322469b62628869b8e36e"}, ] -jinja2 = [ - {file = "Jinja2-2.10.3-py2.py3-none-any.whl", hash = "sha256:74320bb91f31270f9551d46522e33af46a80c3d619f4a4bf42b3164d30b5911f"}, - {file = "Jinja2-2.10.3.tar.gz", hash = "sha256:9fe95f19286cfefaa917656583d020be14e7859c6b0252588391e47db34527de"}, - {file = "Jinja2-2.11.2-py2.py3-none-any.whl", hash = "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035"}, - {file = "Jinja2-2.11.2.tar.gz", hash = "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0"}, -] -joblib = [ - {file = "joblib-0.14.1-py2.py3-none-any.whl", hash = "sha256:bdb4fd9b72915ffb49fde2229ce482dd7ae79d842ed8c2b4c932441495af1403"}, - {file = "joblib-0.14.1.tar.gz", hash = "sha256:0630eea4f5664c463f23fbf5dcfc54a2bc6168902719fa8e19daf033022786c8"}, -] -jsonschema = [ - {file = "jsonschema-3.2.0-py2.py3-none-any.whl", hash = "sha256:4e5b3cf8216f577bee9ce139cbe72eca3ea4f292ec60928ff24758ce626cd163"}, - {file = "jsonschema-3.2.0.tar.gz", hash = "sha256:c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a"}, -] keyring = [ {file = "keyring-18.0.1-py2.py3-none-any.whl", hash = "sha256:7b29ebfcf8678c4da531b2478a912eea01e80007e5ddca9ee0c7038cb3489ec6"}, {file = "keyring-18.0.1.tar.gz", hash = "sha256:67d6cc0132bd77922725fae9f18366bb314fd8f95ff4d323a4df41890a96a838"}, {file = "keyring-20.0.1-py2.py3-none-any.whl", hash = "sha256:c674f032424b4bffc62abeac5523ec49cc84aed07a480c3233e0baf618efc15c"}, {file = "keyring-20.0.1.tar.gz", hash = "sha256:963bfa7f090269d30bdc5e25589e5fd9dad2cf2a7c6f176a7f2386910e5d0d8d"}, -] -livereload = [ - {file = "livereload-2.6.2.tar.gz", hash = "sha256:d1eddcb5c5eb8d2ca1fa1f750e580da624c0f7fcb734aa5780dc81b7dcbd89be"}, + {file = "keyring-21.4.0-py3-none-any.whl", hash = "sha256:4e34ea2fdec90c1c43d6610b5a5fafa1b9097db1802948e90caf5763974b8f8d"}, + {file = "keyring-21.4.0.tar.gz", hash = "sha256:9aeadd006a852b78f4b4ef7c7556c2774d2432bbef8ee538a3e9089ac8b11466"}, ] lockfile = [ {file = "lockfile-0.12.2-py2.py3-none-any.whl", hash = "sha256:6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa"}, {file = "lockfile-0.12.2.tar.gz", hash = "sha256:6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"}, ] -lunr = [ - {file = "lunr-0.5.8-py2.py3-none-any.whl", hash = "sha256:aab3f489c4d4fab4c1294a257a30fec397db56f0a50273218ccc3efdbf01d6ca"}, - {file = "lunr-0.5.8.tar.gz", hash = "sha256:c4fb063b98eff775dd638b3df380008ae85e6cb1d1a24d1cd81a10ef6391c26e"}, -] -markdown = [ - {file = "Markdown-3.0.1-py2.py3-none-any.whl", hash = "sha256:c00429bd503a47ec88d5e30a751e147dcb4c6889663cd3e2ba0afe858e009baa"}, - {file = "Markdown-3.0.1.tar.gz", hash = "sha256:d02e0f9b04c500cde6637c11ad7c72671f359b87b9fe924b2383649d8841db7c"}, - {file = "Markdown-3.1.1-py2.py3-none-any.whl", hash = "sha256:56a46ac655704b91e5b7e6326ce43d5ef72411376588afa1dd90e881b83c7e8c"}, - {file = "Markdown-3.1.1.tar.gz", hash = "sha256:2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a"}, - {file = "Markdown-3.2.2-py3-none-any.whl", hash = "sha256:c467cd6233885534bf0fe96e62e3cf46cfc1605112356c4f9981512b8174de59"}, - {file = "Markdown-3.2.2.tar.gz", hash = "sha256:1fafe3f1ecabfb514a5285fca634a53c1b32a81cb0feb154264d55bf2ff22c17"}, -] -markdown-include = [ - {file = "markdown-include-0.5.1.tar.gz", hash = "sha256:72a45461b589489a088753893bc95c5fa5909936186485f4ed55caa57d10250f"}, -] -markupsafe = [ - {file = "MarkupSafe-1.1.1-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161"}, - {file = "MarkupSafe-1.1.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7"}, - {file = "MarkupSafe-1.1.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183"}, - {file = "MarkupSafe-1.1.1-cp27-cp27m-win32.whl", hash = "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b"}, - {file = "MarkupSafe-1.1.1-cp27-cp27m-win_amd64.whl", hash = "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e"}, - {file = "MarkupSafe-1.1.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f"}, - {file = "MarkupSafe-1.1.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1"}, - {file = "MarkupSafe-1.1.1-cp34-cp34m-macosx_10_6_intel.whl", hash = "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5"}, - {file = "MarkupSafe-1.1.1-cp34-cp34m-manylinux1_i686.whl", hash = "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1"}, - {file = "MarkupSafe-1.1.1-cp34-cp34m-manylinux1_x86_64.whl", hash = "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735"}, - {file = "MarkupSafe-1.1.1-cp34-cp34m-win32.whl", hash = "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21"}, - {file = "MarkupSafe-1.1.1-cp34-cp34m-win_amd64.whl", hash = "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235"}, - {file = "MarkupSafe-1.1.1-cp35-cp35m-macosx_10_6_intel.whl", hash = "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b"}, - {file = "MarkupSafe-1.1.1-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f"}, - {file = "MarkupSafe-1.1.1-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905"}, - {file = "MarkupSafe-1.1.1-cp35-cp35m-win32.whl", hash = "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1"}, - {file = "MarkupSafe-1.1.1-cp35-cp35m-win_amd64.whl", hash = "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d"}, - {file = "MarkupSafe-1.1.1-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff"}, - {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473"}, - {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e"}, - {file = "MarkupSafe-1.1.1-cp36-cp36m-win32.whl", hash = "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66"}, - {file = "MarkupSafe-1.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5"}, - {file = "MarkupSafe-1.1.1-cp37-cp37m-macosx_10_6_intel.whl", hash = "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d"}, - {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e"}, - {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6"}, - {file = "MarkupSafe-1.1.1-cp37-cp37m-win32.whl", hash = "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2"}, - {file = "MarkupSafe-1.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-win32.whl", hash = "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be"}, - {file = "MarkupSafe-1.1.1.tar.gz", hash = "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"}, -] -mkdocs = [ - {file = "mkdocs-1.0.4-py2.py3-none-any.whl", hash = "sha256:8cc8b38325456b9e942c981a209eaeb1e9f3f77b493ad755bfef889b9c8d356a"}, - {file = "mkdocs-1.0.4.tar.gz", hash = "sha256:17d34329aad75d5de604b9ed4e31df3a4d235afefdc46ce7b1964fddb2e1e939"}, - {file = "mkdocs-1.1.2-py3-none-any.whl", hash = "sha256:096f52ff52c02c7e90332d2e53da862fde5c062086e1b5356a6e392d5d60f5e9"}, - {file = "mkdocs-1.1.2.tar.gz", hash = "sha256:f0b61e5402b99d7789efa032c7a74c90a20220a9c81749da06dbfbcbd52ffb39"}, -] mock = [ {file = "mock-3.0.5-py2.py3-none-any.whl", hash = "sha256:d157e52d4e5b938c550f39eb2fd15610db062441a9c2747d3dbfa9298211d0f8"}, {file = "mock-3.0.5.tar.gz", hash = "sha256:83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3"}, @@ -2090,10 +1218,8 @@ more-itertools = [ {file = "more-itertools-5.0.0.tar.gz", hash = "sha256:38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4"}, {file = "more_itertools-5.0.0-py2-none-any.whl", hash = "sha256:c0a5785b1109a6bd7fac76d6837fd1feca158e54e521ccd2ae8bfe393cc9d4fc"}, {file = "more_itertools-5.0.0-py3-none-any.whl", hash = "sha256:fe7a7cae1ccb57d33952113ff4fa1bc5f879963600ed74918f1236e212ee50b9"}, - {file = "more-itertools-7.2.0.tar.gz", hash = "sha256:409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832"}, - {file = "more_itertools-7.2.0-py3-none-any.whl", hash = "sha256:92b8c4b06dac4f0611c0729b2f2ede52b2e1bac1ab48f089c7ddc12e26bb60c4"}, - {file = "more-itertools-8.4.0.tar.gz", hash = "sha256:68c70cc7167bdf5c7c9d8f6954a7837089c6a36bf565383919bb595efb8a17e5"}, - {file = "more_itertools-8.4.0-py3-none-any.whl", hash = "sha256:b78134b2063dd214000685165d81c154522c3ee0a1c0d4d113c80361c234c5a2"}, + {file = "more-itertools-8.5.0.tar.gz", hash = "sha256:6f83822ae94818eae2612063a5101a7311e68ae8002005b5e05f03fd74a86a20"}, + {file = "more_itertools-8.5.0-py3-none-any.whl", hash = "sha256:9b30f12df9393f0d28af9210ff8efe48d10c94f73e5daf886f10c4b0b0b4f03c"}, ] msgpack = [ {file = "msgpack-1.0.0-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:cec8bf10981ed70998d98431cd814db0ecf3384e6b113366e7f36af71a0fca08"}, @@ -2115,32 +1241,22 @@ msgpack = [ {file = "msgpack-1.0.0-cp38-cp38-win_amd64.whl", hash = "sha256:39c54fdebf5fa4dda733369012c59e7d085ebdfe35b6cf648f09d16708f1be5d"}, {file = "msgpack-1.0.0.tar.gz", hash = "sha256:9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0"}, ] -nltk = [ - {file = "nltk-3.5.zip", hash = "sha256:845365449cd8c5f9731f7cb9f8bd6fd0767553b9d53af9eb1b3abf7700936b35"}, -] nodeenv = [ - {file = "nodeenv-1.4.0-py2.py3-none-any.whl", hash = "sha256:4b0b77afa3ba9b54f4b6396e60b0c83f59eaeb2d63dc3cc7a70f7f4af96c82bc"}, + {file = "nodeenv-1.5.0-py2.py3-none-any.whl", hash = "sha256:5304d424c529c997bc888453aeaa6362d242b6b4631e90f3d4bf1b290f1c84a9"}, + {file = "nodeenv-1.5.0.tar.gz", hash = "sha256:ab45090ae383b716c4ef89e690c41ff8c2b257b85b309f01f3654df3d084bd7c"}, ] packaging = [ {file = "packaging-20.4-py2.py3-none-any.whl", hash = "sha256:998416ba6962ae7fbd6596850b80e17859a5753ba17c32284f67bfff33784181"}, {file = "packaging-20.4.tar.gz", hash = "sha256:4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8"}, ] pastel = [ - {file = "pastel-0.2.0-py2.py3-none-any.whl", hash = "sha256:18b559dc3ad4ba9b8bd5baebe6503f25f36d21460f021cf27a8d889cb5d17840"}, - {file = "pastel-0.2.0.tar.gz", hash = "sha256:46155fc523bdd4efcd450bbcb3f2b94a6e3b25edc0eb493e081104ad09e1ca36"}, + {file = "pastel-0.2.1-py2.py3-none-any.whl", hash = "sha256:4349225fcdf6c2bb34d483e523475de5bb04a5c10ef711263452cb37d7dd4364"}, + {file = "pastel-0.2.1.tar.gz", hash = "sha256:e6581ac04e973cac858828c6202c1e1e81fee1dc7de7683f3e1ffe0bfd8a573d"}, ] pathlib2 = [ {file = "pathlib2-2.3.5-py2.py3-none-any.whl", hash = "sha256:0ec8205a157c80d7acc301c0b18fbd5d44fe655968f5d947b6ecef5290fc35db"}, {file = "pathlib2-2.3.5.tar.gz", hash = "sha256:6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868"}, ] -pathspec = [ - {file = "pathspec-0.8.0-py2.py3-none-any.whl", hash = "sha256:7d91249d21749788d07a2d0f94147accd8f845507400749ea19c1ec9054a12b0"}, - {file = "pathspec-0.8.0.tar.gz", hash = "sha256:da45173eb3a6f2a5a487efba21f050af2b41948be6ab52b6a1e3ff22bb8b7061"}, -] -pep562 = [ - {file = "pep562-1.0-py2.py3-none-any.whl", hash = "sha256:d2a48b178ebf5f8dd31709cc26a19808ef794561fa2fe50ea01ea2bad4d667ef"}, - {file = "pep562-1.0.tar.gz", hash = "sha256:58cb1cc9ee63d93e62b4905a50357618d526d289919814bea1f0da8f53b79395"}, -] pexpect = [ {file = "pexpect-4.8.0-py2.py3-none-any.whl", hash = "sha256:0b48a55dcb3c05f3329815901ea4fc1537514d6ba867a152b581d69ae3710937"}, {file = "pexpect-4.8.0.tar.gz", hash = "sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c"}, @@ -2153,11 +1269,13 @@ pluggy = [ {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"}, ] +poetry-core = [ + {file = "poetry-core-1.0.0.tar.gz", hash = "sha256:6a664ff389b9f45382536f8fa1611a0cb4d2de7c5a5c885db1f0c600cd11fbd5"}, + {file = "poetry_core-1.0.0-py2.py3-none-any.whl", hash = "sha256:769288e0e1b88dfcceb3185728f0b7388b26d5f93d6c22d2dcae372da51d200d"}, +] pre-commit = [ - {file = "pre_commit-1.18.3-py2.py3-none-any.whl", hash = "sha256:fa78ff96e8e9ac94c748388597693f18b041a181c94a4f039ad20f45287ba44a"}, - {file = "pre_commit-1.18.3.tar.gz", hash = "sha256:1d3c0587bda7c4e537a46c27f2c84aa006acc18facf9970bf947df596ce91f3f"}, - {file = "pre_commit-1.21.0-py2.py3-none-any.whl", hash = "sha256:f92a359477f3252452ae2e8d3029de77aec59415c16ae4189bcfba40b757e029"}, - {file = "pre_commit-1.21.0.tar.gz", hash = "sha256:8f48d8637bdae6fa70cc97db9c1dd5aa7c5c8bf71968932a380628c25978b850"}, + {file = "pre_commit-2.7.1-py2.py3-none-any.whl", hash = "sha256:810aef2a2ba4f31eed1941fc270e72696a1ad5590b9751839c90807d0fff6b9a"}, + {file = "pre_commit-2.7.1.tar.gz", hash = "sha256:c54fd3e574565fe128ecc5e7d2f91279772ddb03f8729645fa812fe809084a70"}, ] ptyprocess = [ {file = "ptyprocess-0.6.0-py2.py3-none-any.whl", hash = "sha256:d7cc528d76e76342423ca640335bd3633420dc1366f258cb31d05e865ef5ca1f"}, @@ -2171,37 +1289,14 @@ pycparser = [ {file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"}, {file = "pycparser-2.20.tar.gz", hash = "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"}, ] -pygments = [ - {file = "Pygments-2.3.1-py2.py3-none-any.whl", hash = "sha256:e8218dd399a61674745138520d0d4cf2621d7e032439341bc3f647bff125818d"}, - {file = "Pygments-2.3.1.tar.gz", hash = "sha256:5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a"}, - {file = "Pygments-2.5.2-py2.py3-none-any.whl", hash = "sha256:2a3fe295e54a20164a9df49c75fa58526d3be48e14aceba6d6b1e8ac0bfd6f1b"}, - {file = "Pygments-2.5.2.tar.gz", hash = "sha256:98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe"}, - {file = "Pygments-2.6.1-py3-none-any.whl", hash = "sha256:ff7a40b4860b727ab48fad6360eb351cc1b33cbf9b15a0f689ca5353e9463324"}, - {file = "Pygments-2.6.1.tar.gz", hash = "sha256:647344a061c249a3b74e230c739f434d7ea4d8b1d5f3721bc0f3558049b38f44"}, -] -pygments-github-lexers = [ - {file = "pygments-github-lexers-0.0.5.tar.gz", hash = "sha256:aaca57e77cd6fcfce8d6ee97a998962eebf7fbb810519a8ebde427c62823e133"}, - {file = "pygments_github_lexers-0.0.5-py3.4.egg", hash = "sha256:0f9e9fb607d351c127a1e55e82a6eb491ed1fc11b2d6a0444ba217dc6d1f82c1"}, -] pylev = [ {file = "pylev-1.3.0-py2.py3-none-any.whl", hash = "sha256:1d29a87beb45ebe1e821e7a3b10da2b6b2f4c79b43f482c2df1a1f748a6e114e"}, {file = "pylev-1.3.0.tar.gz", hash = "sha256:063910098161199b81e453025653ec53556c1be7165a9b7c50be2f4d57eae1c3"}, ] -pymdown-extensions = [ - {file = "pymdown-extensions-6.0.tar.gz", hash = "sha256:6cf0cf36b5a03b291ace22dc2f320f4789ce56fbdb6635a3be5fadbf5d7694dd"}, - {file = "pymdown_extensions-6.0-py2.py3-none-any.whl", hash = "sha256:25b0a7967fa697b5035e23340a48594e3e93acb10b06d74574218ace3347d1df"}, - {file = "pymdown-extensions-6.2.1.tar.gz", hash = "sha256:3bbe6048275f8a0d13a0fe44e0ea201e67268aa7bb40c2544eef16abbf168f7b"}, - {file = "pymdown_extensions-6.2.1-py2.py3-none-any.whl", hash = "sha256:dce5e17b93be0572322b7d06c9a13c13a9d98694d6468277911d50ca87d26f29"}, - {file = "pymdown-extensions-6.3.tar.gz", hash = "sha256:cb879686a586b22292899771f5e5bc3382808e92aa938f71b550ecdea709419f"}, - {file = "pymdown_extensions-6.3-py2.py3-none-any.whl", hash = "sha256:66fae2683c7a1dac53184f7de57f51f8dad73f9ead2f453e94e85096cb811335"}, -] pyparsing = [ {file = "pyparsing-2.4.7-py2.py3-none-any.whl", hash = "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"}, {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"}, ] -pyrsistent = [ - {file = "pyrsistent-0.14.11.tar.gz", hash = "sha256:3ca82748918eb65e2d89f222b702277099aca77e34843c5eb9d52451173970e2"}, -] pytest = [ {file = "pytest-4.6.11-py2.py3-none-any.whl", hash = "sha256:a00a7d79cbbdfa9d21e7d0298392a8dd4123316bfac545075e6f8f24c94d8c97"}, {file = "pytest-4.6.11.tar.gz", hash = "sha256:50fa82392f2120cc3ec2ca0a75ee615be4c479e66669789771f1758332be4353"}, @@ -2209,10 +1304,8 @@ pytest = [ {file = "pytest-5.4.3.tar.gz", hash = "sha256:7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8"}, ] pytest-cov = [ - {file = "pytest-cov-2.8.1.tar.gz", hash = "sha256:cc6742d8bac45070217169f5f72ceee1e0e55b0221f54bcf24845972d3a47f2b"}, - {file = "pytest_cov-2.8.1-py2.py3-none-any.whl", hash = "sha256:cdbdef4f870408ebdbfeb44e63e07eb18bb4619fae852f6e760645fa36172626"}, - {file = "pytest-cov-2.10.0.tar.gz", hash = "sha256:1a629dc9f48e53512fcbfda6b07de490c374b0c83c55ff7a1720b3fccff0ac87"}, - {file = "pytest_cov-2.10.0-py2.py3-none-any.whl", hash = "sha256:6e6d18092dce6fad667cd7020deed816f858ad3b49d5b5e2b1cc1c97a4dba65c"}, + {file = "pytest-cov-2.10.1.tar.gz", hash = "sha256:47bd0ce14056fdd79f93e1713f88fad7bdcc583dcd7783da86ef2f085a0bb88e"}, + {file = "pytest_cov-2.10.1-py2.py3-none-any.whl", hash = "sha256:45ec2d5182f89a81fc3eb29e3d1ed3113b9e9a873bcddb2a71faaab066110191"}, ] pytest-mock = [ {file = "pytest-mock-1.13.0.tar.gz", hash = "sha256:e24a911ec96773022ebcc7030059b57cd3480b56d4f5d19b7c370ec635e6aed5"}, @@ -2226,17 +1319,6 @@ pywin32-ctypes = [ {file = "pywin32_ctypes-0.2.0-py2.py3-none-any.whl", hash = "sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98"}, ] pyyaml = [ - {file = "PyYAML-5.2-cp27-cp27m-win32.whl", hash = "sha256:35ace9b4147848cafac3db142795ee42deebe9d0dad885ce643928e88daebdcc"}, - {file = "PyYAML-5.2-cp27-cp27m-win_amd64.whl", hash = "sha256:ebc4ed52dcc93eeebeae5cf5deb2ae4347b3a81c3fa12b0b8c976544829396a4"}, - {file = "PyYAML-5.2-cp35-cp35m-win32.whl", hash = "sha256:38a4f0d114101c58c0f3a88aeaa44d63efd588845c5a2df5290b73db8f246d15"}, - {file = "PyYAML-5.2-cp35-cp35m-win_amd64.whl", hash = "sha256:483eb6a33b671408c8529106df3707270bfacb2447bf8ad856a4b4f57f6e3075"}, - {file = "PyYAML-5.2-cp36-cp36m-win32.whl", hash = "sha256:7f38e35c00e160db592091751d385cd7b3046d6d51f578b29943225178257b31"}, - {file = "PyYAML-5.2-cp36-cp36m-win_amd64.whl", hash = "sha256:0e7f69397d53155e55d10ff68fdfb2cf630a35e6daf65cf0bdeaf04f127c09dc"}, - {file = "PyYAML-5.2-cp37-cp37m-win32.whl", hash = "sha256:e4c015484ff0ff197564917b4b4246ca03f411b9bd7f16e02a2f586eb48b6d04"}, - {file = "PyYAML-5.2-cp37-cp37m-win_amd64.whl", hash = "sha256:4b6be5edb9f6bb73680f5bf4ee08ff25416d1400fbd4535fe0069b2994da07cd"}, - {file = "PyYAML-5.2-cp38-cp38-win32.whl", hash = "sha256:8100c896ecb361794d8bfdb9c11fce618c7cf83d624d73d5ab38aef3bc82d43f"}, - {file = "PyYAML-5.2-cp38-cp38-win_amd64.whl", hash = "sha256:2e9f0b7c5914367b0916c3c104a024bb68f269a486b9d04a2e8ac6f6597b7803"}, - {file = "PyYAML-5.2.tar.gz", hash = "sha256:c0ee8eca2c582d29c3c2ec6e2c4f703d1b7f1fb10bc72317355a746057e7346c"}, {file = "PyYAML-5.3.1-cp27-cp27m-win32.whl", hash = "sha256:74809a57b329d6cc0fdccee6318f44b9b8649961fa73144a98735b0aaf029f1f"}, {file = "PyYAML-5.3.1-cp27-cp27m-win_amd64.whl", hash = "sha256:240097ff019d7c70a4922b6869d8a86407758333f02203e0fc6ff79c5dcede76"}, {file = "PyYAML-5.3.1-cp35-cp35m-win32.whl", hash = "sha256:4f4b913ca1a7319b33cfb1369e91e50354d6f07a135f3b901aca02aa95940bd2"}, @@ -2249,38 +1331,13 @@ pyyaml = [ {file = "PyYAML-5.3.1-cp38-cp38-win_amd64.whl", hash = "sha256:95f71d2af0ff4227885f7a6605c37fd53d3a106fcab511b8860ecca9fcf400ee"}, {file = "PyYAML-5.3.1.tar.gz", hash = "sha256:b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d"}, ] -regex = [ - {file = "regex-2020.7.14-cp27-cp27m-win32.whl", hash = "sha256:e46d13f38cfcbb79bfdb2964b0fe12561fe633caf964a77a5f8d4e45fe5d2ef7"}, - {file = "regex-2020.7.14-cp27-cp27m-win_amd64.whl", hash = "sha256:6961548bba529cac7c07af2fd4d527c5b91bb8fe18995fed6044ac22b3d14644"}, - {file = "regex-2020.7.14-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:c50a724d136ec10d920661f1442e4a8b010a4fe5aebd65e0c2241ea41dbe93dc"}, - {file = "regex-2020.7.14-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:8a51f2c6d1f884e98846a0a9021ff6861bdb98457879f412fdc2b42d14494067"}, - {file = "regex-2020.7.14-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:9c568495e35599625f7b999774e29e8d6b01a6fb684d77dee1f56d41b11b40cd"}, - {file = "regex-2020.7.14-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:51178c738d559a2d1071ce0b0f56e57eb315bcf8f7d4cf127674b533e3101f88"}, - {file = "regex-2020.7.14-cp36-cp36m-win32.whl", hash = "sha256:9eddaafb3c48e0900690c1727fba226c4804b8e6127ea409689c3bb492d06de4"}, - {file = "regex-2020.7.14-cp36-cp36m-win_amd64.whl", hash = "sha256:14a53646369157baa0499513f96091eb70382eb50b2c82393d17d7ec81b7b85f"}, - {file = "regex-2020.7.14-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:1269fef3167bb52631ad4fa7dd27bf635d5a0790b8e6222065d42e91bede4162"}, - {file = "regex-2020.7.14-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:d0a5095d52b90ff38592bbdc2644f17c6d495762edf47d876049cfd2968fbccf"}, - {file = "regex-2020.7.14-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:4c037fd14c5f4e308b8370b447b469ca10e69427966527edcab07f52d88388f7"}, - {file = "regex-2020.7.14-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:bc3d98f621898b4a9bc7fecc00513eec8f40b5b83913d74ccb445f037d58cd89"}, - {file = "regex-2020.7.14-cp37-cp37m-win32.whl", hash = "sha256:46bac5ca10fb748d6c55843a931855e2727a7a22584f302dd9bb1506e69f83f6"}, - {file = "regex-2020.7.14-cp37-cp37m-win_amd64.whl", hash = "sha256:0dc64ee3f33cd7899f79a8d788abfbec168410be356ed9bd30bbd3f0a23a7204"}, - {file = "regex-2020.7.14-cp38-cp38-manylinux1_i686.whl", hash = "sha256:5ea81ea3dbd6767873c611687141ec7b06ed8bab43f68fad5b7be184a920dc99"}, - {file = "regex-2020.7.14-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:bbb332d45b32df41200380fff14712cb6093b61bd142272a10b16778c418e98e"}, - {file = "regex-2020.7.14-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:c11d6033115dc4887c456565303f540c44197f4fc1a2bfb192224a301534888e"}, - {file = "regex-2020.7.14-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:75aaa27aa521a182824d89e5ab0a1d16ca207318a6b65042b046053cfc8ed07a"}, - {file = "regex-2020.7.14-cp38-cp38-win32.whl", hash = "sha256:d6cff2276e502b86a25fd10c2a96973fdb45c7a977dca2138d661417f3728341"}, - {file = "regex-2020.7.14-cp38-cp38-win_amd64.whl", hash = "sha256:7a2dd66d2d4df34fa82c9dc85657c5e019b87932019947faece7983f2089a840"}, - {file = "regex-2020.7.14.tar.gz", hash = "sha256:3a3af27a8d23143c49a3420efe5b3f8cf1a48c6fc8bc6856b03f638abc1833bb"}, -] requests = [ - {file = "requests-2.21.0-py2.py3-none-any.whl", hash = "sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b"}, - {file = "requests-2.21.0.tar.gz", hash = "sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e"}, {file = "requests-2.24.0-py2.py3-none-any.whl", hash = "sha256:fe75cc94a9443b9246fc7049224f75604b113c36acb93f87b80ed42c44cbb898"}, {file = "requests-2.24.0.tar.gz", hash = "sha256:b3559a131db72c33ee969480840fff4bb6dd111de7dd27c8ee1f820f4f00231b"}, ] requests-toolbelt = [ - {file = "requests-toolbelt-0.8.0.tar.gz", hash = "sha256:f6a531936c6fa4c6cfce1b9c10d5c4f498d16528d2a54a22ca00011205a187b5"}, - {file = "requests_toolbelt-0.8.0-py2.py3-none-any.whl", hash = "sha256:42c9c170abc2cacb78b8ab23ac957945c7716249206f90874651971a4acff237"}, + {file = "requests-toolbelt-0.9.1.tar.gz", hash = "sha256:968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0"}, + {file = "requests_toolbelt-0.9.1-py2.py3-none-any.whl", hash = "sha256:380606e1d10dc85c3bd47bf5a6095f815ec007be7a8b69c878507068df059e6f"}, ] scandir = [ {file = "scandir-1.10.0-cp27-cp27m-win32.whl", hash = "sha256:92c85ac42f41ffdc35b6da57ed991575bdbe69db895507af88b9f499b701c188"}, @@ -2314,7 +1371,6 @@ six = [ ] subprocess32 = [ {file = "subprocess32-3.5.4-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:88e37c1aac5388df41cc8a8456bb49ebffd321a3ad4d70358e3518176de3a56b"}, - {file = "subprocess32-3.5.4-cp27-cp27mu-manylinux2014_x86_64.whl", hash = "sha256:e45d985aef903c5b7444d34350b05da91a9e0ea015415ab45a21212786c649d0"}, {file = "subprocess32-3.5.4.tar.gz", hash = "sha256:eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d"}, ] termcolor = [ @@ -2325,80 +1381,29 @@ toml = [ {file = "toml-0.10.1.tar.gz", hash = "sha256:926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f"}, ] tomlkit = [ - {file = "tomlkit-0.5.11-py2.py3-none-any.whl", hash = "sha256:4e1bd6c9197d984528f9ff0cc9db667c317d8881288db50db20eeeb0f6b0380b"}, - {file = "tomlkit-0.5.11.tar.gz", hash = "sha256:f044eda25647882e5ef22b43a1688fb6ab12af2fc50e8456cdfc751c873101cf"}, -] -tornado = [ - {file = "tornado-5.1.1-cp35-cp35m-win32.whl", hash = "sha256:732e836008c708de2e89a31cb2fa6c0e5a70cb60492bee6f1ea1047500feaf7f"}, - {file = "tornado-5.1.1-cp35-cp35m-win_amd64.whl", hash = "sha256:0662d28b1ca9f67108c7e3b77afabfb9c7e87bde174fbda78186ecedc2499a9d"}, - {file = "tornado-5.1.1-cp36-cp36m-win32.whl", hash = "sha256:8154ec22c450df4e06b35f131adc4f2f3a12ec85981a203301d310abf580500f"}, - {file = "tornado-5.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:d4b3e5329f572f055b587efc57d29bd051589fb5a43ec8898c77a47ec2fa2bbb"}, - {file = "tornado-5.1.1-cp37-cp37m-win32.whl", hash = "sha256:e5f2585afccbff22390cddac29849df463b252b711aa2ce7c5f3f342a5b3b444"}, - {file = "tornado-5.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:8e9d728c4579682e837c92fdd98036bd5cdefa1da2aaf6acf26947e6dd0c01c5"}, - {file = "tornado-5.1.1.tar.gz", hash = "sha256:4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409"}, - {file = "tornado-6.0.4-cp35-cp35m-win32.whl", hash = "sha256:5217e601700f24e966ddab689f90b7ea4bd91ff3357c3600fa1045e26d68e55d"}, - {file = "tornado-6.0.4-cp35-cp35m-win_amd64.whl", hash = "sha256:c98232a3ac391f5faea6821b53db8db461157baa788f5d6222a193e9456e1740"}, - {file = "tornado-6.0.4-cp36-cp36m-win32.whl", hash = "sha256:5f6a07e62e799be5d2330e68d808c8ac41d4a259b9cea61da4101b83cb5dc673"}, - {file = "tornado-6.0.4-cp36-cp36m-win_amd64.whl", hash = "sha256:c952975c8ba74f546ae6de2e226ab3cc3cc11ae47baf607459a6728585bb542a"}, - {file = "tornado-6.0.4-cp37-cp37m-win32.whl", hash = "sha256:2c027eb2a393d964b22b5c154d1a23a5f8727db6fda837118a776b29e2b8ebc6"}, - {file = "tornado-6.0.4-cp37-cp37m-win_amd64.whl", hash = "sha256:5618f72e947533832cbc3dec54e1dffc1747a5cb17d1fd91577ed14fa0dc081b"}, - {file = "tornado-6.0.4-cp38-cp38-win32.whl", hash = "sha256:22aed82c2ea340c3771e3babc5ef220272f6fd06b5108a53b4976d0d722bcd52"}, - {file = "tornado-6.0.4-cp38-cp38-win_amd64.whl", hash = "sha256:c58d56003daf1b616336781b26d184023ea4af13ae143d9dda65e31e534940b9"}, - {file = "tornado-6.0.4.tar.gz", hash = "sha256:0fe2d45ba43b00a41cd73f8be321a44936dc1aba233dee979f17a042b83eb6dc"}, + {file = "tomlkit-0.7.0-py2.py3-none-any.whl", hash = "sha256:6babbd33b17d5c9691896b0e68159215a9387ebfa938aa3ac42f4a4beeb2b831"}, + {file = "tomlkit-0.7.0.tar.gz", hash = "sha256:ac57f29693fab3e309ea789252fcce3061e19110085aa31af5446ca749325618"}, ] tox = [ - {file = "tox-3.12.1-py2.py3-none-any.whl", hash = "sha256:f5c8e446b51edd2ea97df31d4ded8c8b72e7d6c619519da6bb6084b9dd5770f9"}, - {file = "tox-3.12.1.tar.gz", hash = "sha256:f87fd33892a2df0950e5e034def9468988b8d008c7e9416be665fcc0dd45b14f"}, - {file = "tox-3.17.1-py2.py3-none-any.whl", hash = "sha256:cf130909a224515f6c894023150ccc860c4cf5ecad64f583b9d43ed1aa7e5da8"}, - {file = "tox-3.17.1.tar.gz", hash = "sha256:5968c07b3aeea715ac2fe723a912e0b6a0c53bebad24fc37eb559b7497f217fa"}, -] -tqdm = [ - {file = "tqdm-4.48.0-py2.py3-none-any.whl", hash = "sha256:fcb7cb5b729b60a27f300b15c1ffd4744f080fb483b88f31dc8654b082cc8ea5"}, - {file = "tqdm-4.48.0.tar.gz", hash = "sha256:6baa75a88582b1db6d34ce4690da5501d2a1cb65c34664840a456b2c9f794d29"}, -] -typed-ast = [ - {file = "typed_ast-1.4.1-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:73d785a950fc82dd2a25897d525d003f6378d1cb23ab305578394694202a58c3"}, - {file = "typed_ast-1.4.1-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:aaee9905aee35ba5905cfb3c62f3e83b3bec7b39413f0a7f19be4e547ea01ebb"}, - {file = "typed_ast-1.4.1-cp35-cp35m-win32.whl", hash = "sha256:0c2c07682d61a629b68433afb159376e24e5b2fd4641d35424e462169c0a7919"}, - {file = "typed_ast-1.4.1-cp35-cp35m-win_amd64.whl", hash = "sha256:4083861b0aa07990b619bd7ddc365eb7fa4b817e99cf5f8d9cf21a42780f6e01"}, - {file = "typed_ast-1.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:269151951236b0f9a6f04015a9004084a5ab0d5f19b57de779f908621e7d8b75"}, - {file = "typed_ast-1.4.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:24995c843eb0ad11a4527b026b4dde3da70e1f2d8806c99b7b4a7cf491612652"}, - {file = "typed_ast-1.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:fe460b922ec15dd205595c9b5b99e2f056fd98ae8f9f56b888e7a17dc2b757e7"}, - {file = "typed_ast-1.4.1-cp36-cp36m-win32.whl", hash = "sha256:4e3e5da80ccbebfff202a67bf900d081906c358ccc3d5e3c8aea42fdfdfd51c1"}, - {file = "typed_ast-1.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:249862707802d40f7f29f6e1aad8d84b5aa9e44552d2cc17384b209f091276aa"}, - {file = "typed_ast-1.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8ce678dbaf790dbdb3eba24056d5364fb45944f33553dd5869b7580cdbb83614"}, - {file = "typed_ast-1.4.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:c9e348e02e4d2b4a8b2eedb48210430658df6951fa484e59de33ff773fbd4b41"}, - {file = "typed_ast-1.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:bcd3b13b56ea479b3650b82cabd6b5343a625b0ced5429e4ccad28a8973f301b"}, - {file = "typed_ast-1.4.1-cp37-cp37m-win32.whl", hash = "sha256:d5d33e9e7af3b34a40dc05f498939f0ebf187f07c385fd58d591c533ad8562fe"}, - {file = "typed_ast-1.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:0666aa36131496aed8f7be0410ff974562ab7eeac11ef351def9ea6fa28f6355"}, - {file = "typed_ast-1.4.1-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:d205b1b46085271b4e15f670058ce182bd1199e56b317bf2ec004b6a44f911f6"}, - {file = "typed_ast-1.4.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:6daac9731f172c2a22ade6ed0c00197ee7cc1221aa84cfdf9c31defeb059a907"}, - {file = "typed_ast-1.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:498b0f36cc7054c1fead3d7fc59d2150f4d5c6c56ba7fb150c013fbc683a8d2d"}, - {file = "typed_ast-1.4.1-cp38-cp38-win32.whl", hash = "sha256:715ff2f2df46121071622063fc7543d9b1fd19ebfc4f5c8895af64a77a8c852c"}, - {file = "typed_ast-1.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc0fea399acb12edbf8a628ba8d2312f583bdbdb3335635db062fa98cf71fca4"}, - {file = "typed_ast-1.4.1-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:d43943ef777f9a1c42bf4e552ba23ac77a6351de620aa9acf64ad54933ad4d34"}, - {file = "typed_ast-1.4.1.tar.gz", hash = "sha256:8c8aaad94455178e3187ab22c8b01a3837f8ee50e09cf31f1ba129eb293ec30b"}, + {file = "tox-3.20.0-py2.py3-none-any.whl", hash = "sha256:e6318f404aff16522ff5211c88cab82b39af121735a443674e4e2e65f4e4637b"}, + {file = "tox-3.20.0.tar.gz", hash = "sha256:eb629ddc60e8542fd4a1956b2462e3b8771d49f1ff630cecceacaa0fbfb7605a"}, ] typing = [ {file = "typing-3.7.4.3-py2-none-any.whl", hash = "sha256:283d868f5071ab9ad873e5e52268d611e851c870a2ba354193026f2dfb29d8b5"}, {file = "typing-3.7.4.3.tar.gz", hash = "sha256:1187fb9c82fd670d10aa07bbb6cfcfe4bdda42d6fab8d5134f04e8c4d0b71cc9"}, ] typing-extensions = [ - {file = "typing_extensions-3.7.4.2-py2-none-any.whl", hash = "sha256:f8d2bd89d25bc39dabe7d23df520442fa1d8969b82544370e03d88b5a591c392"}, - {file = "typing_extensions-3.7.4.2-py3-none-any.whl", hash = "sha256:6e95524d8a547a91e08f404ae485bbb71962de46967e1b71a0cb89af24e761c5"}, - {file = "typing_extensions-3.7.4.2.tar.gz", hash = "sha256:79ee589a3caca649a9bfd2a8de4709837400dfa00b6cc81962a1e6a1815969ae"}, + {file = "typing_extensions-3.7.4.3-py2-none-any.whl", hash = "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"}, + {file = "typing_extensions-3.7.4.3-py3-none-any.whl", hash = "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918"}, + {file = "typing_extensions-3.7.4.3.tar.gz", hash = "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c"}, ] urllib3 = [ - {file = "urllib3-1.24.3-py2.py3-none-any.whl", hash = "sha256:a637e5fae88995b256e3409dc4d52c2e2e0ba32c42a6365fee8bbd2238de3cfb"}, - {file = "urllib3-1.24.3.tar.gz", hash = "sha256:2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4"}, - {file = "urllib3-1.25.9-py2.py3-none-any.whl", hash = "sha256:88206b0eb87e6d677d424843ac5209e3fb9d0190d0ee169599165ec25e9d9115"}, - {file = "urllib3-1.25.9.tar.gz", hash = "sha256:3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527"}, + {file = "urllib3-1.25.10-py2.py3-none-any.whl", hash = "sha256:e7983572181f5e1522d9c98453462384ee92a0be7fac5f1413a1e35c56cc0461"}, + {file = "urllib3-1.25.10.tar.gz", hash = "sha256:91056c15fa70756691db97756772bb1eb9678fa585d9184f24534b100dc60f4a"}, ] virtualenv = [ - {file = "virtualenv-16.7.10-py2.py3-none-any.whl", hash = "sha256:105893c8dc66b7817691c7371439ec18e3b6c5e323a304b5ed96cdd2e75cc1ec"}, - {file = "virtualenv-16.7.10.tar.gz", hash = "sha256:e88fdcb08b0ecb11da97868f463dd06275923f50d87f4b9c8b2fc0994eec40f4"}, - {file = "virtualenv-20.0.27-py2.py3-none-any.whl", hash = "sha256:c51f1ba727d1614ce8fd62457748b469fbedfdab2c7e5dd480c9ae3fbe1233f1"}, - {file = "virtualenv-20.0.27.tar.gz", hash = "sha256:26cdd725a57fef4c7c22060dba4647ebd8ca377e30d1c1cf547b30a0b79c43b4"}, + {file = "virtualenv-20.0.31-py2.py3-none-any.whl", hash = "sha256:e0305af10299a7fb0d69393d8f04cb2965dda9351140d11ac8db4e5e3970451b"}, + {file = "virtualenv-20.0.31.tar.gz", hash = "sha256:43add625c53c596d38f971a465553f6318decc39d98512bc100fa1b1e839c8dc"}, ] wcwidth = [ {file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"}, diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml index 76dca20043..f099a4cac8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "poetry" -version = "1.0.10" +version = "1.1.0" description = "Python dependency management and packaging made easy." authors = [ "Sébastien Eustace " @@ -22,40 +22,43 @@ classifiers = [ # Requirements [tool.poetry.dependencies] -python = "~2.7 || ^3.4" -cleo = "^0.7.6" -clikit = "^0.4.2" +python = "~2.7 || ^3.5" + +poetry-core = "^1.0.0" +cleo = "^0.8.1" +clikit = "^0.6.2" +crashtest = { version = "^0.3.0", python = "^3.6" } requests = "^2.18" cachy = "^0.3.0" -requests-toolbelt = "^0.8.0" -jsonschema = "^3.1" -pyrsistent = "^0.14.2" -pyparsing = "^2.2" +requests-toolbelt = "^0.9.1" cachecontrol = { version = "^0.12.4", extras = ["filecache"] } pkginfo = "^1.4" html5lib = "^1.0" shellingham = "^1.1" -tomlkit = "^0.5.11" +tomlkit = ">=0.7.0,<1.0.0" pexpect = "^4.7.0" +packaging = "^20.4" +virtualenv = { version = "^20.0.26" } -# The typing module is not in the stdlib in Python 2.7 and 3.4 -typing = { version = "^3.6", python = "~2.7 || ~3.4" } +# The typing module is not in the stdlib in Python 2.7 +typing = { version = "^3.6", python = "~2.7" } -# Use pathlib2 for Python 2.7 and 3.4 -pathlib2 = { version = "^2.3", python = "~2.7 || ~3.4" } +# Use pathlib2 for Python 2.7 +pathlib2 = { version = "^2.3", python = "~2.7" } +# Use futures on Python 2.7 +futures = { version = "^3.3.0", python = "~2.7" } # Use glob2 for Python 2.7 and 3.4 -glob2 = { version = "^0.6", python = "~2.7 || ~3.4" } -# Use virtualenv for Python 2.7 since venv does not exist -virtualenv = { version = "^16.7.9", python = "~2.7" } +glob2 = { version = "^0.6", python = "~2.7" } # functools32 is needed for Python 2.7 functools32 = { version = "^3.2.3", python = "~2.7" } keyring = [ - { version = "^18.0.1", python = "~2.7 || ~3.4" }, - { version = "^20.0.1", python = "^3.5" } + { version = "^18.0.1", python = "~2.7" }, + { version = "^20.0.1", python = "~3.5" }, + { version = "^21.2.0", python = "^3.6" } ] -# Use subprocess32 for Python 2.7 and 3.4 -subprocess32 = { version = "^3.5", python = "~2.7 || ~3.4" } -importlib-metadata = {version = "~1.1.3", python = "<3.8"} +# Use subprocess32 for Python 2.7 +subprocess32 = { version = "^3.5", python = "~2.7" } +importlib-metadata = {version = "^1.6.0", python = "<3.8"} [tool.poetry.dev-dependencies] pytest = [ @@ -63,62 +66,33 @@ pytest = [ {version = "^5.4.3", python = ">=3.5"} ] pytest-cov = "^2.5" -mkdocs = { version = "^1.0", python = "~2.7.9 || ^3.4" } -pymdown-extensions = "^6.0" -pygments = "^2.2" pytest-mock = "^1.9" -pygments-github-lexers = "^0.0.5" -black = { version = "^19.10b0", python = "^3.6" } -pre-commit = "^1.10" +pre-commit = { version = "^2.6", python = "^3.6.1" } tox = "^3.0" pytest-sugar = "^0.9.2" httpretty = "^0.9.6" -markdown-include = "^0.5.1" [tool.poetry.scripts] poetry = "poetry.console:main" [build-system] -requires = ["intreehooks"] -build-backend = "intreehooks:loader" - -[tool.intreehooks] -build-backend = "poetry.masonry.api" +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" [tool.isort] -line_length = 88 +profile = "black" force_single_line = true atomic = true include_trailing_comma = true lines_after_imports = 2 lines_between_types = 1 -multi_line_output = 3 use_parentheses = true -not_skip = "__init__.py" +src_paths = ["poetry", "tests"] skip_glob = ["*/setup.py"] filter_files = true - known_first_party = "poetry" -known_third_party = [ - "cachecontrol", - "cachy", - "cleo", - "clikit", - "html5lib", - "httpretty", - "jsonschema", - "keyring", - "pexpect", - "pkginfo", - "pyparsing", - "pytest", - "requests", - "requests_toolbelt", - "shellingham", - "tomlkit", -] [tool.black] diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json index ab987011a6..51894768c1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json @@ -1,6 +1,7 @@ { "owner": "python-poetry", "repo": "poetry", - "rev": "d3c9049a18ae33baacfcb5c698777282f2f58128", - "sha256": "00qfzjjs6clh93gfl1px3ma9km8qxl3f4z819nmyl58zc8ni3zyv" -} \ No newline at end of file + "rev": "539d7f732c34c821258a9853cd3078cbda34a717", + "sha256": "0kl23dkq9n112z1pqjg6f1wv3qk77ij6q5glg15lwrj7yrl9k65c", + "fetchSubmodules": true +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix index 5a26276202..5f803635dd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "ashleygwilliams"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "07hklya22ixklb44f3qp6yyh5d03a7rjcn0g76icqr36hvcjyjjh"; + sha256 = "0rq0anz0cawrgsinqyjh8wb3dgha09wx3ydrd3m9nfxs5dd3ij3k"; }; - cargoSha256 = "133n8j4d0j0rasns3a4kkflhrvmvkqfggcrfj4sp79am19pr146b"; + cargoSha256 = "1vngn9gbiv59wrq230qk2mv00bsbdfk2mi1iqpr736c5wj1caqld"; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 5d66f6e210..22152b52ff 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-09-21"; + rev = "2020-10-05"; version = "unstable-${rev}"; - sha256 = "1wjm69r1c6s8a4rd91csg7c48bp8jamxsrm5m6rg3bk2gqp8yzz8"; - cargoSha256 = "089w2i6lvpjxkxghkb2mij9sxfxlcc1zv4iq4qmzq8gnc6ddz12d"; + sha256 = "1vj5xwqif2ipzlb8ngpq3ymgqvv65d0700ihq7hx81k0i2m2awa6"; + cargoSha256 = "14n7nk64qq27a7ygqm0bly2bby3bmsav6nvsap3bkbkppyr5gyrg"; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/downgrade-smol_str.patch b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/downgrade-smol_str.patch new file mode 100644 index 0000000000..c3ceb09633 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/downgrade-smol_str.patch @@ -0,0 +1,82 @@ +This patch revert 875ad9b5c410200f5072515ae91b4ff51cff0448 (Bump smol_str from 0.1.16 to 0.1.17 ). + +diff --git a/Cargo.lock b/Cargo.lock +index 477af57aa..8b9055879 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1470,9 +1470,9 @@ checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252" + + [[package]] + name = "smol_str" +-version = "0.1.17" ++version = "0.1.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6ca0f7ce3a29234210f0f4f0b56f8be2e722488b95cb522077943212da3b32eb" ++checksum = "2f7909a1d8bc166a862124d84fdc11bda0ea4ed3157ccca662296919c2972db1" + dependencies = [ + "serde", + ] +diff --git a/crates/hir_expand/src/name.rs b/crates/hir_expand/src/name.rs +index a5750d829..49841c7a1 100644 +--- a/crates/hir_expand/src/name.rs ++++ b/crates/hir_expand/src/name.rs +@@ -43,8 +43,8 @@ impl Name { + } + + /// Shortcut to create inline plain text name +- const fn new_inline(text: &str) -> Name { +- Name::new_text(SmolStr::new_inline(text)) ++ const fn new_inline_ascii(text: &[u8]) -> Name { ++ Name::new_text(SmolStr::new_inline_from_ascii(text.len(), text)) + } + + /// Resolve a name from the text of token. +@@ -127,7 +127,7 @@ pub mod known { + $( + #[allow(bad_style)] + pub const $ident: super::Name = +- super::Name::new_inline(stringify!($ident)); ++ super::Name::new_inline_ascii(stringify!($ident).as_bytes()); + )* + }; + } +@@ -210,8 +210,8 @@ pub mod known { + ); + + // self/Self cannot be used as an identifier +- pub const SELF_PARAM: super::Name = super::Name::new_inline("self"); +- pub const SELF_TYPE: super::Name = super::Name::new_inline("Self"); ++ pub const SELF_PARAM: super::Name = super::Name::new_inline_ascii(b"self"); ++ pub const SELF_TYPE: super::Name = super::Name::new_inline_ascii(b"Self"); + + #[macro_export] + macro_rules! name { +diff --git a/crates/hir_ty/src/infer.rs b/crates/hir_ty/src/infer.rs +index 9a7785c76..2b53b8297 100644 +--- a/crates/hir_ty/src/infer.rs ++++ b/crates/hir_ty/src/infer.rs +@@ -555,7 +555,7 @@ impl<'a> InferenceContext<'a> { + + fn resolve_lang_item(&self, name: &str) -> Option { + let krate = self.resolver.krate()?; +- let name = SmolStr::new_inline(name); ++ let name = SmolStr::new_inline_from_ascii(name.len(), name.as_bytes()); + self.db.lang_item(krate, name) + } + +diff --git a/crates/mbe/src/syntax_bridge.rs b/crates/mbe/src/syntax_bridge.rs +index d987b2500..a8ad917fb 100644 +--- a/crates/mbe/src/syntax_bridge.rs ++++ b/crates/mbe/src/syntax_bridge.rs +@@ -636,10 +636,7 @@ impl<'a> TreeSink for TtTreeSink<'a> { + let (text, id) = match leaf { + tt::Leaf::Ident(ident) => (ident.text.clone(), ident.id), + tt::Leaf::Punct(punct) => { +- assert!(punct.char.is_ascii()); +- let char = &(punct.char as u8); +- let text = std::str::from_utf8(std::slice::from_ref(char)).unwrap(); +- (SmolStr::new_inline(text), punct.id) ++ (SmolStr::new_inline_from_ascii(1, &[punct.char as u8]), punct.id) + } + tt::Leaf::Literal(lit) => (lit.text.clone(), lit.id), + }; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix index 3bd6d1ccee..20fb38b66b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -16,6 +16,11 @@ rustPlatform.buildRustPackage { inherit rev sha256; }; + # FIXME: Temporary fix for our rust 1.45.0 since rust-analyzer requires 1.46.0 + cargoPatches = [ + ./downgrade-smol_str.patch + ]; + patches = [ # FIXME: Temporary fix for our rust 1.45.0 since rust-analyzer requires 1.46.0 ./no-loop-in-const-fn.patch diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch index b2cf679cee..5b1089ba9b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch @@ -21,10 +21,10 @@ index fe33cee53..2184a4154 100644 rewriter.replace_ast(&tree, &merged); diff --git a/crates/assists/src/utils/insert_use.rs b/crates/assists/src/utils/insert_use.rs -index 09f4a2224..2c3a0ca0b 100644 +index f6025c99a..f9bd31cf3 100644 --- a/crates/assists/src/utils/insert_use.rs +++ b/crates/assists/src/utils/insert_use.rs -@@ -280,7 +280,7 @@ fn common_prefix(lhs: &ast::Path, rhs: &ast::Path) -> Option<(ast::Path, ast::Pa +@@ -274,7 +274,7 @@ fn common_prefix(lhs: &ast::Path, rhs: &ast::Path) -> Option<(ast::Path, ast::Pa } res = Some((lhs_curr.clone(), rhs_curr.clone())); @@ -33,36 +33,16 @@ index 09f4a2224..2c3a0ca0b 100644 Some((lhs, rhs)) => { lhs_curr = lhs; rhs_curr = rhs; -@@ -324,7 +324,7 @@ fn path_cmp(a: &ast::Path, b: &ast::Path) -> Ordering { - // cmp_by would be useful for us here but that is currently unstable - // cmp doesnt work due the lifetimes on text's return type - a.zip(b) -- .flat_map(|(seg, seg2)| seg.name_ref().zip(seg2.name_ref())) -+ .flat_map(|(seg, seg2)| zip(seg.name_ref(), seg2.name_ref())) - .find_map(|(a, b)| match a.text().cmp(b.text()) { - ord @ Ordering::Greater | ord @ Ordering::Less => Some(ord), - Ordering::Equal => None, -@@ -404,8 +404,8 @@ fn find_insert_position( +@@ -452,7 +452,7 @@ fn find_insert_position( let path_node_iter = scope .as_syntax_node() .children() - .filter_map(|node| ast::Use::cast(node.clone()).zip(Some(node))) -- .flat_map(|(use_, node)| use_.use_tree().and_then(|tree| tree.path()).zip(Some(node))); -+ .filter_map(|node| zip(ast::Use::cast(node.clone()), Some(node))) -+ .flat_map(|(use_, node)| zip(use_.use_tree().and_then(|tree| tree.path()), Some(node))); - // Iterator that discards anything thats not in the required grouping - // This implementation allows the user to rearrange their import groups as this only takes the first group that fits - let group_iter = path_node_iter -@@ -423,7 +423,7 @@ fn find_insert_position( - segments - .clone() - .zip(check_segments) -- .flat_map(|(seg, seg2)| seg.name_ref().zip(seg2.name_ref())) -+ .flat_map(|(seg, seg2)| zip(seg.name_ref(), seg2.name_ref())) - .all(|(l, r)| l.text() <= r.text()) - }); - match post_insert { -@@ -931,3 +931,7 @@ use foo::bar::baz::Qux;", ++ .filter_map(|node| Some((ast::Use::cast(node.clone())?, node))) + .flat_map(|(use_, node)| { + let tree = use_.use_tree()?; + let path = tree.path()?; +@@ -989,3 +989,7 @@ use foo::bar::baz::Qux;", assert_eq!(result.map(|u| u.to_string()), None); } } diff --git a/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix b/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix new file mode 100644 index 0000000000..06f6c08fee --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "sd-local"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "screwdriver-cd"; + repo = pname; + rev = "v${version}"; + sha256 = "09j1wcx66sz2b0pps0bgbay5x06lc0d2awxjvd5zi8wqnbsrdq60"; + }; + + vendorSha256 = "1qy51jx181rwim2v53ysgf7rys0nmxsbawvsbh3z1ihh3dlgw5bc"; + + subPackages = [ "." ]; + + meta = with lib; { + description = "screwdriver.cd local mode"; + homepage = "https://github.com/screwdriver-cd/sd-local"; + license = licenses.bsd3; + maintainers = with maintainers; [ midchildan ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix index f397348416..d0b0bff05b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.14.0"; + version = "1.15.0"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "18wk8cnp0sc47drgjc0iis4dkqwr9h5yxi40c1gjsiscrvy5akvc"; + sha256 = "0cir9ld61pq1rziw6vyz1ihkq0aylzrsxg1vqb9544rwnbq7z2qs"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix b/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix index 32b9c61f5d..db5f392b2c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix @@ -1,7 +1,6 @@ { stdenv , buildGoModule , fetchFromGitHub -, runCommand , gpgme , lvm2 , btrfs-progs @@ -10,18 +9,17 @@ , installShellFiles , makeWrapper , fuse-overlayfs -, nixosTests }: buildGoModule rec { pname = "skopeo"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "0wkpw8fizxjpfypflp7rs1q128dg4hadwzdvn8k41h7f8cbcb39x"; + sha256 = "1v7k3ki10i6082r7zswblyirx6zck674y6bw3plssw4p1l2611rd"; }; outputs = [ "out" "man" ]; @@ -37,22 +35,18 @@ buildGoModule rec { buildPhase = '' patchShebangs . - make binary-local + make bin/skopeo docs ''; installPhase = '' - make install-binary PREFIX=$out - make install-docs MANINSTALLDIR="$man/share/man" + install -Dm755 bin/skopeo -t $out/bin + installManPage docs/*.[1-9] installShellCompletion --bash completions/bash/skopeo - ''; - - postInstall = stdenv.lib.optionals stdenv.isLinux '' + '' + stdenv.lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/skopeo \ --prefix PATH : ${stdenv.lib.makeBinPath [ fuse-overlayfs ]} ''; - passthru.tests.docker-tools = nixosTests.docker-tools; - meta = with stdenv.lib; { description = "A command line utility for various operations on container images and image repositories"; homepage = "https://github.com/containers/skopeo"; diff --git a/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix b/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix new file mode 100644 index 0000000000..6e49bd2aaf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchurl }: + +let + version = "3.1.1"; + src = + if stdenv.hostPlatform.system == "x86_64-darwin" then + fetchurl { + url = "https://update.tabnine.com/${version}/x86_64-apple-darwin/TabNine"; + sha256 = "w+Ufy4pICfQmseKCeohEQIP0VD6YrkYTEn41HX40Zlw="; + } + else if stdenv.hostPlatform.system == "x86_64-linux" then + fetchurl { + url = "https://update.tabnine.com/${version}/x86_64-unknown-linux-musl/TabNine"; + sha256 = "hSltZWQz2BRFut0NDI4fS/N8XxFJaYGHRtV3llBVOY4="; + } + else throw "Not supported on ${stdenv.hostPlatform.system}"; +in stdenv.mkDerivation rec { + pname = "tabnine"; + + inherit version src; + + dontBuild = true; + dontUnpack = true; + + installPhase = '' + mkdir -p $out/bin + ln -s $src $out/bin/TabNine + ''; + + meta = with lib; { + homepage = "https://tabnine.com"; + description = "Smart Compose for code that uses deep learning to help you write code faster"; + license = licenses.unfree; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/wally-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/wally-cli/default.nix index ca8b40c4d5..d9abe6163a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wally-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wally-cli/default.nix @@ -1,11 +1,11 @@ -{ lib, buildGoPackage, fetchFromGitHub, pkg-config, libusb1 }: +{ lib, buildGoModule, fetchFromGitHub, pkg-config, libusb1 }: -buildGoPackage rec { +buildGoModule rec { pname = "wally-cli"; - version = "1.1.1"; + version = "2.0.0"; - goPackagePath = "github.com/zsa/wally"; - subPackages = [ "cli" ]; + goPackagePath = "github.com/zsa/wally-cli"; + subPackages = [ "." ]; nativeBuildInputs = [ pkg-config ]; @@ -13,20 +13,21 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "zsa"; - repo = "wally"; - rev = "68960e452ee0f6c7142f5008d4b1cdc6284d3de7"; - sha256 = "122m5v7s5wqlshyk2salmd848lqs4rrz54d2ap11ay61kijm0bs2"; + repo = "wally-cli"; + rev = "${version}-linux"; + sha256 = "0xz3z18bbnf736ngjj6jhnp3p2j55m5jhnb2xl6l5hybracfyhm7"; }; - postInstall = '' - mv $out/bin/cli $out/bin/wally - ''; + vendorSha256 = "0jqx38x5qvir6zc5yq9p2adafwqhy4hil1k5g81rr1fvbn06k3a6"; + runVend = true; - goDeps = ./deps.nix; + # Can be removed when https://github.com/zsa/wally-cli/pull/1 is merged. + doCheck = false; meta = with lib; { description = "A tool to flash firmware to mechanical keyboards"; homepage = "https://ergodox-ez.com/pages/wally-planck"; + platforms = platforms.linux; license = licenses.mit; maintainers = [ maintainers.spacekookie ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/wally-cli/deps.nix b/third_party/nixpkgs/pkgs/development/tools/wally-cli/deps.nix deleted file mode 100644 index 8edac40c0d..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/wally-cli/deps.nix +++ /dev/null @@ -1,66 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/caarlos0/spin"; - fetch = { - type = "git"; - url = "https://github.com/caarlos0/spin"; - rev = "950231d3237faf48da965375e65a00c224bcb4dc"; - sha256 = "1yz987f86qwx2avyp1bmi5y35h8bbfgp3z1fipqpjlvfq8m7lf8w"; - }; - } - { - goPackagePath = "github.com/google/gousb"; - fetch = { - type = "git"; - url = "https://github.com/google/gousb"; - rev = "18f4c1d8a750878c4f86ac3d7319b8aa462a79f9"; - sha256 = "1i7ffkq395x0v1186j9bhfgy67wlq6s840xkyx8wn87w55yd05rh"; - }; - } - { - goPackagePath = "github.com/logrusorgru/aurora"; - fetch = { - type = "git"; - url = "https://github.com/logrusorgru/aurora"; - rev = "66b7ad493a23a2523bac50571522bbfe5b90a835"; - sha256 = "06allslr29qdapv5j3fpyw9xklmb9fmya5jzybmakz9mwczm76nq"; - }; - } - { - goPackagePath = "github.com/marcinbor85/gohex"; - fetch = { - type = "git"; - url = "https://github.com/marcinbor85/gohex"; - rev = "7a43cd876e46e0f6ddc553f10f91731a78e6e949"; - sha256 = "1nzy1hk7blawq4skycj330ac3kfwh0xr6xd7s3y09hsxfzcv4p9v"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "f93a0d58d5fd95e53f82782d07bb0c79d23e1290"; - sha256 = "1sq97q71vgwnbg1fphsmqrzkbfn6mjal6d8a3qgwv4nbgppwaz25"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "f068ffe820e46336f56dfca7777430582d6e507b"; - sha256 = "14qvaq9wcrm7mgyra4h9jl8ssfcxyygi1hraq3cmf118961m90zn"; - }; - } - { - goPackagePath = "gopkg.in/cheggaaa/pb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/cheggaaa/pb.v1"; - rev = "f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11"; - sha256 = "13a66cqbpdif804qj12z9ad8r24va9q41gfk71qbc4zg1wsxs3rh"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix index ea55325996..3d9d6cf0a0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "3.3.2"; + version = "3.4.0"; src = fetchFromGitHub { owner = "mikefarah"; rev = version; repo = "yq"; - sha256 = "1rdpjxnq6cs6gwpp4bijp38b657yzjqcdzf98lhhpbpskjz8k8pp"; + sha256 = "1rvs27c5mz55zqq9c7yif0dms53bd30d8ylh45f3y3zgh82jihp8"; }; - vendorSha256 = "1bjy3qr26zndr3dhh9gd33rhm5gy779525qgzjw4a4mla0p2q6kl"; + vendorSha256 = "0l5bhbp8dfq04hb4xcpx96ksfwx4xvk0pj5ma00rk3z913ikygcd"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix index e11a5e1805..c3d1c07c2a 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.12.1"; + version = "5.3.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "00sma1q7hbhzjkjnkv8y37ar0wnxk9mkqlpsplgyyyx3gx81nn3s"; + sha256 = "0f3sw71ridpwcy0m8xl9gs76zl9zfsrfwzbqjidvlnszvx3177bl"; }; # don't remove runtime deps diff --git a/third_party/nixpkgs/pkgs/games/crispy-doom/default.nix b/third_party/nixpkgs/pkgs/games/crispy-doom/default.nix index 5bd6e714e4..70e191fe88 100644 --- a/third_party/nixpkgs/pkgs/games/crispy-doom/default.nix +++ b/third_party/nixpkgs/pkgs/games/crispy-doom/default.nix @@ -1,33 +1,22 @@ -{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, fetchpatch }: +{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, python }: stdenv.mkDerivation rec { pname = "crispy-doom"; - version = "5.8.0"; + version = "5.9.2"; src = fetchFromGitHub { owner = "fabiangreffrath"; repo = pname; rev = "${pname}-${version}"; - sha256 = "1b6gn0dysv631jynh769whww9xcss1gms78sz3nrn855q1dsvcb4"; + sha256 = "0fkw9z66sjcz7k528wyla6mgi4impqimn93yhqmc194ycrjirraa"; }; - patches = [ - # Fixes CVE-2020-14983 - (fetchpatch { - url = "https://github.com/chocolate-doom/chocolate-doom/commit/f1a8d991aa8a14afcb605cf2f65cd15fda204c56.diff"; - sha256 = "1z6pxg9azcqq7g09hjc09d01knd803nhqilkw2kbx8648hil9mgn"; - }) - (fetchpatch { - url = "https://github.com/chocolate-doom/chocolate-doom/commit/54fb12eeaa7d527defbe65e7e00e37d5feb7c597.diff"; - sha256 = "0ww21jn02ld73rkp06f7fqy92jqv8c9q4d1mvsryag1gmvy57znj"; - }) - ]; - postPatch = '' sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am + for script in $(grep -lr '^#!/usr/bin/env python$'); do patchShebangs $script; done ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig python ]; buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/games/ezquake/default.nix b/third_party/nixpkgs/pkgs/games/ezquake/default.nix index 83dadb7192..802125e3f8 100644 --- a/third_party/nixpkgs/pkgs/games/ezquake/default.nix +++ b/third_party/nixpkgs/pkgs/games/ezquake/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ezquake"; - version = "3.2"; + version = "3.2.2"; src = fetchFromGitHub { owner = "ezQuake"; repo = pname + "-source"; rev = version; - sha256 = "11kyrqpc8w393kvfz2p2h2m7k8rm4w644m86w733b8w157f2fsk0"; + sha256 = "1rfp816gnp7jfd27cg1la5n1q6z2wgd9qljnlmnx7v2jixql8brf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/games/gemrb/default.nix b/third_party/nixpkgs/pkgs/games/gemrb/default.nix index 91b841f6c5..5fa58c7c35 100644 --- a/third_party/nixpkgs/pkgs/games/gemrb/default.nix +++ b/third_party/nixpkgs/pkgs/games/gemrb/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { support pseudo-3D role playing games based on the Dungeons & Dragons ruleset (Baldur's Gate and Icewind Dale series, Planescape: Torment). ''; - homepage = "http://gemrb.org/"; + homepage = "https://gemrb.org/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/games/instead/default.nix b/third_party/nixpkgs/pkgs/games/instead/default.nix index 34a31fee72..8672a7e449 100644 --- a/third_party/nixpkgs/pkgs/games/instead/default.nix +++ b/third_party/nixpkgs/pkgs/games/instead/default.nix @@ -3,7 +3,7 @@ let version = "3.3.2"; - # I took several games at random from http://instead.syscall.ru/games/ + # I took several games at random from https://instead.syscall.ru/games/ games = [ (fetchurl { url = "http://instead-games.googlecode.com/files/instead-apple-day-1.2.zip"; @@ -45,7 +45,7 @@ stdenv.mkDerivation { substituteInPlace configure.sh \ --replace "/tmp/sdl-test" $(mktemp) ''; - + configurePhase = '' { echo 2; echo $out; } | ./configure.sh ''; @@ -64,7 +64,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple text adventure interpreter for Unix and Windows"; - homepage = "http://instead.syscall.ru/"; + homepage = "https://instead.syscall.ru/"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; maintainers = with maintainers; [ pSub ]; diff --git a/third_party/nixpkgs/pkgs/games/megaglest/default.nix b/third_party/nixpkgs/pkgs/games/megaglest/default.nix index d5129818cb..c34ca5dee9 100644 --- a/third_party/nixpkgs/pkgs/games/megaglest/default.nix +++ b/third_party/nixpkgs/pkgs/games/megaglest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, pkgconfig, git, curl, SDL2, xercesc, openal, lua, vlc +{ stdenv, cmake, pkgconfig, git, curl, SDL2, xercesc, openal, lua, libvlc , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, libGLU, glib , fetchFromGitHub @@ -29,7 +29,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake git curl SDL2 xercesc openal lua libpng libjpeg vlc wxGTK + buildInputs = [ cmake git curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper libGLU ]; configurePhase = '' diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix index fa27eab275..4cde785bb6 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2020.903.0"; + version = "2020.925.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "01apjgi2r8jaihp7sp1y69fmplkiy383zxxdbjn1m797f0ls37ca"; + sha256 = "0838i3pdc1c44jm7mp86kvw5164w8f3faci73bzkq84g20ixwj2g"; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix index 6c8aa4bd18..6660034e62 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -371,8 +371,8 @@ }) (fetchNuGet { name = "Microsoft.Diagnostics.Runtime"; - version = "2.0.142701"; - sha256 = "114ivn09zlxkna78hyxa3h40k5iaivapws755i0aiys7nxhdn3mw"; + version = "2.0.145301"; + sha256 = "02gzyal13ilqdxzzdzdavw85xk4z8zp88waanr7b72zxhm0fzfj9"; }) (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; @@ -466,8 +466,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; - version = "3.0.3"; - sha256 = "0zxsdwh9mhy3wsbjyfr4k0r10s1h06dzw8hcck9aknv155q26zqk"; + version = "3.1.8"; + sha256 = "00il5z4pwysii0di9lxx7a2hc9ca64rrvw3zvzfi4wgf05xm66ff"; }) (fetchNuGet { name = "Microsoft.Extensions.Options"; @@ -586,23 +586,23 @@ }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2020.903.0"; - sha256 = "0g15yw8c21m2g0lpca4f519dgj2phccz15nqdbaq49736akr4qzm"; + version = "2020.925.0"; + sha256 = "1244fxm7x4rqi43kp6l98bsbjc2yvv7dmpbajdr9fapqm37fdbdj"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; - version = "2020.213.0"; - sha256 = "1yzrx7bji2163dzvyqri42byc7lgxlm59xbwgi312dw5714snmxy"; + version = "2020.923.0"; + sha256 = "1sy98s0dxcfxxslm1q503qhd9fl8d3idf47qi4561j5fds4dpdsv"; }) (fetchNuGet { name = "ppy.osu.Game.Resources"; - version = "2020.903.0"; - sha256 = "0f94kms4xyjl9xwf26j6n6k5zfbx61a6bkd3vljfmbmr88advssy"; + version = "2020.904.0"; + sha256 = "0n0alpyxpf65mmnqidh044sh4nibsfj0m5n8hfmpjwq11wnpmbih"; }) (fetchNuGet { name = "ppy.osuTK.NS20"; - version = "1.0.161"; - sha256 = "0li5vcpki1ih605c8h1hjf15m9wawkdaizcxib6v3mfjf860ma3s"; + version = "1.0.165"; + sha256 = "0ryb483i0jqy94mhvrh0xicv43h4r4amzgpmfrrmzrfvp9ajjar6"; }) (fetchNuGet { name = "ppy.SDL2-CS"; diff --git a/third_party/nixpkgs/pkgs/games/tuxpaint/default.nix b/third_party/nixpkgs/pkgs/games/tuxpaint/default.nix index ea37ded6b6..a5bea42d04 100644 --- a/third_party/nixpkgs/pkgs/games/tuxpaint/default.nix +++ b/third_party/nixpkgs/pkgs/games/tuxpaint/default.nix @@ -30,6 +30,12 @@ stdenv.mkDerivation rec { }; postInstall = '' + # Install desktop file + mkdir -p $out/share/applications + cp hildon/tuxpaint.xpm $out/share/pixmaps + sed -e "s+Exec=tuxpaint+Exec=$out/bin/tuxpaint+" < src/tuxpaint.desktop > $out/share/applications/tuxpaint.desktop + + # Install stamps tar xzf $stamps cd tuxpaint-stamps-2014.08.23 make install-all PREFIX=$out diff --git a/third_party/nixpkgs/pkgs/games/wesnoth/default.nix b/third_party/nixpkgs/pkgs/games/wesnoth/default.nix index ce37539204..2f971e12c9 100644 --- a/third_party/nixpkgs/pkgs/games/wesnoth/default.nix +++ b/third_party/nixpkgs/pkgs/games/wesnoth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.14.13"; + version = "1.14.14"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - sha256 = "1ka07h4sgmbc24qbaz0pbryx0yk339l4jzg32hy01qdvl2n40w3h"; + sha256 = "0rawcm3d1qwf4wxqcbjipl6h30sfv7z70viji28q4givi5hysvka"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/stella/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/stella/default.nix index 4c657fc30b..4976076e35 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/stella/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/stella/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ SDL2 ]; - + enableParallelBuilding = true; meta = { @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { the GNU General Public License (GPL). Stella was originally developed for Linux by Bradford W. Mott, and is currently maintained by Stephen Anthony. - As of its 3.5 release, Stella is officially donationware. + As of its 3.5 release, Stella is officially donationware. ''; - homepage = "http://stella-emu.github.io/"; + homepage = "https://stella-emu.github.io/"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix index bb61872f7c..e03cc06d55 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "5.0"; + version = "5.0.2"; url = "https://dl.winehq.org/wine/source/5.0/wine-${version}.tar.xz"; - sha256 = "1d0kcy338radq07hrnzcpc9lc9j2fvzjh37q673002x8d6x5058q"; + sha256 = "1g7c5djbi262h6zivmxbk26rsflwq8mrghr7hci3ajw7f3s89hn2"; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "5.16"; + version = "5.18"; url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz"; - sha256 = "0j9268s1dy4cjvhcf4igbg54gaws4a1l3pda449qy2p2i4psdncq"; + sha256 = "0hpkcpi6j162bkgcgzzj8y471777q06j7pydl61yp6qscn4g80ch"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "1rrw15mrygv9zcbqz0c3s7q7971wqj89ys2bvvm4b0d2h4j0k6wq"; + sha256 = "0bwcvkf1g1dsq1qmric3jfl85rfjzhq6x4h839hfqc536lkfbrpy"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/wine/vkd3d.nix b/third_party/nixpkgs/pkgs/misc/emulators/wine/vkd3d.nix index 082eb0b90c..91bef28559 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/wine/vkd3d.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/wine/vkd3d.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "vkd3d"; - version = "1.1"; + version = "1.2"; src = fetchurl { url = "https://dl.winehq.org/vkd3d/source/vkd3d-${version}.tar.xz"; - sha256 = "1dkayp95g1691w7n2yn1q9y7klq5xa921dgmn9a5vil0rihxqnj9"; + sha256 = "0szr1lw3xbgi9qjm13d1q4gyzzwv8i5wfxiwjg6dmwphrc7h6jxh"; }; buildInputs = [ vulkan-headers spirv-headers vulkan-loader ]; diff --git a/third_party/nixpkgs/pkgs/misc/lilypond/default.nix b/third_party/nixpkgs/pkgs/misc/lilypond/default.nix index 9e76693ce8..44dbf086ca 100644 --- a/third_party/nixpkgs/pkgs/misc/lilypond/default.nix +++ b/third_party/nixpkgs/pkgs/misc/lilypond/default.nix @@ -16,7 +16,14 @@ stdenv.mkDerivation rec { sha256 = "0qd6pd4siss016ffmcyw5qc6pr2wihnvrgd4kh1x725w7wr02nar"; }; - patches = [ ./findlib.patch ]; + patches = [ + ./findlib.patch + (fetchurl { + name = "CVE-2020-17353.patch"; + url = "https://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff_plain;h=b84ea4740f3279516905c5db05f4074e777c16ff;hp=b97bd35ac99efd68569327f62f3c8a19511ebe43"; + sha256 = "1i79gy3if070rdgj7j6inw532j0f6ya5qc6kgcnlkbx02rqrhr7v"; + }) + ]; postInstall = '' for f in "$out/bin/"*; do diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix index 71a248bcfa..0d772da679 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "electricsheep"; - version = "2.7b33-2017-10-20"; + version = "3.0.2-2019-10-05"; src = fetchFromGitHub { owner = "scottdraves"; repo = pname; - rev = "c02c19b9364733fc73826e105fc983a89a8b4f40"; + rev = "37ba0fd692d6581f8fe009ed11c9650cd8174123"; sha256 = "1z49l53j1lhk7ahdy96lm9r0pklwpf2i5s6y2l2rn6l4z8dxkjmk"; }; @@ -29,6 +29,10 @@ stdenv.mkDerivation rec { "CPPFLAGS=-I${glee}/include/GL" ]; + makeFlags = [ + ''CXXFLAGS+="-DGL_GLEXT_PROTOTYPES"'' + ]; + preBuild = '' sed -i "s|/usr|$out|" Makefile ''; diff --git a/third_party/nixpkgs/pkgs/misc/solfege/default.nix b/third_party/nixpkgs/pkgs/misc/solfege/default.nix index 21615b0c2b..71d9d682be 100644 --- a/third_party/nixpkgs/pkgs/misc/solfege/default.nix +++ b/third_party/nixpkgs/pkgs/misc/solfege/default.nix @@ -39,7 +39,7 @@ buildPythonApplication rec { meta = with lib; { description = "Ear training program"; - homepage = "http://www.solfege.org/"; + homepage = "https://www.solfege.org/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor orivej ]; diff --git a/third_party/nixpkgs/pkgs/misc/sound-of-sorting/default.nix b/third_party/nixpkgs/pkgs/misc/sound-of-sorting/default.nix index 07e50c8379..6b660232d5 100644 --- a/third_party/nixpkgs/pkgs/misc/sound-of-sorting/default.nix +++ b/third_party/nixpkgs/pkgs/misc/sound-of-sorting/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "01bpzn38cwn9zlydzvnfz9k7mxdnjnvgnbcpx7i4al8fha7x9lw8"; }; - buildInputs = + buildInputs = [ wxGTK SDL2 ]; preConfigure = '' @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Audibilization and Visualization of Sorting Algorithms"; - homepage = "http://panthema.net/2013/sound-of-sorting/"; + homepage = "https://panthema.net/2013/sound-of-sorting/"; license = with licenses; gpl3; maintainers = with maintainers; [ AndersonTorres ]; }; diff --git a/third_party/nixpkgs/pkgs/misc/uboot/nanonote.nix b/third_party/nixpkgs/pkgs/misc/uboot/nanonote.nix deleted file mode 100644 index fb3b98f478..0000000000 --- a/third_party/nixpkgs/pkgs/misc/uboot/nanonote.nix +++ /dev/null @@ -1,59 +0,0 @@ -{stdenv, fetchurl, fetchgit}: - -# All this file is made for the Marvell Sheevaplug - -stdenv.mkDerivation { - name = "uboot-qb-2010.06"; - - src = fetchurl { - url = "ftp://ftp.denx.de/pub/u-boot/u-boot-2010.06.tar.bz2"; - sha256 = "1j0bl8x5i5m1pn62z450gbw30pbrj7sgs3fjp2l2giczv49cn33r"; - }; - - srcPatches = fetchgit { - url = "git://projects.qi-hardware.com/openwrt-xburst.git"; - rev = "3244d5ef9f93802f9b9b6f4405636424abf6fa83"; - sha256 = "0mg87s10hpz41dr1zbd3bcl8i64gwvh3f1nrz8cb8c49099miqla"; - }; - - patchPhase = '' - cp -R $srcPatches/package/uboot-xburst/files/* . - for a in $srcPatches/package/uboot-xburst/patches/*; do - patch -p1 < $a - done - chmod +w -R * - sed -i -e 's/console=ttyS0,57600n8//' include/configs/qi_lb60.h - # Load more than 2MiB for the kernel - sed -i -e 's/0x200000;bootm/0x400000;bootm/' include/configs/qi_lb60.h - ''; - - makeFlags = [ - "CROSS_COMPILE=${stdenv.cc.targetPrefix}" - ]; - - # Add reiserfs support - configurePhase = '' - make mrproper - make qi_lb60_config - ''; - - preBuild= '' - # A variable named 'src' used to affect the build in some uboot... - unset -v src - ''; - - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp u-boot-nand.bin $out - cp u-boot u-boot.map $out - - mkdir -p $out/bin - cp tools/{envcrc,mkimage} $out/bin - ''; - - meta = { - platforms = stdenv.lib.platforms.mips; - }; -} diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index f1b2b6d638..14c05727e9 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-09-09"; + version = "2020-10-01"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "08295ce17405cb5f6c80d2f726262493bfd21210"; - sha256 = "1jyxxn6j7jkcr1yky6p1y798rza04q3pivsddig8qk85kg6dkgy5"; + rev = "2d3ed956b944132e1d520446493fa5c9aa8a309f"; + sha256 = "0mlx6g87h9mcvb5fbpx4j06mx7kpjmi8nh11kzm7bfni7bhyjhx4"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -389,12 +389,12 @@ let coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2020-09-19"; + version = "2020-09-28"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "810fa85761f44519116d4c8020f163e4ec76ad01"; - sha256 = "04gnz214gkb3hsxb2xwisbmmjf6njka6yvaf8xcwzplzxxnl2zxg"; + rev = "c8cc53707a11192ce7b3d6ef62750fea1ea1e9ce"; + sha256 = "08zq9axfyj4c8wvn09dj6dbw9iq7w4pxgms6yh34p3qf8km6pl91"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; @@ -413,12 +413,12 @@ let coc-markdownlint = buildVimPluginFrom2Nix { pname = "coc-markdownlint"; - version = "2020-09-17"; + version = "2020-09-29"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-markdownlint"; - rev = "3da74c203bf9db5c702142791338c1fdeec3310d"; - sha256 = "09zh0pchv0iirr7hfig1x6zai90fzg33ap9n6dhd3fa2yrd8qgci"; + rev = "876ce05c7a249f2065f4953ea1bfb0a0dadf764c"; + sha256 = "0qxbb45djq724yhfna0s9d7m99wcrv8vkw5ilvp1yz2vfg1b78x9"; }; meta.homepage = "https://github.com/fannheyward/coc-markdownlint/"; }; @@ -461,12 +461,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-09-24"; + version = "2020-09-26"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "12a5c97ef43d7f6865b5e51d6238a3a0bf1e8847"; - sha256 = "0l6dbjadwn4kmpyqjj6r4imn2i6zjqriskpp5m87krhj513516aw"; + rev = "2b83490cb1228abe4bf2c2557f1407321f6af734"; + sha256 = "10pgj0kh4vd0wvsb68l3k2af5rhmh249a2cf4mhbl8jb1g76bnrl"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -522,16 +522,28 @@ let completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2020-09-24"; + version = "2020-10-01"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "5c153f8ae094867a414cb2a7c0f59454299f17b3"; - sha256 = "0jm39f4qrm5sgrq1q70wx9674zw1gh7kb0vhi57r42m3jivvxvjy"; + rev = "52ccd7c344dca90b62de4ea997c4aa328ce7f020"; + sha256 = "035my2dzahf6svx3f97frv6xx56k4vxxiw0qcwgsbvdp3s4jmb9g"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; + completion-tabnine = buildVimPluginFrom2Nix { + pname = "completion-tabnine"; + version = "2020-10-01"; + src = fetchFromGitHub { + owner = "aca"; + repo = "completion-tabnine"; + rev = "49771bca86f185c8cd1017f28b025addae82fe09"; + sha256 = "1kc9ck62k7rj09i3bqhz36661z1501z7ns7q6dr4n07nqylcn5kb"; + }; + meta.homepage = "https://github.com/aca/completion-tabnine/"; + }; + completion-treesitter = buildVimPluginFrom2Nix { pname = "completion-treesitter"; version = "2020-06-26"; @@ -582,12 +594,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2020-09-16"; + version = "2020-09-29"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "7ea2fd5f42910dcd10eaaccddedcc33f2edd2ef1"; - sha256 = "1f14sg9v80ir9f1zk4xqjbqqd0cv2pxpipbflzwafmwcs5chz6rv"; + rev = "3c9d27a1a15da1d0f6128402fa766d9e9feebc1e"; + sha256 = "064ldkah460azqibc03cj42vbrl6ns4sj439wsbkqb0qxni5cp57"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1052,24 +1064,24 @@ let diagnostic-nvim = buildVimPluginFrom2Nix { pname = "diagnostic-nvim"; - version = "2020-09-16"; + version = "2020-10-01"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "diagnostic-nvim"; - rev = "49abd2e71772f6976b7e1360782570535069bc94"; - sha256 = "16i99j76j1s8p7kjyr49pwj9jlqiq0krzwyxxk1z16shfymvav88"; + rev = "bef1c6140563cb6416081b2517ae9953cd4e05ab"; + sha256 = "05f2hr3229zph3x9lhmabb9rzdf61r92f3ybj2gs40hfbak0c3pb"; }; meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/"; }; direnv-vim = buildVimPluginFrom2Nix { pname = "direnv-vim"; - version = "2019-04-30"; + version = "2020-09-27"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv.vim"; - rev = "5e75084465ad37dd0a4d4b1198b5ffa8978ae4e1"; - sha256 = "0vabsv98vwdjns3dliplg7x8ssyrin44af9jl248kdzkqw5fx445"; + rev = "c2b9f7834c1a2d28c4e022485b870c19de0c6ada"; + sha256 = "0qk1kywr4zdhvvpc77868g3aclwbmm5p4zvsxj65qb4bpzddxvrd"; }; meta.homepage = "https://github.com/direnv/direnv.vim/"; }; @@ -1872,24 +1884,24 @@ let lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; - version = "2020-06-16"; + version = "2020-09-30"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "0553fecb3425dafe65a724ad01d85427285ac184"; - sha256 = "0ih6ccsqhqc9cynkzqfb55x5mfz743hvdrxzlhm0axrkxxn3nczb"; + rev = "5b43087089798be70de0119e4f2476d2a2c0f6cb"; + sha256 = "04iw79ahfxm4ym5caj8iirs02l7qw9b49igzpg9vxs2ylqyfk3pn"; }; meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-09-16"; + version = "2020-09-30"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "b9024dcb4204437452b84dfd83bd39748bfc7cd3"; - sha256 = "1m896054kz44k8kfmp4pmashin85n41gddnhsv1657dgd2dyzply"; + rev = "df2a495aac2dae95e9869c35d79ed26313f0e7c3"; + sha256 = "1hc4vsyb616qj0irak1c28kgsk7aszk3x94mhrbgy6yxkiv9asgn"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -1920,12 +1932,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-09-05"; + version = "2020-09-25"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "f5f870e0ac67542fd83cb6ff99632940fe8795f9"; - sha256 = "1al9yvwn3rfw22351p221nx68hhqynh9cq1flyalkvr46cda48cz"; + rev = "2afc3ab4dda191c75764d3239d1cf56356759dd4"; + sha256 = "0yvinwvzhqb87nqg38azd19c9w0yrkl06mx3agji2mvn23p66ab5"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -2280,12 +2292,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-09-19"; + version = "2020-09-27"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "4f259033bfbc1465c3a8348fcf632260d96a3e6f"; - sha256 = "09grfx66m5wasqy8blhqhfcqnsh3b4gfyyi09l1zda1vr2hhvz15"; + rev = "78098f6d1e03fd87ca90a522a752106357dfdc6f"; + sha256 = "0hpml222gj203svm7f9sghzgg0ccjvf0xw9lbnfmn8naxqqqmzw6"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2364,12 +2376,12 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-09-22"; + version = "2020-09-30"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "807a94f746bac2ab328dc22e6ca88bd411283cc8"; - sha256 = "0wrz8kghnb52i2sxnnkx74kpj1ibp956707x5zlx0gqipvbqdvs8"; + rev = "e24d0edc1ac932da813e3034b6ecee9179c4b0e9"; + sha256 = "1n21i2y8w58ijqsj8c798s60in6lbw3ayx35vm781sk2gfrf1ckl"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; @@ -2436,12 +2448,12 @@ let nerdtree-git-plugin = buildVimPluginFrom2Nix { pname = "nerdtree-git-plugin"; - version = "2020-09-20"; + version = "2020-09-25"; src = fetchFromGitHub { owner = "Xuyuanp"; repo = "nerdtree-git-plugin"; - rev = "97eeaee46308a39cadfd2273280fcc4906988dd0"; - sha256 = "1s4mldcyq88mqnw3h4cq41w4217n6wmh1p4cwhqfz0caihb06jfb"; + rev = "85c4bed898d2d755a2a2ffbfc2433084ce107cdd"; + sha256 = "1m8s5x30k875812fbznvbq3pch5jpy29jr5rpzr0pr2ni5wkv6a4"; }; meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/"; }; @@ -2520,12 +2532,12 @@ let nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2020-09-15"; + version = "2020-10-01"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "db06dcbdc480b936b2da3028addb80807fdc8ed6"; - sha256 = "1d3jg75l8zgwxigmyy274rhn8ldfx003qzmfj2abd9lncqcs43va"; + rev = "9414e51689ee56253b55ba8ef01e5d63ec2e9d97"; + sha256 = "1vfqf8krd0mxyf31lhgmdpg6p8b5zqbpc0gjijj9akzgs6fdhknk"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -2568,12 +2580,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-09-23"; + version = "2020-10-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "98c12ec23a6df2f2f505304b61c4b2eefc0a568f"; - sha256 = "138rsbk2kx929cih6r3rqmgrygamnc1l9kh62pqsrphi28jh5178"; + rev = "5debe931333b20fe2b352dd92c03ded837e3df4b"; + sha256 = "1mw5v1qpqz7h9vb89bj1m8wrqk7yvfycmal7y1b5wizl45ssx40m"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3241,12 +3253,12 @@ let supertab = buildVimPluginFrom2Nix { pname = "supertab"; - version = "2017-11-14"; + version = "2020-10-01"; src = fetchFromGitHub { owner = "ervandew"; repo = "supertab"; - rev = "40fe711e088e2ab346738233dd5adbb1be355172"; - sha256 = "0l5labq68kyprv63k1q35hz5ly0dd06mf2z202mccnix4mlxf0db"; + rev = "d80e8e2c1fa08607fa34c0ca5f1b66d8a906c5ef"; + sha256 = "0wjaq6k1sb38qmjcp47cr0avvwhphr0wiyl8qvnc8qqyjf8y803k"; }; meta.homepage = "https://github.com/ervandew/supertab/"; }; @@ -3277,12 +3289,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2020-09-17"; + version = "2020-09-27"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "20fb41cb3ee7efd041866fad7384668d131a0029"; - sha256 = "1gmk9hlyz8k5880gzs0pqbpmscjzfj3cwfdkg950w5ky2lm0i7n2"; + rev = "dd226673063b189683b98133d7a2243c1316e71e"; + sha256 = "1kk7xavirj9lh77nsci5ws7p8a1bm3wz5la7sj7y82sr426rmlix"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -3325,12 +3337,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-09-23"; + version = "2020-09-29"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "6099093050d84094001f2f226ddc09d7c2edcdd6"; - sha256 = "1gvyq1gra9k3fjjzr4lh9kwf0h2a5di242kxlwyj78p9606cdf9g"; + rev = "a1e0e7a57144a0af26e219d16f6f00098b271e25"; + sha256 = "04c0s7q7gg1znvzgfdyicscfgbpxj7z5ym7v8zpcg9bfhg29nngv"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -3458,12 +3470,12 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2020-08-19"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "b38bdda4378b17888f5132787c49d79722c25752"; - sha256 = "0q29h348pgqxqw1pqq1nsj0nxccnb2x6jd92bpsqnjf452wsh2f2"; + rev = "8ea8d8b98e61cddaff159b4328310f4096c7bb2b"; + sha256 = "1fs7j7v72nv5374pqpx68xjc8kl3fyyhwz4hc029kljqlvgg0lrj"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; @@ -3602,12 +3614,12 @@ let vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; - version = "2019-11-13"; + version = "2020-09-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "7e4da6e78002344d499af9b6d8d5d6fcd7c92125"; - sha256 = "1n35igng3a6d5y4nh5pyb09s6khgcwbr3v0lnh33qb51cv4cnjh4"; + rev = "1329f888a777cc1f8228f048a532502a30f1df01"; + sha256 = "1jxwvqpiliq57mddbdbrspfv60vw0gzvh677mabnryg6wb94adds"; }; meta.homepage = "https://github.com/tpope/vim-abolish/"; }; @@ -3854,12 +3866,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-09-16"; + version = "2020-09-26"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "3740312de0be5200286260816e2563e77c0be0c5"; - sha256 = "0ia4h37gnxqagjz3yb2r6awp016iyc6dr0n84k2205g5pqck5b2x"; + rev = "9614105d09ff0d6e1043ab33028615f107fe94a5"; + sha256 = "11kkzl473l4nrz3k13264sn23pmpr1pdcnmxkzndpx1k0r3f87qy"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -3926,12 +3938,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2020-07-29"; + version = "2020-09-29"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "273ccae26d6b5ab10bb48479c0ff5971018e3c5a"; - sha256 = "07fldl6fsi3ns2zx4va69g01gb5mdsva8qpyjmryhn08l2qz0c40"; + rev = "ed8ea34b649c100c0b60167f8bde12e804627044"; + sha256 = "0dwql5s2j3bmdz0zfmx2f5fdky72mfa91q7kc301rgd9lr5jhqbg"; }; meta.homepage = "https://github.com/Chiel92/vim-autoformat/"; }; @@ -4070,12 +4082,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-09-21"; + version = "2020-09-30"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "f5f9f60558c7bc1bfe6a577f1fd9f91ff9ab55bf"; - sha256 = "0l55j2vb4l76jlamwxvd1l38irzfvyqlqwi2s13iy8xx4i54vsfx"; + rev = "c6ed3de48693d754ef47ec9422ecb065200f8a70"; + sha256 = "1wnz8fx7nkl4maszghl4q0csw3zi26vnavrvzc447il077sff3wq"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4262,12 +4274,12 @@ let vim-cue = buildVimPluginFrom2Nix { pname = "vim-cue"; - version = "2020-07-20"; + version = "2020-09-28"; src = fetchFromGitHub { owner = "jjo"; repo = "vim-cue"; - rev = "339edaf79ff1287ce6a23baaa421e68463cf1a2e"; - sha256 = "0jr30plym17fdg90smb7g35yi9iz9b7s4md6cxj83zg4vj2hyjh1"; + rev = "1c802d17f86c775d879b2cdebe84efd40dc4bbfd"; + sha256 = "1gp0s4094prxqyzk39igigjqppha7bmy4j36wxl16ns1v8yq4qp1"; }; meta.homepage = "https://github.com/jjo/vim-cue/"; }; @@ -4322,12 +4334,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-09-08"; + version = "2020-09-26"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "7d1c3aeb3b26c7fb7bcd7cb2bee67beb3e538db3"; - sha256 = "0yrc17pq713b86z71ad0zy8lm1cd2psyzbw8yb62d1prjc17hp77"; + rev = "929dbd023f0de84d1abb502b7d77eddad33419a6"; + sha256 = "15qj771nss9jxfrqnfgvk0d5zrna3g064lqbwrfxmc816k1j56w0"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -4442,12 +4454,12 @@ let vim-easymotion = buildVimPluginFrom2Nix { pname = "vim-easymotion"; - version = "2020-02-08"; + version = "2020-09-29"; src = fetchFromGitHub { owner = "easymotion"; repo = "vim-easymotion"; - rev = "dd7b4b526775bc8553e16bc402020573b04a948c"; - sha256 = "1dhhq1y6xa3q26irclad6254q89xpnxglfd92v3bq01l4p41zcqf"; + rev = "6c9c0547bfcca6a059dfaaf39dcac1b8c4e814c4"; + sha256 = "1lbn844pv5pnla3qhc01wyyrx3czmr83gax8pr3w6283jwp4di6y"; }; meta.homepage = "https://github.com/easymotion/vim-easymotion/"; }; @@ -4478,12 +4490,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2020-04-25"; + version = "2020-09-27"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "53c530f79cfcd12498e31fcf8ecc466eba34c75c"; - sha256 = "13yr7iwi4w0m4zgkq1ia74qcca9wh9k0bz2y1yvm81db0bllsf6s"; + rev = "c0f7b40260d6733c2c283407bea02806e6acb9e5"; + sha256 = "0h1vpswfxvl6kwinn4hk01qzmjzbbinkn2fhw4i9j5bpq0z3w8wp"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -4682,12 +4694,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-09-24"; + version = "2020-09-30"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "49315d0c74acb983f2902260ebc9d86f85758ea4"; - sha256 = "0i2lhfw542c7xm7d10b0q5isw3398ycyn06mnp429nwb7fldv1ww"; + rev = "4189bdb580743a92f0e81d0ba9359a1c3b253a3c"; + sha256 = "0pbmi9p87bqvf2l5jxq1wdkjjgwn0m3r1lswdbxrn070s8c8rg0a"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -4778,12 +4790,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-09-21"; + version = "2020-09-28"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "0a9792612fb87c5581906a9cc410b472c25a0d78"; - sha256 = "1gwswqmxd29hpj8rvf2v866877xc4fz3jhymkf0whhw62ya5gr9v"; + rev = "e8da3621d6177e5b0beca318a0f9f5baa44d9350"; + sha256 = "0q7i7c6d7infybw870qlbdgpqddykzw14142ikz8x0sb30ijigxq"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -4838,12 +4850,12 @@ let vim-gutentags = buildVimPluginFrom2Nix { pname = "vim-gutentags"; - version = "2020-04-15"; + version = "2020-05-22"; src = fetchFromGitHub { owner = "ludovicchabant"; repo = "vim-gutentags"; - rev = "8e69652c7a7e7aabd96cff21b6ee6b6a295c901c"; - sha256 = "1j9548h2cqvnmqa89hha0s1wfvijdgk6ilakq60awlijdw427f04"; + rev = "50705e8ebb7038b31314f416d1bddd9cb9154049"; + sha256 = "0vm3bp94kbc28azsmm8505hyd9v1a9isrn5dp47njmj8w17l7725"; }; meta.homepage = "https://github.com/ludovicchabant/vim-gutentags/"; }; @@ -5138,12 +5150,12 @@ let vim-javascript-syntax = buildVimPluginFrom2Nix { pname = "vim-javascript-syntax"; - version = "2019-08-21"; + version = "2020-09-27"; src = fetchFromGitHub { owner = "jelera"; repo = "vim-javascript-syntax"; - rev = "e65e4f01ba94761323450208c9bf7141428784db"; - sha256 = "09561jf3cmzpm8jn8k34fd3av6i1mqi6n32bisri96jkabw8dpv7"; + rev = "7b8e2ee761e5d81f2bff57a728909a7968df098b"; + sha256 = "1il68nf8zsz1hn5vqmsyjckmh9s8sw4z6lqqqrxwfjqkqm1ji5xq"; }; meta.homepage = "https://github.com/jelera/vim-javascript-syntax/"; }; @@ -5211,12 +5223,12 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2020-09-09"; + version = "2020-09-29"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "58b9a4dd48ee28488a6772fc6bb04abb0d083092"; - sha256 = "0gw5l1i7crsflrl3si1ymlpjh9yj5l5d23jj9irwyfkc8c6zqvbn"; + rev = "3a24dca8f8cc9b88efca3faf446db41f5b7da121"; + sha256 = "0gn9rlwndq0awv51gxvd3gsxlh5sb76cvc60bh0lsh4f4lhmyy3r"; }; meta.homepage = "https://github.com/MaxMEllon/vim-jsx-pretty/"; }; @@ -5367,24 +5379,24 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2020-09-21"; + version = "2020-09-28"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "8262f528ca50832826efd0605ddc17a3830b53d1"; - sha256 = "0s1ayrprv59dki7xhzzlzxdfrkm3i70p8wh8sf48higvcrsjjylv"; + rev = "1f6e440c5485b26a75ca1db90bd793cb9a81d57b"; + sha256 = "147rvcjq1h03x3bwgg0ii5jvsxvh4j6bk47z1hk349rn4ssi6fmr"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2020-09-24"; + version = "2020-09-26"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "9755ec0c99e3cc4f3b4e0171c0fba02c132d6800"; - sha256 = "17ahwyjyb6w9504301hjc7nlsgnn7y5mjp0a1akj4dh8wb4hhzg6"; + rev = "d2b6922250e2fc8fdf7c94c6ca6f0871fe9be1e1"; + sha256 = "1kxqafjfl1f32q05xgkmczfcjg8zr87w1r0hyw054fdzf7krcnmp"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -5499,12 +5511,12 @@ let vim-monokai = buildVimPluginFrom2Nix { pname = "vim-monokai"; - version = "2020-09-12"; + version = "2020-09-30"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "39a3bd877c26792838ed58c1b8b3e0a5daa11402"; - sha256 = "01cmbrzbvsdl8946rwdz8jhnpfr5fapgvpx65vnqq2bisc901dz3"; + rev = "054194afce3fdafea33cf21fbfc4d6b3c0e30fc8"; + sha256 = "036w39fwxj75mh9m5nqiakzyhn2ynsxmbq2rp45zf83nr6mm2h5q"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -5931,12 +5943,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-09-24"; + version = "2020-09-30"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "e2bbed8acc1f1cf498a0085cf771cf9bf40fb709"; - sha256 = "1cg0lfpjrzp7wajmdggwy56vjymrvhlmvmg3j7z67avvck8n2fn9"; + rev = "3ad297db5c1cf94660e4297ffa81b6281eab2884"; + sha256 = "0v7dzidqp24shm00w79xvg912qvdbsn2119j5gw70q1xjsi3sxav"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6099,12 +6111,12 @@ let vim-rails = buildVimPluginFrom2Nix { pname = "vim-rails"; - version = "2020-09-14"; + version = "2020-09-29"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "3cc34304643abf8d28d2482e74119d0d5f4b5302"; - sha256 = "1j2a3kwcff4avniph4z8g4im59z8fs2kj7vkwzgalj828nncx5g6"; + rev = "2c42236cf38c0842dd490095ffd6b1540cad2e29"; + sha256 = "0nhf4qd7dchrzjv2ijcddav72qb121c9jkkk06agsv23l9rb31pv"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -6399,12 +6411,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-09-24"; + version = "2020-10-01"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "06fbadd9b3c8e4be1e1343addb51cd0582c047f7"; - sha256 = "14v5p1khr56pdy0x0pn540cjbvwxr6782pvsdwwbfdq9p2hmhnq1"; + rev = "78a9ca0fa3e4d16b73f5f642ec56298b7fec7803"; + sha256 = "1k4rvkbfixp1yi5gz8kffnq7k7xd7bc5cb521jb6h0z6f74qrk70"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6616,12 +6628,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-09-01"; + version = "2020-09-29"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "795f16430c568fc13266be9239bf70f19b8ae50f"; - sha256 = "06j24di1r2p1qpiy86h75ghfsf0lqkfllf7kf64gjas89gbc9i89"; + rev = "fd9fb9b29c265d86fa30c672df1fea9a5a757860"; + sha256 = "0qhjmpamhk89h9hjzwc9j88yngf945fk5jd9015qajfk0l15k8x9"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -6748,12 +6760,12 @@ let vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2020-09-18"; + version = "2020-09-29"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "2fd76aa930e34838335c1aa125b88e7ea671e6c0"; - sha256 = "1xy0vp9sgqjm6qpfic2bbla4mxihw7j41gvi8cn0wsira6qcwda0"; + rev = "6c0b5d2faa49f2059331a4004b34a916c96abcb3"; + sha256 = "11kq87drp0ca5rj9j34rpajbzv79wxm3k2cf249dxvi0chcl41ma"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -6880,12 +6892,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-09-20"; + version = "2020-09-30"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "68c9570285f067020f0358623cafe63dbc2bd63f"; - sha256 = "1dpv6v449bcn6n72jjgvlnc9mnq3cpfy9b8m6mmjgvzgzkc1wj10"; + rev = "61855432df721f01e5b64fec07bf7a9077ff32b5"; + sha256 = "017pydd4yzkz3s8ncpy99mh35f1pdk1ql7v7grm31ccqwsn8h565"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -6964,12 +6976,12 @@ let vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2020-09-22"; + version = "2020-09-29"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "89644adb8cc75ea96b4ab8e8218f22f1cc0deb23"; - sha256 = "1cyzfj86qizqnqi3ypf0cx4pvl9bsas77pxd1jpb5f3lslh2xhh8"; + rev = "641df563764d68454ab752a6815d783c452274be"; + sha256 = "00wn2jvjazkjagf4bfpz3fh7xh2w495qn8kilz89lab6pvzx79rp"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -7142,6 +7154,18 @@ let meta.homepage = "https://github.com/Shougo/vimproc.vim/"; }; + vimsence = buildVimPluginFrom2Nix { + pname = "vimsence"; + version = "2020-06-30"; + src = fetchFromGitHub { + owner = "hugolgst"; + repo = "vimsence"; + rev = "d6bb167499b8e43e889b305c8670b2445f505ced"; + sha256 = "0f6jzkfjcvaln61jbva2laws8aqhs5vk4314z900d3hb7rfclrfy"; + }; + meta.homepage = "https://github.com/hugolgst/vimsence/"; + }; + vimshell-vim = buildVimPluginFrom2Nix { pname = "vimshell-vim"; version = "2019-07-16"; @@ -7156,12 +7180,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2020-09-19"; + version = "2020-09-27"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "6a5c0cf63e9414bfbf627999f9859259a01d9d2c"; - sha256 = "1bwdnhsa5lrid21pz5byhvc5d3vfsrzq7laqxpcq0h67cch154m3"; + rev = "692a0d8d39bfbd048119df9644e4b2fab2e01abe"; + sha256 = "1msf62l8bvcgk0g5rknfy44kjfh0r081y78xi15xyyc1mibpvx06"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -7169,12 +7193,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-09-24"; + version = "2020-09-29"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "a19c398b1e7876694ff5f6c65d95b23d5b8aadde"; - sha256 = "1mrlafqh1y6yc1m3gybwsi8400gyvnvbwzbmpxdizlx87iiz3bpq"; + rev = "bfdaec19bf236fad1c9c192a0cf43e299cf1682a"; + sha256 = "12z29gs9h81rv0w3zm49r4b4s3bj0gzqxl5x1gyjk7pijvnnxfbg"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7217,12 +7241,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-09-22"; + version = "2020-09-29"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "9c9adf16db3445005181751f0d3db143d58fe24d"; - sha256 = "0d1c2p63kkvhgwcrj97qc4yahnx7z9q14qwadbj924w8qlvylmff"; + rev = "bcb50336188074c9cfc1aad4b463f4c0e698a68c"; + sha256 = "0kckpj2v0yabp7hz9a6qdh8vspdn6fldk2q1pygyn35bii8x86dh"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -7337,12 +7361,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-07-30"; + version = "2020-09-27"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "4d76c5391b7975bd6dd09c0562c0fd4d78e14fa0"; - sha256 = "1ql5gwdnsf9y56ijphspfi3sbjgfj1594728xyw6l432mddgqx99"; + rev = "7c904cf443f5fd4900e1b4aad6dba6af96b4a395"; + sha256 = "0ap2jh0j5ssv1mv51syvw2y7352ydf4qmk3s7f2rlcq3nba3y6rr"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -7350,12 +7374,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-09-20"; + version = "2020-09-30"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "4891999f055167cf845671c231d7740c104074bd"; - sha256 = "0cgbrgw1ppk7a8vwg0j2zf123clczkf9qv6gaaqmm8kz9j2n4pkb"; + rev = "12376a7b179939612f834735f50015436e30c6e7"; + sha256 = "0caf6xd9gxx136gi92hnw0myfil74wh3qg264ykfd0km34lysf3h"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index 1851529365..a7fdc8b5a1 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -9,6 +9,7 @@ , gobject-introspection, glib, wrapGAppsHook , substituteAll , languagetool +, tabnine , Cocoa, CoreFoundation, CoreServices , buildVimPluginFrom2Nix , nodePackages @@ -228,6 +229,14 @@ self: super: { configurePhase = "cd plugins/nvim"; }); + vimsence = super.vimsence.overrideAttrs(old: { + meta = with stdenv.lib; { + description = "Discord rich presence for Vim"; + homepage = "https://github.com/hugolgst/vimsence"; + maintainers = with stdenv.lib.maintainers; [ hugolgst ]; + }; + }); + vim-gist = super.vim-gist.overrideAttrs(old: { dependencies = with super; [ webapi-vim ]; }); @@ -589,12 +598,21 @@ self: super: { libiconv ]; - cargoSha256 = "0qqys51slz85rnx6knjyivnmyq4rj6rrnz7w72kqcl8da8zjbx7b"; + cargoSha256 = "QUi3GyAsakAtDQkiVA7ez05s5CixqsVSp92svYmcWdQ="; }; in '' ln -s ${maple-bin}/bin/maple $target/bin/maple ''; }); + + completion-tabnine = super.completion-tabnine.overrideAttrs(old: { + buildInputs = [ tabnine ]; + + postFixup = '' + mkdir $target/binaries + ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s) + ''; + }); } // ( let nodePackageNames = [ 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 f328d0505f..2b1d6337f6 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -1,4 +1,5 @@ 907th/vim-auto-save +aca/completion-tabnine airblade/vim-gitgutter airblade/vim-rooter ajh17/Spacegray.vim @@ -150,6 +151,7 @@ hrsh7th/vim-vsnip hrsh7th/vim-vsnip-integ hsanson/vim-android hsitz/VimOrganizer +hugolgst/vimsence iamcco/coc-spell-checker iamcco/coc-vimlsp ianks/vim-tsx 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 8c46b242ef..f6c765383e 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -50,13 +50,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.29.0"; + version = "1.0.1"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/microsoft/vscode-cpptools/releases/download/${mktplcRef.version}/cpptools-linux.vsix"; - sha256 = "0qw21wd6hfqrmvyvr2ggydcfsk1hralj5x3s8hhwqyspb7szggxi"; + sha256 = "1lb5pza2ny1ydan19596amabs1np10nq08yqsfbvvfw7zbg4gnyc"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix index a914d70f17..90ab030263 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -170,8 +170,8 @@ in mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.9.0"; - sha256 = "0p2wbnw98zmjbfiz4mi1mh131s78r01kjnja339lwdigqxg88gi6"; + version = "1.9.4"; + sha256 = "029s1al1f3qk4pa3539rs045g9jwkhbmdg7wj7biqc6shcria4ca"; }; meta = { license = stdenv.lib.licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix index f5dbadd689..3a085b98a9 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix @@ -41,13 +41,13 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2020.8.103604"; + version = "2020.9.111407"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix"; - sha256 = "1gncnhmwjipaf7hzpimwzqdzyqyy4sznkq4qr2mn1ndjl6s1hh58"; + sha256 = "0li68k0saj3v8w44jdmrkacf4jib4hkw0fca2rgv9cf18zswir1f"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix index 30b2f94f1a..cec0448c34 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -8,8 +8,8 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "4.0.0"; - sha256 = "0bwxz8dg00k8frnvkvcngll5yaf9k7z13dg309vmw8xbdgkiyid4"; + version = "4.0.8"; + sha256 = "1yma86x5g8fip388afgg20k3sxpkf8bfn98d3850jg6b3zjlw19r"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix index 91d7e05a88..f4670581de 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1ai1z4kf91b1m3qrpwqkc1af5vm2fkdkknqv95xdwf19q94aw6gz"; }; - nativeBuildInputs = [ gettext makeWrapper ]; - buildInputs = [ alsaLib ncurses libsamplerate fftw ]; + nativeBuildInputs = [ gettext ]; + buildInputs = [ makeWrapper alsaLib ncurses libsamplerate fftw ]; configureFlags = [ "--disable-xmlto" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix index de02ffb30a..a90b2fce34 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix @@ -8,6 +8,8 @@ python.pkgs.buildPythonApplication rec { pname = "bcc"; version = "0.16.0"; + disabled = !stdenv.isLinux; + src = fetchurl { url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; sha256 = "sha256-ekVRyugpZOU1nr0N9kWCSoJTmtD2qGsn/DmWgK7XZ/c="; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix index a3935d0069..b672dd1701 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { - version = "2.2.7"; + version = "2.2.11"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "1ap100xh5wrdvy5h2ydcy6rqcklb4fz6xxs33ad3j9yx3h1ixj2d"; + sha256 = "06ajhs6byw3pj0skix6ppmdjsg1a3zan8yamnjqdgkxwliiszhrc"; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index e480b44900..76ea5230be 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "firmware-linux-nonfree"; - version = "2020-05-19"; + version = "2020-09-18"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; rev = lib.replaceStrings ["-"] [""] version; - sha256 = "13yrpgfqxp5l457p3s1c61is410nv0kv6picx9r0m8h1b0v6aym3"; + sha256 = "06k2x6y9dhzs6nnbs1ws7rxbz0xijzmyn24sa223n0bmbb96n4f0"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0pjl70nwarnknxah8vikb051c75mkg25a5m4h3344cw86x8hcx10"; + outputHash = "1avpf2x1g7dlpva76pcnldxngkjabsyaknkkjbrhg1mj6z9g1mx7"; meta = with stdenv.lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix index 40598abac9..6da1df98b2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-firmware"; # Check Makefile when updating, make sure postInstall matches make install - version = "1.0.17"; + version = "1.0.18"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; rev = version; - sha256 = "0cnrskfk3sam90lfpgsraqs4bx9yz8rxhwfs8rxdri04lakxgghg"; + sha256 = "08y65ak3y08xcl1nprwraqv9l65yqnfllbgmxyd2bppjpprwq474"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--workspace" ]; - cargoSha256 = "06jrmxy68glcmbn9px29wc0s8pqdn26iy4jn3c246dapv1zvbb4s"; + cargoSha256 = "00933zkhqd1l29ir2dgp5r1k7g24mlb2k8fmggwzplrwzw1al5h4"; # Purposefully don't install systemd unit file, that's for NixOS postInstall = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iw/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iw/default.nix index cbd19b7da8..f0097e37a9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iw/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iw/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, libnl }: +{ stdenv, fetchurl, pkg-config, libnl }: stdenv.mkDerivation rec { pname = "iw"; - version = "5.8"; + version = "5.9"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1d1dfynrzh52zdia1l23ajv4q5wixgffnc1gkz05qrxnn2n4p75m"; + sha256 = "1wp1ky1v353qqy5fnrk67apgzsap53jkr7pmghk3czpbk880ffi9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libnl ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; 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 ca353ae922..b7dadee295 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.197.a.patch", - "sha256": "171bgi7pw64v8byqmplafnyx26h1yrxhci9b12ndjyfg91fkhw31", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.197.a/linux-hardened-4.14.197.a.patch" + "name": "linux-hardened-4.14.199.a.patch", + "sha256": "0y0cc6kmacr7w7mdhb5m55f67fmaq75iznjif4i5aqx970kr47wf", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.199.a/linux-hardened-4.14.199.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.144.a.patch", - "sha256": "0vs48h3zcir6s72rnvkjxvjl6cscfaigwji00q940v7lgqyq8lvl", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.144.a/linux-hardened-4.19.144.a.patch" + "name": "linux-hardened-4.19.148.a.patch", + "sha256": "03rxw4wx0hdg1r14b9h2fmvqlhzi6hfc9jic5ml01wzazphzzm62", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.148.a/linux-hardened-4.19.148.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.67.a.patch", - "sha256": "0jpjc1magvlhfwrx43n68xcxxk1g5w2g0rvp92n7yli0db97k1bm", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.67.a/linux-hardened-5.4.67.a.patch" + "name": "linux-hardened-5.4.68.a.patch", + "sha256": "0rfzs7hfh8y5dawpf6gndwwqml4g2pmbbfcakd325bx0qkqf9bhh", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.68.a/linux-hardened-5.4.68.a.patch" }, "5.7": { "name": "linux-hardened-5.7.19.a.patch", @@ -20,8 +20,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.19.a/linux-hardened-5.7.19.a.patch" }, "5.8": { - "name": "linux-hardened-5.8.11.a.patch", - "sha256": "0cbmlwfzh9ppcvih437sp832rkhr7dfhx97drnkz4gysfyiyh07l", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.11.a/linux-hardened-5.8.11.a.patch" + "name": "linux-hardened-5.8.12.a.patch", + "sha256": "0hyb9gw40ybb6k8liamcxcsps5rv647i4aha1rcnwri6xhw9dhcy", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.12.a/linux-hardened-5.8.12.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 e0c370c594..5e99e74fbe 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.199"; + version = "4.14.200"; # 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 = "1yflafb0n783igghk6d392pk6lbk3p2w7y01ams08f1b4qm47wq2"; + sha256 = "0f4sd4fqgm1wbhmrsib04ry5aza84mlc8747y5wm6jx34h14lh2x"; }; } // (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 aebded8cb7..4fb373b1e4 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.147"; + version = "4.19.149"; # 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 = "19nnx61v7c0102ik1rjan0kdsj8av8v7iqz5vm3v3kjllmjmvr2x"; + sha256 = "001alvxgyb1n0fgbfi5dkzjviid32lyjfjwd3jwmcallcsdcpkfr"; }; } // (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 c6f9b6ddb4..b8e7153187 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.237"; + version = "4.4.238"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1q6hwjwvlsikgr8b04l7v2jia2wyqxgbli6i7y20aq49h13ap2qk"; + sha256 = "0r1kb7p0zf0nkavvf9nr9hs7bdjym43cqv87hkp7vrqpbh1i8y06"; }; } // (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 c6d29d2d8a..c6ab9134e9 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.237"; + version = "4.9.238"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "07w6mwgh7i3bvg1w3w5i9kgxjmvqr7cv7nzrmx7j9p6cq295gv41"; + sha256 = "0gsa2g5yjc7459ja107nla700ma32sg57dyj8q2xzi0yfw5zdsmi"; }; } // (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 046007c58e..40295fb690 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.67"; + version = "5.4.69"; # 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 = "196avi0950qrd0lxdpdsl6lxa51f20sz476mcl1i5islbnfbsxf1"; + sha256 = "19vxsbwvfwyz1w6m7sp38d504w98zwjxaap4hfhh6wrrddqivcx8"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.8.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.8.nix index d9567b20e0..11ec11c443 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.8.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.8.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8.11"; + version = "5.8.13"; # 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 = "0jy0yrrixzql9dlk9305w98pja2pm6ijrdbai326595pnk740n9y"; + sha256 = "039j4ckx2p6rfpgqc5gzn6xc1krvhy0ivkjxck83s66xgqbkcngj"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix index d3ea80ecb2..7488634367 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17624"; - sha256 = "0gs3mpiffny408l9kdrxpj48axarfb2fxvcw4w8zsz5wr7yig0n2"; + rev = "17688"; + sha256 = "02bw3lgy3i7bbx83p13l40m48msks2yb5qb1d365ghl6axkw6vwd"; } , ... }: diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index f58f08ca91..144eed65ac 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.66-rt38"; # updated by ./update-rt.sh + version = "5.4.69-rt39"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1cnsrz21kcf0h7krpv9p1a7n59mybr5ii0jdi3yc3x3lcwvk06gz"; + sha256 = "19vxsbwvfwyz1w6m7sp38d504w98zwjxaap4hfhh6wrrddqivcx8"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1w0v5wl5fhxl5axd4701dljxhv9rywpgiix3yv7l6i3c5b8iw1zi"; + sha256 = "0y01m4mx4wl0w6nnmb1h5r87i11zx6ndwk8p8d7pp7vykq79x6rn"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; 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 b9db2f103e..b056568b16 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.9-rc5"; + version = "5.9-rc8"; extraMeta.branch = "5.9"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1f410hkrk1b5g9wkh6078ph03fiyxpmbd5kdl9w592afphcddbrc"; + sha256 = "0yhjanmrg0cjmdn7yq8nx0h7q3aq9cimqhn9k4nis1a976p8wpgw"; }; # Should the testing kernels ever be built on Hydra? diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix index ce90893586..947aa7c19a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.8.10"; + version = "5.8.13"; in buildLinux (args // { @@ -12,7 +12,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-zen1"; - sha256 = "1mm4x2amnpwixvi7q8pj9my75b08ps2mafgz4j2iszpylkdzi53d"; + sha256 = "161bvrmic7gspkgkv0pqssk6dzv95vkxld69rir968khwlnpsnim"; }; extraMeta = { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix index 68ccef6529..948b8aab9a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix @@ -7,13 +7,13 @@ with builtins; stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "1wi3a795jq0smqg1c5ml2ghai47n1m5ijmch017wscybx4jdlynv"; + sha256 = "0ilnnm4q22f8fagwp8kb37licy4ks861i2iqh2djsypqhnxvx3fv"; }; patches = [ 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 cb93c635af..9b2bcf3b91 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.6.4.2_35491.20200318"; + version = "5.6.4.2_35491.20200702"; src = fetchFromGitHub { owner = "gordboy"; repo = "rtl8812au-5.6.4.2"; - rev = "49e98ff9bfdbe2ddce843808713de383132002e0"; - sha256 = "0f4isqasm9rli5v6a7xpphyh509wdxs1zcfvgdsnyhnv8amhqxgs"; + rev = "3110ad65d0f03532bd97b1017cae67ca86dd34f6"; + sha256 = "0p0cv67dfr41npxn0c1frr0k9wiv0pdbvlzlmclgixn39xc6n5qz"; }; nativeBuildInputs = [ bc nukeReferences ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod"; - homepage = "https://github.com/zebulon2/rtl8812au-driver-5.2.20"; + homepage = "https://github.com/gordboy/rtl8812au-5.6.4.2"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ danielfullmer ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821cu/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821cu/default.nix index 62ea8aaaab..e45c70993a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, kernel, bc }: stdenv.mkDerivation rec { name = "rtl8821cu-${kernel.version}-${version}"; - version = "unstable-2020-05-16"; + version = "unstable-2020-08-21"; src = fetchFromGitHub { owner = "brektrou"; repo = "rtl8821cu"; - rev = "5c510c9f14352fed4906a10921040b9e46b58346"; - sha256 = "1n74h1m3l2dj35caswaghzcjwcv5qlv3gj6j1rqdddbyg5khl4ag"; + rev = "45a8b4393e3281b969822c81bd93bdb731d58472"; + sha256 = "1995zs1hvlxjhbh2w7zkwr824z19cgc91s00g7yhm5d7zjav14rd"; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/schedtool/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/schedtool/default.nix index de947a9cd3..98663a5ab4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/schedtool/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/schedtool/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Query or alter a process' scheduling policy under Linux"; - homepage = "http://freequaos.host.sk/schedtool/"; + homepage = "https://freequaos.host.sk/schedtool/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix index 27e26b13a5..7cd80fd9a0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix @@ -207,9 +207,9 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.0.0-rc1"; + version = "2.0.0-rc3"; - sha256 = "0d1m5zwgqzfwbscvb60zvzkjgl5nkbvas22vjsyci3xygz0qwjsb"; + sha256 = "00fljxs6vacfhzc13bgsrmq6p3agpzcq6waw4iv2m58dr90jhlcz"; isUnstable = true; }; } diff --git a/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix b/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix index ab5c2da5ed..2475c6c5aa 100644 --- a/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix +++ b/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix @@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null); stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.7.2"; + version = "7.7.4"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "12ay2y7ixaxzj12pw66k65743ic3iccicn49cnjmas51c5ww09h1"; + sha256 = "1j9lr181ama7rfv76ikkvr0jkmc26ln1daqvspnsyamqwd03vh48"; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/caddy/default.nix b/third_party/nixpkgs/pkgs/servers/caddy/default.nix index 1ed6fcd2d5..a4e787db73 100644 --- a/third_party/nixpkgs/pkgs/servers/caddy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/caddy/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "caddy"; - version = "2.1.1"; + version = "2.2.0"; subPackages = [ "cmd/caddy" ]; @@ -10,10 +10,12 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "0c682zrivkawsxlps5hlx8js5zp4ddahg0zi5cr0861gnllbdll0"; + sha256 = "086zgbwb3v11gik2w024p7m7ywkzn0w27y6hrngd4rxylj7jq7c8"; }; - vendorSha256 = "0jzx00c2b8y7zwl73r2fh1826spcd15y39nfzr53s5lay3fvkybc"; + vendorSha256 = "1rm7v03v6rf9fdqrrl639z8a46cdzswjp8rdpygcsndqfznn5w7b"; + + passthru.tests = { inherit (nixosTests) caddy; }; meta = with stdenv.lib; { homepage = "https://caddyserver.com"; diff --git a/third_party/nixpkgs/pkgs/servers/caddy/v1.nix b/third_party/nixpkgs/pkgs/servers/caddy/v1.nix deleted file mode 100644 index dce4eea84b..0000000000 --- a/third_party/nixpkgs/pkgs/servers/caddy/v1.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "caddy"; - version = "1.0.5"; - - goPackagePath = "github.com/caddyserver/caddy"; - - subPackages = [ "caddy" ]; - - src = fetchFromGitHub { - owner = "caddyserver"; - repo = pname; - rev = "v${version}"; - sha256 = "0jrhwmr6gggppskg5h450wybzkv17iq69dgw36hd1dp56q002i7g"; - }; - - vendorSha256 = "09vnci9pp8zp7bvn8zj68wslz2nc54nhcd0ll31sqfjbp00215mj"; - - preBuild = '' - cat << EOF > caddy/main.go - package main - import "github.com/caddyserver/caddy/caddy/caddymain" - var run = caddymain.Run // replaced for tests - func main() { - caddymain.EnableTelemetry = false - run() - } - EOF - ''; - - meta = with stdenv.lib; { - homepage = "https://caddyserver.com"; - description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; - license = licenses.asl20; - maintainers = with maintainers; [ rushmorem fpletz zimbatm filalex77 ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix index 981056b53c..6b3d35e363 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "coredns"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "1wayfr26gwgdl0sfrvskb4hkxfmxfy7idbrpw3z4r05fkr2886xj"; + sha256 = "0ggkpdlwrmyaicn61qyx4m5svmw7px0gfwl8mhhif8dfmjznfkir"; }; - vendorSha256 = "17znl3vkg73hnrfl697rw201nsd5sijgalnbkljk1b4m0a01zik1"; + vendorSha256 = "0fzgqgfmyqfyap0j81ihag0319cq34k3y0a9rxkg9cg23hn1d5gf"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/gemini/molly-brown/default.nix b/third_party/nixpkgs/pkgs/servers/gemini/molly-brown/default.nix index 216a4015ef..354412a4b7 100644 --- a/third_party/nixpkgs/pkgs/servers/gemini/molly-brown/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gemini/molly-brown/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { pname = "molly-brown"; - version = "unstable-2020-07-06"; - rev = "2e510328ef1737c67641c588095e4628e3dfa8d3"; + version = "unstable-2020-08-19"; + rev = "48f9a206c03c0470e1c132b9667c6daa3583dada"; goPackagePath = "tildegit.org/solderpunk/molly-brown"; src = fetchgit { inherit rev; url = "https://tildegit.org/solderpunk/molly-brown.git"; - sha256 = "0c2pmkcs5a04h2vwzbhj6rg47mb9wcmkh22i56kx7clh51wbbvc4"; + sha256 = "1w79a25mbgav95p78fkdm9j62chwwpkqv0m2wmh5my03yq398gya"; }; goDeps = ./deps.nix; diff --git a/third_party/nixpkgs/pkgs/servers/gerbera/default.nix b/third_party/nixpkgs/pkgs/servers/gerbera/default.nix new file mode 100644 index 0000000000..93bd7778d0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/gerbera/default.nix @@ -0,0 +1,78 @@ +{ stdenv, fetchFromGitHub +, cmake, pkg-config +# required +, libupnp, libuuid, pugixml, libiconv, sqlite, zlib, spdlog, fmt +, pkgs +# options +, enableDuktape ? true +, enableCurl ? true +, enableTaglib ? true +, enableLibmagic ? true +, enableLibmatroska ? true +, enableAvcodec ? false +, enableLibexif ? true +, enableExiv2 ? false +, enableFFmpegThumbnailer ? false +, enableInotifyTools ? true +}: + +with stdenv.lib; +let + optionOnOff = option: if option then "on" else "off"; +in stdenv.mkDerivation rec { + pname = "gerbera"; + version = "1.6.1"; + + src = fetchFromGitHub { + repo = "gerbera"; + owner = "gerbera"; + rev = "v${version}"; + sha256 = "sha256:05ca27r9sidbl7xns9hcdan8wgjrpg26n1wq1vp247c9bqhpyql8"; + }; + + cmakeFlags = [ + "-DWITH_JS=${optionOnOff enableDuktape}" + "-DWITH_CURL=${optionOnOff enableCurl}" + "-DWITH_TAGLIB=${optionOnOff enableTaglib}" + "-DWITH_MAGIC=${optionOnOff enableLibmagic}" + "-DWITH_MATROSKA=${optionOnOff enableLibmatroska}" + "-DWITH_AVCODEC=${optionOnOff enableAvcodec}" + "-DWITH_EXIF=${optionOnOff enableLibexif}" + "-DWITH_EXIV2=${optionOnOff enableExiv2}" + "-DWITH_FFMPEGTHUMBNAILER=${optionOnOff enableFFmpegThumbnailer}" + "-DWITH_INOTIFY=${optionOnOff enableInotifyTools}" + # systemd service will be generated alongside the service + "-DWITH_SYSTEMD=OFF" + ]; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + libupnp libuuid pugixml libiconv sqlite zlib fmt.dev + spdlog + ] + ++ optionals enableDuktape [ pkgs.duktape ] + ++ optionals enableCurl [ pkgs.curl ] + ++ optionals enableTaglib [ pkgs.taglib ] + ++ optionals enableLibmagic [ pkgs.file ] + ++ optionals enableLibmatroska [ pkgs.libmatroska pkgs.libebml ] + ++ optionals enableAvcodec [ pkgs.libav.dev ] + ++ optionals enableLibexif [ pkgs.libexif ] + ++ optionals enableExiv2 [ pkgs.exiv2 ] + ++ optionals enableInotifyTools [ pkgs.inotify-tools ] + ++ optionals enableFFmpegThumbnailer [ pkgs.ffmpegthumbnailer ]; + + + meta = with stdenv.lib; { + homepage = https://docs.gerbera.io/; + description = "UPnP Media Server for 2020"; + longDescription = '' + Gerbera is a Mediatomb fork. + It allows to stream your digital media through your home network and consume it on all kinds + of UPnP supporting devices. + ''; + license = licenses.gpl2; + maintainers = [ maintainers.ardumont ]; + platforms = platforms.linux; + }; +} 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 3342c488c9..21fe6e0d00 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,15 +2,15 @@ # Do not edit! { - version = "0.114.4"; + version = "0.115.6"; components = { - "abode" = ps: with ps; [ ]; # missing inputs: abodepy + "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ ]; # missing inputs: accuweather "acer_projector" = ps: with ps; [ pyserial ]; "acmeda" = ps: with ps; [ ]; # missing inputs: aiopulse "actiontec" = ps: with ps; [ ]; - "adguard" = ps: with ps; [ ]; # missing inputs: adguardhome - "ads" = ps: with ps; [ ]; # missing inputs: pyads + "adguard" = ps: with ps; [ adguardhome ]; + "ads" = ps: with ps; [ pyads ]; "aftership" = ps: with ps; [ ]; # missing inputs: pyaftership "agent_dvr" = ps: with ps; [ ]; # missing inputs: agent-py "air_quality" = ps: with ps; [ ]; @@ -29,7 +29,7 @@ "amcrest" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: amcrest "ampio" = ps: with ps; [ ]; # missing inputs: asmog "android_ip_webcam" = ps: with ps; [ ]; # missing inputs: pydroid-ipcam - "androidtv" = ps: with ps; [ ]; # missing inputs: adb-shell[async] androidtv[async] pure-python-adb + "androidtv" = ps: with ps; [ adb-shell androidtv pure-python-adb ]; "anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant "anthemav" = ps: with ps; [ ]; # missing inputs: anthemav "apache_kafka" = ps: with ps; [ aiokafka ]; @@ -107,7 +107,7 @@ "calendar" = ps: with ps; [ aiohttp-cors ]; "camera" = ps: with ps; [ aiohttp-cors ]; "canary" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: py-canary - "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa PyChromecast zeroconf ]; + "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen PyChromecast zeroconf ]; "cert_expiry" = ps: with ps; [ ]; "channels" = ps: with ps; [ ]; # missing inputs: pychannels "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook @@ -134,7 +134,7 @@ "configurator" = ps: with ps; [ ]; "control4" = ps: with ps; [ ]; # missing inputs: pyControl4 "conversation" = ps: with ps; [ aiohttp-cors ]; - "coolmaster" = ps: with ps; [ ]; # missing inputs: pycoolmasternet + "coolmaster" = ps: with ps; [ ]; # missing inputs: pycoolmasternet-async "coronavirus" = ps: with ps; [ ]; # missing inputs: coronavirus "counter" = ps: with ps; [ ]; "cover" = ps: with ps; [ ]; @@ -152,7 +152,7 @@ "deconz" = ps: with ps; [ ]; # missing inputs: pydeconz "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi - "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco sqlalchemy zeroconf ]; # missing inputs: home-assistant-frontend + "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco pillow sqlalchemy zeroconf ]; # missing inputs: home-assistant-frontend "delijn" = ps: with ps; [ ]; # missing inputs: pydelijn "deluge" = ps: with ps; [ deluge-client ]; "demo" = ps: with ps; [ aiohttp-cors ]; @@ -161,7 +161,7 @@ "derivative" = ps: with ps; [ ]; "deutsche_bahn" = ps: with ps; [ ]; # missing inputs: schiene "device_automation" = ps: with ps; [ ]; - "device_sun_light_trigger" = ps: with ps; [ ]; + "device_sun_light_trigger" = ps: with ps; [ aiohttp-cors pillow ]; "device_tracker" = ps: with ps; [ ]; "devolo_home_control" = ps: with ps; [ ]; # missing inputs: devolo-home-control-api "dexcom" = ps: with ps; [ ]; # missing inputs: pydexcom @@ -189,10 +189,11 @@ "dublin_bus_transport" = ps: with ps; [ ]; "duckdns" = ps: with ps; [ ]; "dunehd" = ps: with ps; [ ]; # missing inputs: pdunehd - "dwd_weather_warnings" = ps: with ps; [ jsonpath xmltodict ]; + "dwd_weather_warnings" = ps: with ps; [ ]; # missing inputs: dwdwfsapi "dweet" = ps: with ps; [ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices "dyson" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: libpurecool + "eafm" = ps: with ps; [ ]; # missing inputs: aioeafm "ebox" = ps: with ps; [ ]; # missing inputs: pyebox "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy "ecoal_boiler" = ps: with ps; [ ]; # missing inputs: ecoaliface @@ -214,6 +215,7 @@ "emoncms" = ps: with ps; [ ]; "emoncms_history" = ps: with ps; [ ]; "emulated_hue" = ps: with ps; [ aiohttp-cors ]; + "emulated_kasa" = ps: with ps; [ ]; # missing inputs: sense_energy "emulated_roku" = ps: with ps; [ ]; # missing inputs: emulated_roku "enigma2" = ps: with ps; [ openwebifpy ]; "enocean" = ps: with ps; [ ]; # missing inputs: enocean @@ -226,7 +228,7 @@ "epson" = ps: with ps; [ ]; # missing inputs: epson-projector "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter "eq3btsmart" = ps: with ps; [ construct ]; # missing inputs: python-eq3bt - "esphome" = ps: with ps; [ aioesphomeapi ]; + "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors zeroconf ]; "essent" = ps: with ps; [ ]; # missing inputs: PyEssent "etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api "eufy" = ps: with ps; [ ]; # missing inputs: lakeside @@ -256,6 +258,7 @@ "flexit" = ps: with ps; [ ]; # missing inputs: pyflexit pymodbus "flic" = ps: with ps; [ ]; # missing inputs: pyflic-homeassistant "flick_electric" = ps: with ps; [ ]; # missing inputs: PyFlick + "flo" = ps: with ps; [ ]; # missing inputs: aioflo "flock" = ps: with ps; [ ]; "flume" = ps: with ps; [ ]; # missing inputs: pyflume "flunearyou" = ps: with ps; [ ]; # missing inputs: pyflunearyou @@ -276,7 +279,7 @@ "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; "fronius" = ps: with ps; [ ]; # missing inputs: pyfronius - "frontend" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend + "frontend" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend "frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi "futurenow" = ps: with ps; [ ]; # missing inputs: pyfnip "garadget" = ps: with ps; [ ]; @@ -326,7 +329,7 @@ "hangouts" = ps: with ps; [ ]; # missing inputs: hangups "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr "harmony" = ps: with ps; [ aioharmony ]; - "hassio" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend + "hassio" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend "haveibeenpwned" = ps: with ps; [ ]; "hddtemp" = ps: with ps; [ ]; "hdmi_cec" = ps: with ps; [ ]; # missing inputs: pyCEC @@ -344,7 +347,7 @@ "home_connect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: homeconnect "homeassistant" = ps: with ps; [ ]; "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg zeroconf ]; # missing inputs: PyTurboJPEG base36 fnvhash - "homekit_controller" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: aiohomekit[IP] + "homekit_controller" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: aiohomekit "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip "homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks @@ -371,6 +374,7 @@ "iglo" = ps: with ps; [ ]; # missing inputs: iglo "ign_sismologia" = ps: with ps; [ ]; # missing inputs: georss_ign_sismologia_client "ihc" = ps: with ps; [ defusedxml ]; # missing inputs: ihcsdk + "image" = ps: with ps; [ aiohttp-cors pillow ]; "image_processing" = ps: with ps; [ aiohttp-cors ]; "imap" = ps: with ps; [ ]; # missing inputs: aioimaplib "imap_email_content" = ps: with ps; [ ]; @@ -408,11 +412,11 @@ "keenetic_ndms2" = ps: with ps; [ ]; # missing inputs: ndms2_client "kef" = ps: with ps; [ getmac ]; # missing inputs: aiokef "keyboard" = ps: with ps; [ ]; # missing inputs: pyuserinput - "keyboard_remote" = ps: with ps; [ evdev ]; # missing inputs: aionotify + "keyboard_remote" = ps: with ps; [ aionotify evdev ]; "kira" = ps: with ps; [ ]; # missing inputs: pykira "kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client "knx" = ps: with ps; [ ]; # missing inputs: xknx - "kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ]; + "kodi" = ps: with ps; [ ]; # missing inputs: pykodi "konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected "kwb" = ps: with ps; [ ]; # missing inputs: pykwb "lacrosse" = ps: with ps; [ ]; # missing inputs: pylacrosse @@ -440,7 +444,7 @@ "local_ip" = ps: with ps; [ ]; "locative" = ps: with ps; [ aiohttp-cors ]; "lock" = ps: with ps; [ ]; - "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ]; # missing inputs: home-assistant-frontend + "logbook" = ps: with ps; [ aiohttp-cors pillow sqlalchemy ]; # missing inputs: home-assistant-frontend "logentries" = ps: with ps; [ ]; "logger" = ps: with ps; [ ]; "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg ]; # missing inputs: logi_circle @@ -460,7 +464,7 @@ "mailgun" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymailgunner "manual" = ps: with ps; [ ]; "manual_mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; - "map" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend + "map" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend "marytts" = ps: with ps; [ ]; # missing inputs: speak2mary "mastodon" = ps: with ps; [ ]; # missing inputs: Mastodon.py "matrix" = ps: with ps; [ matrix-client ]; @@ -468,6 +472,7 @@ "mcp23017" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-blinka adafruit-circuitpython-mcp230xx "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ]; "media_player" = ps: with ps; [ aiohttp-cors ]; + "media_source" = ps: with ps; [ aiohttp-cors ]; "mediaroom" = ps: with ps; [ ]; # missing inputs: pymediaroom "melcloud" = ps: with ps; [ ]; # missing inputs: pymelcloud "melissa" = ps: with ps; [ ]; # missing inputs: py-melissa-climate @@ -491,7 +496,7 @@ "minio" = ps: with ps; [ minio ]; "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt "mjpeg" = ps: with ps; [ ]; - "mobile_app" = ps: with ps; [ pynacl aiohttp-cors emoji hass-nabucasa ]; + "mobile_app" = ps: with ps; [ pynacl aiohttp-cors emoji hass-nabucasa pillow ]; "mochad" = ps: with ps; [ ]; # missing inputs: pymochad "modbus" = ps: with ps; [ ]; # missing inputs: pymodbus "modem_callerid" = ps: with ps; [ ]; # missing inputs: basicmodem @@ -521,7 +526,7 @@ "nederlandse_spoorwegen" = ps: with ps; [ ]; # missing inputs: nsapi "nello" = ps: with ps; [ ]; # missing inputs: pynello "ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient - "nest" = ps: with ps; [ ]; # missing inputs: python-nest + "nest" = ps: with ps; [ python-nest ]; "netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo ]; "netdata" = ps: with ps; [ ]; # missing inputs: netdata "netgear" = ps: with ps; [ ]; # missing inputs: pynetgear @@ -532,13 +537,14 @@ "nextbus" = ps: with ps; [ ]; # missing inputs: py_nextbusnext "nextcloud" = ps: with ps; [ ]; # missing inputs: nextcloudmonitor "nfandroidtv" = ps: with ps; [ ]; + "nightscout" = ps: with ps; [ ]; # missing inputs: py-nightscout "niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control "nilu" = ps: with ps; [ ]; # missing inputs: niluclient "nissan_leaf" = ps: with ps; [ ]; # missing inputs: pycarwings2 "nmap_tracker" = ps: with ps; [ getmac ]; # missing inputs: python-nmap "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail "no_ip" = ps: with ps; [ ]; - "noaa_tides" = ps: with ps; [ ]; # missing inputs: py_noaa + "noaa_tides" = ps: with ps; [ ]; # missing inputs: noaa-coops "norway_air" = ps: with ps; [ pymetno ]; "notify" = ps: with ps; [ ]; "notify_events" = ps: with ps; [ ]; # missing inputs: notify-events @@ -559,7 +565,7 @@ "oem" = ps: with ps; [ ]; # missing inputs: oemthermostat "ohmconnect" = ps: with ps; [ defusedxml ]; "ombi" = ps: with ps; [ ]; # missing inputs: pyombi - "onboarding" = ps: with ps; [ aiohttp-cors ]; + "onboarding" = ps: with ps; [ aiohttp-cors pillow ]; "onewire" = ps: with ps; [ ]; # missing inputs: pyownet "onkyo" = ps: with ps; [ onkyo-eiscp ]; "onvif" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: WSDiscovery onvif-zeep-async @@ -590,19 +596,19 @@ "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera "pandora" = ps: with ps; [ pexpect ]; - "panel_custom" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend - "panel_iframe" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend + "panel_custom" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend + "panel_iframe" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend "pcal9535a" = ps: with ps; [ ]; # missing inputs: pcal9535a "pencom" = ps: with ps; [ ]; # missing inputs: pencompy "persistent_notification" = ps: with ps; [ ]; - "person" = ps: with ps; [ ]; + "person" = ps: with ps; [ aiohttp-cors pillow ]; "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 "pilight" = ps: with ps; [ ]; # missing inputs: pilight - "ping" = ps: with ps; [ ]; + "ping" = ps: with ps; [ ]; # missing inputs: icmplib "pioneer" = ps: with ps; [ ]; "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 "plaato" = ps: with ps; [ aiohttp-cors ]; @@ -614,7 +620,7 @@ "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint "poolsense" = ps: with ps; [ ]; # missing inputs: poolsense "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall - "prezzibenzina" = ps: with ps; [ ]; # missing inputs: prezzibenzina-py + "progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ]; "prowl" = ps: with ps; [ ]; @@ -664,10 +670,12 @@ "rfxtrx" = ps: with ps; [ ]; # missing inputs: pyRFXtrx "ring" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: ring_doorbell "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api + "risco" = ps: with ps; [ ]; # missing inputs: pyrisco "rmvtransport" = ps: with ps; [ PyRMVtransport ]; "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "roku" = ps: with ps; [ ]; # missing inputs: rokuecp "roomba" = ps: with ps; [ ]; # missing inputs: roombapy + "roon" = ps: with ps; [ ]; # missing inputs: roonapi "route53" = ps: with ps; [ boto3 ]; "rova" = ps: with ps; [ ]; # missing inputs: rova "rpi_camera" = ps: with ps; [ ]; @@ -680,7 +688,7 @@ "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: pysabnzbd - "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: home-assistant-frontend + "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa pillow ]; # missing inputs: home-assistant-frontend "saj" = ps: with ps; [ ]; # missing inputs: pysaj "salt" = ps: with ps; [ ]; # missing inputs: saltbox "samsungtv" = ps: with ps; [ samsungctl samsungtvws ]; @@ -703,7 +711,9 @@ "sesame" = ps: with ps; [ ]; # missing inputs: pysesame2 "seven_segments" = ps: with ps; [ pillow ]; "seventeentrack" = ps: with ps; [ ]; # missing inputs: py17track + "sharkiq" = ps: with ps; [ ]; # missing inputs: sharkiqpy "shell_command" = ps: with ps; [ ]; + "shelly" = ps: with ps; [ ]; # missing inputs: aioshelly "shiftr" = ps: with ps; [ paho-mqtt ]; "shodan" = ps: with ps; [ shodan ]; "shopping_list" = ps: with ps; [ aiohttp-cors ]; @@ -724,6 +734,7 @@ "slide" = ps: with ps; [ ]; # missing inputs: goslide-api "sma" = ps: with ps; [ ]; # missing inputs: pysma "smappee" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pysmappee + "smart_meter_texas" = ps: with ps; [ ]; # missing inputs: smart-meter-texas "smarthab" = ps: with ps; [ ]; # missing inputs: smarthab "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: pysmartapp pysmartthings "smarty" = ps: with ps; [ ]; # missing inputs: pysmarty @@ -771,7 +782,7 @@ "suez_water" = ps: with ps; [ ]; # missing inputs: pysuez "sun" = ps: with ps; [ ]; "supervisord" = ps: with ps; [ ]; - "supla" = ps: with ps; [ ]; # missing inputs: pysupla + "supla" = ps: with ps; [ ]; # missing inputs: asyncpysupla "surepetcare" = ps: with ps; [ ]; # missing inputs: surepy "swiss_hydrological_data" = ps: with ps; [ ]; # missing inputs: swisshydrodata "swiss_public_transport" = ps: with ps; [ ]; # missing inputs: python_opendata_transport @@ -790,6 +801,7 @@ "system_log" = ps: with ps; [ aiohttp-cors ]; "systemmonitor" = ps: with ps; [ psutil ]; "tado" = ps: with ps; [ ]; # missing inputs: python-tado + "tag" = ps: with ps; [ ]; "tahoma" = ps: with ps; [ ]; # missing inputs: tahoma-api "tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility "tankerkoenig" = ps: with ps; [ ]; # missing inputs: pytankerkoenig @@ -805,7 +817,7 @@ "telnet" = ps: with ps; [ ]; "temper" = ps: with ps; [ ]; # missing inputs: temperusb "template" = ps: with ps; [ ]; - "tensorflow" = ps: with ps; [ numpy pillow protobuf ]; # missing inputs: pycocotools tensorflow tf-models-official tf-slim + "tensorflow" = ps: with ps; [ numpy pillow tensorflow-build_2 ]; # missing inputs: pycocotools tf-models-official "tesla" = ps: with ps; [ ]; # missing inputs: teslajsonpy "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac "thermoworks_smoke" = ps: with ps; [ stringcase ]; # missing inputs: thermoworks_smoke @@ -904,6 +916,7 @@ "wemo" = ps: with ps; [ ]; # missing inputs: pywemo "whois" = ps: with ps; [ ]; # missing inputs: python-whois "wiffi" = ps: with ps; [ ]; # missing inputs: wiffi + "wilight" = ps: with ps; [ ]; # missing inputs: pywilight "wink" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pubnubsub-handler python-wink "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ aiohttp-cors ]; # missing inputs: withings-api @@ -931,18 +944,17 @@ "yamaha_musiccast" = ps: with ps; [ ]; # missing inputs: pymusiccast "yandex_transport" = ps: with ps; [ ]; # missing inputs: aioymaps "yandextts" = ps: with ps; [ ]; - "yeelight" = ps: with ps; [ aiohttp-cors netdisco yeelight zeroconf ]; + "yeelight" = ps: with ps; [ yeelight ]; "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower "yessssms" = ps: with ps; [ ]; # missing inputs: YesssSMS "yi" = ps: with ps; [ aioftp ha-ffmpeg ]; - "yr" = ps: with ps; [ xmltodict ]; "zabbix" = ps: with ps; [ ]; # missing inputs: pyzabbix "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; "zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc "zestimate" = ps: with ps; [ xmltodict ]; - "zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy ]; + "zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy ]; # missing inputs: zigpy-znp "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl "zone" = ps: with ps; [ ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 17ce095e39..92fb7dffd2 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -68,7 +68,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.114.4"; + hassVersion = "0.115.6"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -78,6 +78,7 @@ in with py.pkgs; buildPythonApplication rec { patches = [ ./relax-dependencies.patch + ./fix-media-path-test.patch ]; inherit availableComponents; @@ -87,7 +88,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "0k9px4ny0b72d9ysr3x72idprgfgjab1z91ildr87629826bb4n7"; + sha256 = "07j54glcpa5ngkr0pwdg44f8gas3jz3nh653mr5sb5wg7xspgcr8"; }; postPatch = '' @@ -100,8 +101,8 @@ in with py.pkgs; buildPythonApplication rec { aiohttp astral async-timeout attrs bcrypt certifi importlib-metadata jinja2 pyjwt cryptography pip python-slugify pytz pyyaml requests ruamel_yaml setuptools voluptuous voluptuous-serialize - # From http, frontend and recorder components and auth.mfa_modules.totp - sqlalchemy aiohttp-cors hass-frontend pyotp pyqrcode ciso8601 + # From frontend, image, http and recorder components and auth.mfa_modules.totp + sqlalchemy aiohttp-cors hass-frontend pillow pyotp pyqrcode ciso8601 ] ++ componentBuildInputs ++ extraBuildInputs; # upstream only tests on Linux, so do we. @@ -112,6 +113,9 @@ in with py.pkgs; buildPythonApplication rec { ]; checkPhase = '' + # the tests require the existance of a media dir + mkdir /build/media + # - components' dependencies are not included, so they cannot be tested # - test_merge_id_schema requires pyqwikswitch # - test_loader.py tries to load not-packaged dependencies diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/fix-media-path-test.patch b/third_party/nixpkgs/pkgs/servers/home-assistant/fix-media-path-test.patch new file mode 100644 index 0000000000..558fabfe34 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/fix-media-path-test.patch @@ -0,0 +1,24 @@ +diff --git a/tests/test_config.py b/tests/test_config.py +index fb22ee1118..1b87e32fe7 100644 +--- a/tests/test_config.py ++++ b/tests/test_config.py +@@ -440,7 +440,7 @@ async def test_loading_configuration(hass): + "allowlist_external_dirs": "/etc", + "external_url": "https://www.example.com", + "internal_url": "http://example.local", +- "media_dirs": {"mymedia": "/usr"}, ++ "media_dirs": {"mymedia": "/build/media"}, + }, + ) + +@@ -454,8 +454,8 @@ async def test_loading_configuration(hass): + assert hass.config.internal_url == "http://example.local" + assert len(hass.config.allowlist_external_dirs) == 3 + assert "/etc" in hass.config.allowlist_external_dirs +- assert "/usr" in hass.config.allowlist_external_dirs +- assert hass.config.media_dirs == {"mymedia": "/usr"} ++ assert "/build/media" in hass.config.allowlist_external_dirs ++ assert hass.config.media_dirs == {"mymedia": "/build/media"} + assert hass.config.config_source == config_util.SOURCE_YAML + + diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix index 5c7227dc4e..493c1a4410 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 = "20200811.0"; + version = "20200918.2"; src = fetchPypi { inherit pname version; - sha256 = "0nrvfr4mw7h9py27hkak201jsfrvyxlgswfnda1l7k9ns9y4lpj8"; + sha256 = "1gmk5rbfyqanj30dinfphxrsji4l1yiya2p0ahybyjb9fbzz9cl4"; }; # no Python tests implemented diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/test-timeout.patch b/third_party/nixpkgs/pkgs/servers/home-assistant/test-timeout.patch deleted file mode 100644 index 01b0edae1d..0000000000 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/test-timeout.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/test_core.py b/tests/test_core.py -index a63f42af61..04b333868b 100644 ---- a/tests/test_core.py -+++ b/tests/test_core.py -@@ -1432,7 +1432,7 @@ async def test_chained_logging_hits_log_timeout(hass, caplog): - async def _task_chain_2(): - nonlocal created - created += 1 -- if created > 10: -+ if created > 1000: - return - hass.async_create_task(_task_chain_1()) - diff --git a/third_party/nixpkgs/pkgs/servers/http/jboss/default.nix b/third_party/nixpkgs/pkgs/servers/http/jboss/default.nix index b470a127ae..00ed93c860 100644 --- a/third_party/nixpkgs/pkgs/servers/http/jboss/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/jboss/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation { buildInputs = [ unzip ]; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - + installPhase = '' mv $PWD $out find $out/bin -name \*.sh -print0 | xargs -0 sed -i -e '/#!\/bin\/sh/aJAVA_HOME=${jdk}' ''; - + meta = with stdenv.lib; { - homepage = "http://www.jboss.org/"; + homepage = "https://www.jboss.org/"; description = "Open Source J2EE application server"; license = licenses.lgpl21; maintainers = [ maintainers.sander ]; diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix index de74a72e78..934506c45c 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.19.2"; - sha256 = "0wr4ss4gld7x717m4j3a6l6f7ijblrrd55y563lkwhvr7sqpn7vw"; + version = "1.19.3"; + sha256 = "1w4dkq7bl5gyix3x0ap3d9lndh7zyvc3mscl693d4ybql57vgrci"; } diff --git a/third_party/nixpkgs/pkgs/servers/kapow/default.nix b/third_party/nixpkgs/pkgs/servers/kapowbang/default.nix similarity index 93% rename from third_party/nixpkgs/pkgs/servers/kapow/default.nix rename to third_party/nixpkgs/pkgs/servers/kapowbang/default.nix index 520af62576..27c5feb0d8 100644 --- a/third_party/nixpkgs/pkgs/servers/kapow/default.nix +++ b/third_party/nixpkgs/pkgs/servers/kapowbang/default.nix @@ -1,14 +1,14 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { - pname = "kapow"; + pname = "kapowbang"; version = "0.5.4"; subPackages = [ "." ]; src = fetchFromGitHub { owner = "BBVA"; - repo = pname; + repo = "kapow"; rev = "v${version}"; sha256 = "09qr631vzlgibz6q64f35lqzz9h1g3gxqfbapkrci5i0n3h04yr4"; }; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix index cc4447914c..8ac43f0181 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.19.3"; + version = "1.20.1"; src = fetchPypi { inherit pname version; - sha256 = "1r63gw9a4n2sd3520zadpn05zxfk45nqrgwxp3zky5nkyrh4qbys"; + sha256 = "1sf36vwvy2f9jy6dldq6gqfmh60384i5j64s7yc131b4dp0n7lcw"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 975c092251..ed9c579d9c 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -25,6 +25,12 @@ buildGoModule rec { --replace 'var version = "5.0.0"' 'var version = "${version}"' ''; + # fixes build failure with go 1.15: + # main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go + preBuild = '' + rm -rf scripts/go + ''; + postInstall = '' tar -xvf $srcStatic mkdir -p $out/share/grafana 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 bb8f8526a3..95908e8b6a 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -1,19 +1,17 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles, nixosTests }: +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: -buildGoPackage { +buildGoModule { pname = "mailexporter"; - version = "2019-07-14"; - - goPackagePath = "github.com/cherti/mailexporter"; + version = "2020-07-16"; src = fetchFromGitHub { - rev = "c60d1970abbedb15e70d6fc858f7fd76fa061ffe"; owner = "cherti"; repo = "mailexporter"; - sha256 = "0wlw7jvmhgvg1r2bsifxm2d0vj0iqhplnx6n446625sslvddx3vn"; + rev = "f5a552c736ac40ccdc0110d2e9a71619c1cd6862"; + sha256 = "0y7sg9qrd7q6g5gi65sjvw6byfmk2ph0a281wjc9cr4pd25xkciz"; }; - goDeps = ./mail-exporter_deps.nix; + vendorSha256 = "1hwahk8v3qnmyn6bwk9l2zpr0k7p2w7zjzxmjwgjyx429g9rzqs0"; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter_deps.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter_deps.nix deleted file mode 100644 index 221f179940..0000000000 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter_deps.nix +++ /dev/null @@ -1,92 +0,0 @@ -[ - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "4b2b341e8d7715fae06375aa633dbb6e91b3fb46"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c182affec369e30f25d3eb8cd8a478dee585ae7d"; - sha256 = "1xqsf9vpcrd4hp95rl6kgmjvkv1df4aicfw4l5vfcxcwxknfx2xs"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "a6c69798cccecfd43070693e4416838767f73e18"; - sha256 = "0s6xprvkdyfvmx4540454972fn3gvrzy7fyv0yq42h32nw3l7p75"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fd36f4220a901265f90734c3183c5f0c91daa0b8"; - sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "31bed53e4047fd6c510e43a941f90cb31be0972a"; - sha256 = "1q16br348117ffycxdwsldb0i39p34miclfa8z93k6vjwnrqbh2l"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "8f55e607908ea781ad9d08521730d73e047d9ac4"; - sha256 = "023581b68mz89yhgnk4w08ch05ix60v0hv9jlqz65w43s4j7g4vb"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "04f50cda93cbb67f2afa353c52f342100e80e625"; - sha256 = "0hmfsz9y1ingwsn482hlzzmzs7kr3cklm0ana0mbdk70isw2bxnw"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/timescale-prometheus/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix similarity index 63% rename from third_party/nixpkgs/pkgs/servers/monitoring/timescale-prometheus/default.nix rename to third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix index 6a0383610e..71ffd67f17 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/timescale-prometheus/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix @@ -4,8 +4,8 @@ }: buildGoModule rec { - pname = "timescale-prometheus"; - version = "0.1.0-beta.4"; + pname = "promscale"; + version = "0.1.0-beta.5"; src = fetchFromGitHub { owner = "timescale"; @@ -16,13 +16,13 @@ buildGoModule rec { vendorSha256 = "sha256:0y5rq2y48kf2z1z3a8ags6rqzfvjs54klk2679fk8x0yjamj5x04"; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/timescale-prometheus/pkg/version.Version=${version} -X github.com/timescale/timescale-prometheus/pkg/version.CommitHash=${src.rev}" ]; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/promscale/pkg/version.Version=${version} -X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ]; doCheck = false; meta = with stdenv.lib; { description = "An open-source analytical platform for Prometheus metrics"; - homepage = "https://github.com/timescale/timescale-prometheus"; + homepage = "https://github.com/timescale/promscale"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ _0x4A6F ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/riemann/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/riemann/default.nix index 644af1492c..d993e1a08a 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/riemann/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/riemann/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "riemann"; - version = "0.3.5"; + version = "0.3.6"; src = fetchurl { url = "https://github.com/riemann/riemann/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1d7v2lg1b7z6v0qckq70nzqpqcs90v29laizsf8ghyj113ips3rc"; + sha256 = "0hz69rka4f9h8i8cnswfz80fs0nm7j5436iiyd5i8lzd2avj4bps"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix index 1b4e46b8f0..8e6800f48f 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "1y3jaj1sxbn9m1c2rihjw229qx4q35l8l70xiny34qhmpzp6y00p"; + sha256 = "099waxv4p6jq2nimc3ql80j8ikhbzqwr2470x8m96x5kcirmz8nl"; }; - vendorSha256 = "0ixriy5i1qc8hnslmiyd3qfw1g14zlmcslqwn2a9fpk7h0hwinba"; + vendorSha256 = "0vfl6bra6487vzv0hd1pnkq7888m4ddn12q69gcm6a7w1z5wvj5b"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/mpd/default.nix b/third_party/nixpkgs/pkgs/servers/mpd/default.nix index d013f43189..e52e3ee664 100644 --- a/third_party/nixpkgs/pkgs/servers/mpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mpd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost, darwin # Inputs -, curl, libmms, libnfs, samba +, curl, libmms, libnfs, liburing, samba # Archive support , bzip2, zziplib # Codecs @@ -30,6 +30,7 @@ let lib = stdenv.lib; + concatAttrVals = nameList: set: lib.concatMap (x: set.${x} or []) nameList; featureDependencies = { # Storage plugins @@ -37,6 +38,7 @@ let webdav = [ curl expat ]; # Input plugins curl = [ curl ]; + io_uring = [ liburing ]; mms = [ libmms ]; nfs = [ libnfs ]; smbclient = [ samba ]; @@ -85,15 +87,19 @@ let zeroconf = [ avahi dbus ]; }; + nativeFeatureDependencies = { + documentation = [ doxygen python3Packages.sphinx ]; + }; + run = { features ? null }: let # Disable platform specific features if needed # using libmad to decode mp3 files on darwin is causing a segfault -- there # is probably a solution, but I'm disabling it for now platformMask = lib.optionals stdenv.isDarwin [ "mad" "pulse" "jack" "nfs" "smbclient" ] - ++ lib.optionals (!stdenv.isLinux) [ "alsa" "systemd" "syslog" ]; + ++ lib.optionals (!stdenv.isLinux) [ "alsa" "io_uring" "systemd" "syslog" ]; - knownFeatures = builtins.attrNames featureDependencies; + knownFeatures = builtins.attrNames featureDependencies ++ builtins.attrNames nativeFeatureDependencies; platformFeatures = lib.subtractLists platformMask knownFeatures; features_ = if (features == null ) @@ -110,13 +116,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.21.25"; + version = "0.22"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "1yjp8pwr2zn0mp39ls1w0pl37zrjn5m9ycgjmcsw2wpa4709r356"; + sha256 = "1lsi4fgrarabkahfhf5zbmppg7jba7m362gxyqhv54hmqprl1qff"; }; buildInputs = [ @@ -128,16 +134,15 @@ let # Run-time dependency GTest found: YES 1.10.0 gtest ] - ++ (lib.concatLists (lib.attrVals features_ featureDependencies)) + ++ concatAttrVals features_ featureDependencies ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AudioToolbox darwin.apple_sdk.frameworks.AudioUnit ]; nativeBuildInputs = [ meson ninja pkg-config - python3Packages.sphinx - doxygen - ]; + ] + ++ concatAttrVals features_ nativeFeatureDependencies; # Otherwise, the meson log says: # @@ -153,10 +158,9 @@ let outputs = [ "out" "doc" "man" ]; mesonFlags = [ - # Documentation is enabled unconditionally but it's not installed - # unconditionally thanks to the outputs being split - "-Ddocumentation=true" "-Dtest=true" + "-Dmanpages=true" + "-Dhtml_manual=true" ] ++ map (x: "-D${x}=enabled") features_ ++ map (x: "-D${x}=disabled") (lib.subtractLists features_ knownFeatures) @@ -193,7 +197,7 @@ in "yajl" "sqlite" "soundcloud" "qobuz" "tidal" ] ++ lib.optionals stdenv.isLinux [ - "alsa" "systemd" "syslog" + "alsa" "systemd" "syslog" "io_uring" ] ++ lib.optionals (!stdenv.isDarwin) [ "mad" "jack" "nfs" ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix index a6fcf63279..fa17e10da7 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -27,18 +27,31 @@ let }; }; in { - nextcloud17 = generic { - version = "17.0.6"; - sha256 = "0qq7lkgzsn1zakfym5bjqzpcisxmgfcdd927ddqlhddy3zvgxrxx"; - }; + nextcloud17 = throw '' + Nextcloud v17 has been removed from `nixpkgs` as the support for it will be dropped + by upstream within the lifetime of NixOS 20.09[1]. Please upgrade to Nextcloud v18 by + declaring + + services.nextcloud.package = pkgs.nextcloud18; + + in your NixOS config. + + [1] https://docs.nextcloud.com/server/18/admin_manual/release_schedule.html + ''; nextcloud18 = generic { - version = "18.0.7"; - sha256 = "0pka87ccrds17n6n5w5a80mc1s5yrf8d4mf6wsfaypwjbm3wfb2b"; + version = "18.0.9"; + sha256 = "0rigg5pv2vnxgmjznlvxfc41s00raxa8jhib5vsznhj55qn99jm1"; + insecure = true; }; nextcloud19 = generic { - version = "19.0.1"; - sha256 = "0bavwvjjgx62i150wqh4gqavjva3mnhx6k3im79ib6ck1ph13wsf"; + version = "19.0.3"; + sha256 = "0sc9cnsdh8kj60h7i3knh40ngdz1w1wmdqw2v2axfkmax22kjl7w"; + }; + + nextcloud20 = generic { + version = "20.0.0"; + sha256 = "1n2cv1i56g6qpzkbl5xaf420zzr4y7isg0lskmr7ymk83way0wx2"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix index b41861768d..a6c3e4c60d 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix @@ -1,20 +1,22 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "VictoriaMetrics"; - version = "1.40.0"; + version = "1.42.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0dnzc7yrd91g67wkx0g1b0gi7918pi1hqv4mjlxi2ccs8phxkk7l"; + sha256 = "10da15i3rn11dxnh82czaa2f9a4c3vf1d8kgfayp0dl7xs1xqhsd"; }; goPackagePath = "github.com/VictoriaMetrics/VictoriaMetrics"; buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/lib/buildinfo.Version=${version}" ]; + passthru.tests = { inherit (nixosTests) victoriametrics; }; + meta = with lib; { homepage = "https://victoriametrics.com/"; description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus"; diff --git a/third_party/nixpkgs/pkgs/servers/roundcube/default.nix b/third_party/nixpkgs/pkgs/servers/roundcube/default.nix index d46972eae2..98ce4f25a2 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.8"; + version = "1.4.9"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "0jkas28k7px95sm3zix86ggraxc9vyy66271sgpr2wrmbg2r056r"; + sha256 = "1cpcr3abjq1f2af0ca571y976yni48z3rh3x146c6ninl5ip9b4z"; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix index 7ed1a72de0..bfc8566f36 100644 --- a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix +++ b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix @@ -42,11 +42,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.12.5"; + version = "4.12.6"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "05dqj5l3spa8ggw0agxa5rf8fwgiizbmbfjms46y5jla6z31rd2l"; + sha256 = "1v3cmw40csmi3jd8mhlx4bm7bk4m0426zkyin7kq11skwnsrna02"; }; outputs = [ "out" "dev" "man" ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix index e759a62c2e..bc1108ad33 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix @@ -64,7 +64,7 @@ let (if atLeast "9.6" then ./patches/hardcode-pgxs-path-96.patch else ./patches/hardcode-pgxs-path.patch) ./patches/specify_pkglibdir_at_runtime.patch ./patches/findstring.patch - ] ++ lib.optional stdenv.isLinux ./patches/socketdir-in-run.patch; + ] ++ lib.optional stdenv.isLinux (if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch); installTargets = [ "install-world" ]; @@ -144,7 +144,7 @@ let homepage = "https://www.postgresql.org"; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; - maintainers = with maintainers; [ ocharles thoughtpolice danbst globin ]; + maintainers = with maintainers; [ ocharles thoughtpolice danbst globin marsam ]; platforms = platforms.unix; knownVulnerabilities = optional (!atLeast "9.4") "PostgreSQL versions older than 9.4 are not maintained anymore!"; @@ -221,4 +221,12 @@ in self: { inherit self; }; + postgresql_13 = self.callPackage generic { + version = "13.0"; + psqlSchema = "13"; + sha256 = "15i2b7m9a9430idqdgvrcyx66cpxz0v2d81nfqcm8ss3inz51rw0"; + this = self.postgresql_13; + inherit self; + }; + } diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_repack.nix index aeaff17889..f197bef546 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_repack"; - version = "1.4.5"; + version = "1.4.6"; buildInputs = [ postgresql openssl zlib readline ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "reorg"; repo = "pg_repack"; rev = "refs/tags/ver_${version}"; - sha256 = "1qsya9h4r147mkl7jzh4qk7ciyr3hj6gv7rfh4zml9zav0pjj76x"; + sha256 = "01n320cvn0z48ac4mbclpbzspdraaqzzw4xdcns7fj33vqq8nqm7"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index 70b8dd3092..478b27b74f 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/tds_fdw.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "tds_fdw"; - version = "2.0.1"; + version = "2.0.2"; buildInputs = [ postgresql freetds ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "tds-fdw"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "1zpcrx30bvaf72782hgz2s19i5ndwvi7z87fanl1lnymznrk9lzg"; + sha256 = "024syj21gmdfkpr51l8ca70n5jimr35zwdy719b8h4zjn64ci1fk"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/patches/socketdir-in-run-13.patch b/third_party/nixpkgs/pkgs/servers/sql/postgresql/patches/socketdir-in-run-13.patch new file mode 100644 index 0000000000..72c778b075 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/patches/socketdir-in-run-13.patch @@ -0,0 +1,13 @@ +diff --git i/src/include/pg_config_manual.h w/src/include/pg_config_manual.h +index 8f3ec6bde1..4fc01e4a0a 100644 +--- i/src/include/pg_config_manual.h ++++ w/src/include/pg_config_manual.h +@@ -201,7 +201,7 @@ + * support them yet. + */ + #ifndef WIN32 +-#define DEFAULT_PGSOCKET_DIR "/tmp" ++#define DEFAULT_PGSOCKET_DIR "/run/postgresql" + #else + #define DEFAULT_PGSOCKET_DIR "" + #endif diff --git a/third_party/nixpkgs/pkgs/servers/tegola/default.nix b/third_party/nixpkgs/pkgs/servers/tegola/default.nix index ecb7fdd488..ec049c6b01 100644 --- a/third_party/nixpkgs/pkgs/servers/tegola/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tegola/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "tegola"; - version = "0.12.0"; + version = "0.12.1"; goPackagePath = "github.com/go-spatial/tegola"; @@ -10,11 +10,13 @@ buildGoPackage rec { owner = "go-spatial"; repo = pname; rev = "v${version}"; - sha256 = "1bm791cis6bqgvhkk6n03kdxh0y9fdkhsx4rgmv7pm3zzdd7b17r"; + sha256 = "0x8wv9xx0dafn55y0i7x43plg1blnslzj0l5047laipw7gnmfwad"; }; buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cmd/tegola/cmd.Version=${version}" ]; + excludedPackages = [ "example" ]; + meta = with stdenv.lib; { homepage = "https://www.tegola.io/"; description = "Mapbox Vector Tile server"; diff --git a/third_party/nixpkgs/pkgs/servers/traefik/default.nix b/third_party/nixpkgs/pkgs/servers/traefik/default.nix index b18530f8c0..bc0f052adc 100644 --- a/third_party/nixpkgs/pkgs/servers/traefik/default.nix +++ b/third_party/nixpkgs/pkgs/servers/traefik/default.nix @@ -1,17 +1,16 @@ -{ stdenv, buildGoModule, fetchFromGitHub, go-bindata, nixosTests }: +{ stdenv, fetchzip, buildGoModule, go-bindata, nixosTests }: buildGoModule rec { pname = "traefik"; - version = "2.2.11"; + version = "2.3.1"; - src = fetchFromGitHub { - owner = "containous"; - repo = "traefik"; - rev = "v${version}"; - sha256 = "0l93qb0kjbm5gjba0bxfyb5a0n1p54n5crhcsyzgrki4x586lan0"; + src = fetchzip { + url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; + sha256 = "09328yb6pbrikd1dljmf6spg177w1ymqk1i2152m5srd39mc6ixv"; + stripRoot = false; }; - vendorSha256 = "06x2mcyp6c1jdf5wz51prhcn071d0580322lcv3x2bxk2grx08i2"; + vendorSha256 = "026yxahwvbw41vf7yfycwmw797fpw19g1nyi1wcxkkkw383v7dsk"; doCheck = false; @@ -27,8 +26,8 @@ buildGoModule rec { CODENAME=$(awk -F "=" '/CODENAME=/ { print $2}' script/binary) buildFlagsArray+=("-ldflags=\ - -X github.com/containous/traefik/v2/pkg/version.Version=${version} \ - -X github.com/containous/traefik/v2/pkg/version.Codename=$CODENAME") + -X github.com/traefik/traefik/v2/pkg/version.Version=${version} \ + -X github.com/traefik/traefik/v2/pkg/version.Codename=$CODENAME") ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/moodle/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/moodle/default.nix index 447a27ad08..b9f11b5c17 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/moodle/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ] }: let - version = "3.9.1"; + version = "3.9.2"; stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version); in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "sha256-6QJDEInUQQSNj3kThQ65o2cT6JaRy0FrEKy+EcDMVvs="; + sha256 = "ygy9xlYs49Ga3u2Q/vqxhnDnqXsrh6YYTAtcsXF8kNo="; }; phpConfig = writeText "config.php" '' @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { "Free and open-source learning management system (LMS) written in PHP"; license = licenses.gpl3Plus; homepage = "https://moodle.org/"; - maintainers = with maintainers; [ aanderse ]; + maintainers = with maintainers; [ freezeboy ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix index e1a14ca59d..0199880934 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.4.2"; + version = "5.5.1"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "1pnl11yws2r2d5dfq0z85zcy5ilvm298bfs7h9z1sjakkwkh5sph"; + sha256 = "15cjp48q23fw8ryy39mlxi4rd3rha2yqyrnk5mhx0h72ygawx8k6"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/third_party/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 21e61bc54d..ba33623b49 100755 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -11,8 +11,7 @@ use warnings; use File::Basename; use File::Spec::Functions; - -my $tmpDir = "/tmp/xorg-unpack"; +use File::Temp; my %pkgURLs; @@ -93,8 +92,7 @@ while (<>) { $pkgHashes{$pkg} = $hash; print "\nunpacking $path\n"; - system "rm -rf '$tmpDir'"; - mkdir $tmpDir, 0700; + my $tmpDir = File::Temp->newdir(); system "cd '$tmpDir' && tar xf '$path'"; die "cannot unpack `$path'" if $? != 0; print "\n"; @@ -307,7 +305,7 @@ foreach my $pkg (sort (keys %pkgURLs)) { name = "$pkgNames{$pkg}"; builder = ./builder.sh; src = fetchurl { - url = $pkgURLs{$pkg}; + url = "$pkgURLs{$pkg}"; sha256 = "$pkgHashes{$pkg}"; }; hardeningDisable = [ "bindnow" "relro" ]; diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix index 092764a3d9..80112755e6 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix @@ -1,7 +1,7 @@ { abiCompat ? null, stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages, automake, autoconf, gettext, libiconv, libtool, intltool, - freetype, tradcpp, fontconfig, meson, ninja, ed, + freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, mcpp, epoxy, openssl, pkgconfig, llvm_6, python3, @@ -50,10 +50,6 @@ self: super: hardeningDisable = [ "format" ]; }); - fontbhttf = super.fontbhttf.overrideAttrs (attrs: { - meta = attrs.meta // { license = lib.licenses.unfreeRedistributable; }; - }); - fontmiscmisc = super.fontmiscmisc.overrideAttrs (attrs: { postInstall = '' @@ -848,4 +844,63 @@ self: super: --set XAPPLRESDIR ${placeholder "out"}/share/X11/app-defaults ''; }); + + # convert Type1 vector fonts to OpenType fonts + fontbitstreamtype1 = super.fontbitstreamtype1.overrideAttrs (attrs: { + nativeBuildInputs = attrs.nativeBuildInputs ++ [ fontforge ]; + + postBuild = '' + # convert Postscript (Type 1) font to otf + for i in $(find -type f -name '*.pfa' -o -name '*.pfb'); do + name=$(basename $i | cut -d. -f1) + fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$name.otf\")" + done + ''; + + postInstall = '' + # install the otf fonts + fontDir="$out/lib/X11/fonts/misc/" + install -D -m 644 -t "$fontDir" *.otf + mkfontscale "$fontDir" + ''; + }); + } + +# mark some packages as unfree +// ( + let + # unfree but redistributable + redist = [ + "fontadobeutopiatype1" + "fontadobeutopia100dpi" + "fontadobeutopia75dpi" + "fontbhtype1" + "fontibmtype1" + "fontbhttf" + "fontbh100dpi" + "fontbh75dpi" + ]; + + # unfree, possibly not redistributable + unfree = [ + # no license, just a copyright notice + "fontbhlucidatypewriter100dpi" + "fontbhlucidatypewriter75dpi" + "fontdaewoomisc" + + # unclear license, "permission to use"? + "fontjismisc" + ]; + + setLicense = license: name: + super.${name}.overrideAttrs (attrs: { + meta = attrs.meta // { inherit license; }; + }); + mapNamesToAttrs = f: names: with lib; + listToAttrs (zipListsWith nameValuePair names (map f names)); + + in + mapNamesToAttrs (setLicense lib.licenses.unfreeRedistributable) redist // + mapNamesToAttrs (setLicense lib.licenses.unfree) unfree +) diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix index a60025b797..e10ba1069f 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix @@ -1,4 +1,6 @@ -{ stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper, egl-wayland }: +{ stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config +, epoxy, libxslt, libunwind, makeWrapper, egl-wayland +, defaultFontPath ? "" }: with stdenv.lib; @@ -19,7 +21,7 @@ xorgserver.overrideAttrs (oldAttrs: { "--disable-xquartz" "--disable-xwin" "--enable-glamor" - "--with-default-font-path=" + "--with-default-font-path=${defaultFontPath}" "--with-xkb-bin-directory=${xkbcomp}/bin" "--with-xkb-path=${xkeyboard_config}/etc/X11/xkb" "--with-xkb-output=$(out)/share/X11/xkb/compiled" diff --git a/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix b/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix index 54c4a4c521..c9cd09bb74 100644 --- a/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix +++ b/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix @@ -15,7 +15,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.11.6"; # also update communityModules + version = "0.11.7"; # also update communityModules pname = "prosody"; # The following community modules are necessary for the nixos module # prosody module to comply with XEP-0423 and provide a working @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; - sha256 = "0m8p2kwiy4l87ifpygricpyixi1vpx6j1jb6ki1zi4az3iixp8fd"; + sha256 = "0iw73ids6lv09pg2fn0cxsm2pvi593md71xk48zbcp28advc1zr8"; }; # A note to all those merging automated updates: Please also update this @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { # version. communityModules = fetchhg { url = "https://hg.prosody.im/prosody-modules"; - rev = "e77122025080"; - sha256 = "1pjax8lzgcwcn3mq5q4kbwfyyzaifqcc3a0s4rl9gib5rhwddybh"; + rev = "7678b4880719"; + sha256 = "1rpk3jcfhsa9hl7d7y638kprs9in0ljjp1nqxg30w1689v5h85d2"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix index 09d2f6aac1..628c61db32 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , rustPlatform , openssl +, zlib , pkg-config , python3 , xorg @@ -14,35 +15,36 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "08r6f71cy4j22k0mllm134x4dfixaircpaz5arrj93xsbp38nk92"; + sha256 = "038c61605b92a97h84hlifwks0q6miv6rn7spr5h6h2nwvaqlyk6"; }; - cargoSha256 = "15kvl490abxdv6706zs7pv0q5fhghmdvlfbn19037sldkcsfl86b"; + cargoSha256 = "1vr0pqcv9gm4cwlkd06672jzz9rbm77c6j5r05waypc1lv4ln2cg"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security ] + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ xorg.libX11 ] ++ lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit ]; cargoBuildFlags = lib.optional withStableFeatures "--features stable"; - preCheck = '' - export HOME=$TMPDIR + # Remove after https://github.com/NixOS/nixpkgs/pull/97000 lands into master + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + unset SDKROOT ''; checkPhase = '' runHook preCheck echo "Running cargo test" - cargo test + HOME=$TMPDIR cargo test runHook postCheck ''; diff --git a/third_party/nixpkgs/pkgs/shells/oil/default.nix b/third_party/nixpkgs/pkgs/shells/oil/default.nix index bce76b4cc8..94fd062e45 100644 --- a/third_party/nixpkgs/pkgs/shells/oil/default.nix +++ b/third_party/nixpkgs/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.8.pre6"; + version = "0.8.1"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "1gbc74in78lbkciz7wzjplrm185wn6fz57n66xmazayivqmpvgfm"; + sha256 = "0mhzys1siry848v7swr1iv2wp329ksw0gpz1qd82fmlakml5brc1"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/shells/zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/default.nix index 3b346e4e44..56c76289e8 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/default.nix @@ -81,7 +81,7 @@ EOF a host of other features. ''; license = "MIT-like"; - homepage = "http://www.zsh.org/"; + homepage = "https://www.zsh.org/"; maintainers = with stdenv.lib.maintainers; [ pSub ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix index 6af16271d3..756c01d6e3 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "grml's zsh setup"; - homepage = "http://grml.org/zsh/"; + homepage = "https://grml.org/zsh/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ msteen rvolosatovs ]; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix index 0f244c4d68..37614dac0a 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix @@ -1,21 +1,17 @@ -{ stdenv, fetchFromGitHub, zsh }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "lambda-mod-zsh-theme-unstable-2019-04-17"; + pname = "lambda-mod-zsh-theme-unstable"; + version = "2020-10-03"; src = fetchFromGitHub { owner = "halfo"; repo = "lambda-mod-zsh-theme"; - rev = "6b83aedf9de41ea4e226cdbc78af1b7b92beb6ac"; - sha256 = "1xf451c349fxnqbvsb07y9r1iqrwslx6x4b6drmnqqqy4yx1r5dj"; + rev = "78347ea9709935f265e558b6345919d12323fbff"; + sha256 = "0fvxnvgbcvwii7ghvpj5l43frllq71wwjvfg7cqfmic727z001dh"; }; - buildInputs = [ zsh ]; - installPhase = '' - chmod +x lambda-mod.zsh-theme # only executable scripts are found by `patchShebangs` - patchShebangs . - install -Dm0644 lambda-mod.zsh-theme $out/share/zsh/themes/lambda-mod.zsh-theme ''; 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 cc4c790336..1557bc8b5d 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,15 +4,15 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2020-09-20"; + version = "2020-10-05"; pname = "oh-my-zsh"; - rev = "93c837fec8e9fe61509b9dff9e909e84f7ebe32d"; + rev = "6ebf27b8d34c760e25749790ea78dcb0c220d76b"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "1ww50c1xf64z1m0sy30xaf2adr87cqr5yyv9jrqr227j97vrwj04"; + sha256 = "0x53mf9lys15x86sc8kgf3y05jkhdszqrywf0mlv00n9kjzbkv5s"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/stdenv/adapters.nix b/third_party/nixpkgs/pkgs/stdenv/adapters.nix index 8b23d3dadd..03ae3cb8f0 100644 --- a/third_party/nixpkgs/pkgs/stdenv/adapters.nix +++ b/third_party/nixpkgs/pkgs/stdenv/adapters.nix @@ -15,7 +15,7 @@ rec { # Used to override packages in stdenv like Make. Should not be used # for other dependencies. overrideInStdenv = stdenv: pkgs: - stdenv.override (prev: { allowedRequisites = null; extraBuildInputs = prev.extraBuildInputs or [] ++ pkgs; }); + stdenv.override (prev: { allowedRequisites = null; extraBuildInputs = (prev.extraBuildInputs or []) ++ pkgs; }); # Override the setup script of stdenv. Useful for testing new @@ -34,7 +34,7 @@ rec { makeStaticBinaries = stdenv: let stdenv' = if stdenv.hostPlatform.libc != "glibc" then stdenv else stdenv.override (prev: { - extraBuildInputs = prev.extraBuildInputs or [] ++ [ + extraBuildInputs = (prev.extraBuildInputs or []) ++ [ stdenv.glibc.static ]; }); diff --git a/third_party/nixpkgs/pkgs/stdenv/cross/default.nix b/third_party/nixpkgs/pkgs/stdenv/cross/default.nix index 6ac03b7908..064e1836b1 100644 --- a/third_party/nixpkgs/pkgs/stdenv/cross/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/cross/default.nix @@ -63,6 +63,8 @@ in lib.init bootStages ++ [ # `tryEval` wouldn't catch, wrecking accessing previous stages # when there is a C compiler and everything should be fine. then throw "no C compiler provided for this platform" + else if crossSystem.isDarwin + then buildPackages.llvmPackages.clang else if crossSystem.useLLVM or false then buildPackages.llvmPackages_8.lldClang else buildPackages.gcc; diff --git a/third_party/nixpkgs/pkgs/test/haskell-shellFor/default.nix b/third_party/nixpkgs/pkgs/test/haskell-shellFor/default.nix index 1b3de999d2..05d09d6f39 100644 --- a/third_party/nixpkgs/pkgs/test/haskell-shellFor/default.nix +++ b/third_party/nixpkgs/pkgs/test/haskell-shellFor/default.nix @@ -1,7 +1,7 @@ -{ stdenv, haskellPackages, cabal-install }: +{ lib, stdenv, haskellPackages, cabal-install }: -haskellPackages.shellFor { - packages = p: [ p.database-id-class p.constraints-extras ]; +(haskellPackages.shellFor { + packages = p: [ p.database-id-class p.constraints ]; nativeBuildInputs = [ cabal-install ]; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; unpackPhase = '' @@ -9,16 +9,25 @@ haskellPackages.shellFor { mkdir -p "$sourceRoot" cd "$sourceRoot" tar -xf ${haskellPackages.database-id-class.src} - tar -xf ${haskellPackages.constraints-extras.src} - cp ${builtins.toFile "cabal.project" "packages: database-id-class* constraints-extras*"} cabal.project + tar -xf ${haskellPackages.constraints.src} + cp ${builtins.toFile "cabal.project" "packages: database-id-class* constraints*"} cabal.project ''; buildPhase = '' export HOME=$(mktemp -d) mkdir -p $HOME/.cabal touch $HOME/.cabal/config - cabal v2-build --offline --verbose database-id-class constraints-extras --ghc-options="-O0 -j$NIX_BUILD_CORES" + cabal v2-build --offline --verbose database-id-class constraints --ghc-options="-O0 -j$NIX_BUILD_CORES" ''; installPhase = '' touch $out ''; -} +}).overrideAttrs (oldAttrs: { + meta = + let + oldMeta = oldAttrs.meta or {}; + oldMaintainers = oldMeta.maintainers or []; + additionalMaintainers = with lib.maintainers; [ cdepillabout ]; + allMaintainers = oldMaintainers ++ additionalMaintainers; + in + oldMeta // { maintainers = allMaintainers; }; +}) diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix index 1efbff221a..d55b90f3b8 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix @@ -1,16 +1,16 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "aws-vault"; - version = "6.0.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "99designs"; repo = pname; rev = "v${version}"; - sha256 = "0ssm58ksk5jb28w1ipa57spzf6wixjy1m7flw61ls8k86cy7qb7c"; + sha256 = "0892fhjmxnms09bfbjnngnnnli2d4nkwq44fw98yb3d5lbpa1j1j"; }; - vendorSha256 = "0lxm7nkzf9j9id7m46gqn26prb1jfl34gy1fycr0578absdvsrjd"; + vendorSha256 = "18lmxx784377x1v0gr6fkdx5flhcajsqlzyjx508z0kih6ammc0z"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix index 471034fa51..e89df04e3b 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix @@ -8,12 +8,12 @@ let py = python3.override { packageOverrides = self: super: { botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0dev52"; + version = "2.0.0dev58"; src = fetchFromGitHub { owner = "boto"; repo = "botocore"; - rev = "f115f16d8130957776f232bbb7505ff6c4f18e8c"; - hash = "sha256-wi9ezv6uIvCNFYJX6z0zQO7/VREhe1Sn/CakIgDRp1c="; + rev = "2d65a1bdf85d24b40a40bc681b44d167ce1cc8cb"; + hash = "sha256-HPeNWLhNFjRoD4TZ54ZGgJPp8fsnh8Rt6DMJ8Q0nPkY="; }; }); prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { @@ -29,13 +29,13 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.0.48"; # N.B: if you change this, change botocore to a matching version too + version = "2.0.54"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256-83EKaKv3ZKOD2hzdsJO7/djbzr4V8LpHxqBl9HFhk1U="; + hash = "sha256-RVF9/2s5oy3Re6hdvbhwPf0nXSoizBDwOgtXCc7cwgc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix index 3743cad11a..8a9101cedd 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.11.1"; + version = "2.12.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "11jmgc73b0w725rq89j6hk6gh67nfdbzp3rmywmrnah683d6xbpx"; + sha256 = "14m2zjgaszrki34kva23vdsl0nxxifz8r9i54ld3idi8hj3nx0q3"; }; # put packages that needs to be overriden in the py package scope @@ -36,6 +36,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { nativeBuildInputs = [ installShellFiles ]; propagatedBuildInputs = with py.pkgs; [ + azure-appconfiguration azure-batch azure-cli-core azure-cli-telemetry @@ -44,6 +45,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-functions-devops-build azure-graphrbac azure-keyvault + azure-keyvault-administration azure-loganalytics azure-mgmt-advisor azure-mgmt-apimanagement 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 8d17c9ff20..f13e37d89e 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 @@ -84,13 +84,14 @@ let ++ lib.optionals (!isPy3k) [ enum34 futures antlr4-python2-runtime ndg-httpsclient ]; doCheck = stdenv.isLinux; - # ignore test that does network call + # ignore tests that does network call checkPhase = '' rm azure/{,cli/}__init__.py python -c 'import azure.common; print(azure.common)' PYTHONPATH=$PWD:$PYTHONPATH HOME=$TMPDIR pytest \ --ignore=azure/cli/core/tests/test_profile.py \ - --ignore=azure/cli/core/tests/test_generic_update.py + --ignore=azure/cli/core/tests/test_generic_update.py \ + -k 'not metadata_url' ''; pythonImportsCheck = [ @@ -121,8 +122,8 @@ let 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-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "0.2.0" "zip" + "0whx3s8ri9939r3pdvjf8iqcslas1xy6cnccidmp10r5ng0023vr"; azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "9.0.0" "zip" "1zn3yqwvm2f3sy8v0xvj4yb7m8kxxm1wpcaccxp91b0zzbn7wh83"; @@ -130,8 +131,8 @@ let azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.5.0" "zip" "1wxh7mgrknnhqyafdd7sbwx8plx0zga2af21vs6yhxy48lw9w8pd"; - azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "2.2.0" "zip" - "1iz1pf28ajrzbq8nab1jbjbgfbv0g6ni036xayy6xylvga4l8czr"; + azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "3.0.0rc1" "zip" + "0afg5vmyiwqna9rnal9ir2vyg2mykllsf313gd3kn99jl21bgns1"; azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "0.4.0" "zip" "0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rz1"; @@ -142,8 +143,8 @@ let azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "10.2.0" "zip" "ddfe4c0c55f0e3fd1f66dd82c1d4a3d872ce124639b9a77fcd172daf464438a5"; - azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.5.0" "zip" - "1nh626jg459p9f96glv74dph3vmpybm5cs8rrj1s65kn3m8jf591"; + azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.6.0" "zip" + "0pvc8f3g12q7als0pgy26kqi2i9grykwrjyiv2vijci9wxn22vpy"; azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.2.0" "zip" "1khk9jdfx7706xsqpwrnfsplv6p6wracvpyk9ki8zhc7p83kal4k"; @@ -157,14 +158,14 @@ let azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "1.4.0" "zip" "1qw6228bia5pimcijr755npli2l33jyfka1s2bzgl1w4h3prsji7"; - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "9.0.1" "zip" - "11nqjpi9qypb0xvfy63l98q5m5jfv5iqx15mliksm96vkdkmji3y"; + azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "9.4.0" "zip" + "1jfs2v0bblpn8lg98zgll6f7k7247r6vwrr0p1898xvhdh8881nr"; azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.2.0" "zip" "8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998"; - azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.15.0" "zip" - "03ysr8kx0gavjrxsi9wqrgxpg3g17nvii7z68qfm0k2mv6ryj3z7"; + azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "1.0.0" "zip" + "08xp04mkl5ajwyr0l62c8bfb4n8p9s9fp6szynb2bdp6m2p3g2z0"; azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip" "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6"; @@ -196,8 +197,8 @@ let azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "0.7.0" "zip" "18n2lqvrhq40gdqhlzzg8mc03571i02c7qq7jv771lc58rqpzysh"; - azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "11.0.0" "zip" - "1g39rl4p88bzhqbn1gi2nn8jyx77idxvpaw8xqz1gjv0qqqwdpvz"; + azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "12.0.0" "zip" + "150074lnld426lv37v4gy41cqqvj57zw4mrz5svv7iynljb2jl3l"; azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "2.1.0" "zip" "1py0hch0wghzfxazdrrs7p0kln2zn9jh3fmkzwd2z8qggj38q6gm"; @@ -223,8 +224,8 @@ let azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "0.4.0" "zip" "09n12ligh301z4xwixl50n8f1rgd2k6lpsxqzr6n6jvgkpdds0v5"; - azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.19.0" "zip" - "1iiqc0kh5hygcvr3x1653cpjnf5na3j11v137xa9xy65r7a4jik9"; + azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.21.0" "zip" + "0023q32z4vn94l5aqf7h6ld4ai12a703y7glnl02lls25qfs9xvv"; azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.5.0" "zip" "1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm"; @@ -238,11 +239,11 @@ let azure-mgmt-relay = overrideAzureMgmtPackage super.azure-mgmt-relay "0.1.0" "zip" "1jss6qhvif8l5s0lblqw3qzijjf0h88agciiydaa7f4q577qgyfr"; - azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "4.0.0" "zip" - "1qisnwn0gqfsa3h5x0fdbsgdjwn92hdbg71gdijrja0kryb328k5"; + azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "4.1.0" "zip" + "186g70slb259ybrr69zr2ibbmqgplnpncwxzg0nxp6rd7pml7d85"; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "7.0.0b2" "zip" - "10kpfzgsyh648a9z194vysgfl5887qwwamyd1r32zfqi9fr4js5l"; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "7.0.0b3" "zip" + "1w8kp4r8v54cr4sskkgv5mbqx2pisrly2066ma5msg6amy97jnr6"; azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.0.0" "zip" "0y1bq6lirwx4n8zydi49jx72xfc7dppzhy82x22sx98id8lxgcwm"; @@ -259,14 +260,14 @@ let azure-mgmt-applicationinsights = overrideAzureMgmtPackage super.azure-mgmt-applicationinsights "0.1.1" "zip" "16raxr5naszrxmgbfhsvh7rqcph5cx6x3f480790m79ykvmjj0pi"; - azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.52.0" "zip" - "0357laxgldb7lvvws81r8xb6mrq9dwwnr1bnwdnyj4bw6p21i9hn"; + azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip" + "0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m"; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "11.1.0" "zip" - "073zybsxk70vg02bflbrx97pwzsxl0xyi48fpxp8dh3d3dy5h8zg"; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "11.2.0" "zip" + "0a05djzgwnd9lwj5mazmjfv91k72v9scf612kf6vkjjq7jzkr3pw"; - azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.4.0" "zip" - "1x18grkjf2p2r1ihlwv607sna9yjvsr2jwnkjc55askrgrwx5jx2"; + azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.5.0" "zip" + "0x6wxb9zrvcayg3yw0nm99p10vvgc0x3zwk9amzs5m682r2z4wap"; azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.7.0" "zip" "004q3d2kj1i1cx3sad1544n3pkindfm255sw19gdlhbw61wn5l5a"; @@ -339,6 +340,16 @@ let pythonImportsCheck = [ ]; }); + azure-keyvault-administration = super.azure-keyvault-administration.overridePythonAttrs(oldAttrs: rec { + version = "4.0.0b1"; + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + extension = "zip"; + sha256 = "1kmf2x3jdmfm9c7ldvajzckkm79gxxvl1l2968lizjwiyjbbsih5"; + }; + }); + # part of azure.mgmt.datalake namespace azure-mgmt-datalake-analytics = super.azure-mgmt-datalake-analytics.overrideAttrs(oldAttrs: rec { version = "0.2.1"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix index 5a51ace3b9..8e2249c963 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,18 +21,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "1l2r9pgyzih7xgrr2ygm0mcl97kyp1wfvybwhbn1i0kbb72nagk1"; + sha256 = "1izvig9ywfm8jq9cwkfbrcbk3f4frph1cs9fiaq1vmrbcgp2p6l0"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "1qbkdfa7dzysp7crv9ph476hbabl3qiszs067f20dadqssqs1v4r"; + sha256 = "1bjbr32b0cgp95cdc527133ng9i9f11f75iqhvy0f2zq3n88va29"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "306.0.0"; + version = "312.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); diff --git a/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix index 3af266c817..4f02615b4a 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix @@ -1,27 +1,79 @@ { lib -, python3Packages +, python3 , fetchFromGitHub }: -python3Packages.buildPythonApplication rec { +let + py = python3.override { + packageOverrides = self: super: { + # until https://github.com/ags-slc/localzone/issues/1 gets resolved + dnspython = super.dnspython.overridePythonAttrs(oldAttrs: rec { + pname = "dnspython"; + version = "1.16.0"; + # since name is defined from the previous derivation, need to override + # name explicity for correct version to show in drvName + name = "${pname}-${version}"; + + src = super.fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "00cfamn97w2vhq3id87f10mjna8ag5yz5dw0cy5s0sa3ipiyii9n"; + }; + }); + + localzone = super.localzone.overridePythonAttrs(oldAttrs: rec { + meta = oldAttrs.meta // { broken = false; }; + }); + }; + }; +in + with py.pkgs; + +buildPythonApplication rec { pname = "lexicon"; - version = "3.3.27"; - - propagatedBuildInputs = with python3Packages; [ requests tldextract future cryptography pyyaml boto3 zeep xmltodict beautifulsoup4 dnspython pynamecheap softlayer transip localzone ]; - - checkInputs = with python3Packages; [ pytest pytestcov pytest_xdist vcrpy mock ]; - - checkPhase = '' - pytest --ignore=lexicon/tests/providers/test_auto.py - ''; + version = "3.4.3"; + format = "pyproject"; src = fetchFromGitHub { owner = "AnalogJ"; repo = pname; rev = "v${version}"; - sha256 = "0i6grrpdwh7axhnsabb0pfjhpd3prc9ji1afivi7q3c0krgvncmc"; + sha256 = "1ym4gj4xyd69rsc5niilvcb72gys22rjxhj4qd574vyx3ryl34za"; }; + nativeBuildInputs = [ + poetry + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + boto3 + cryptography + dnspython + future + localzone + pynamecheap + pyyaml + requests + softlayer + tldextract + transip + xmltodict + zeep + ]; + + checkInputs = [ + mock + pytest + pytestcov + pytest_xdist + vcrpy + ]; + + checkPhase = '' + pytest --ignore=lexicon/tests/providers/test_auto.py + ''; + meta = with lib; { description = "Manipulate DNS records on various DNS providers in a standardized way."; homepage = "https://github.com/AnalogJ/lexicon"; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix index 31341e4178..621e3f718e 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation { checksummed in the archive in order to protect the data. If the archive is corrupt, you just loose the current file, not the whole archive. ''; - homepage = "http://www.fsarchiver.org/"; + homepage = "https://www.fsarchiver.org/"; license = licenses.lgpl2; maintainers = [ maintainers.etu ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/audio/ezstream/default.nix b/third_party/nixpkgs/pkgs/tools/audio/ezstream/default.nix index 02a6e9d37f..499f984285 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/ezstream/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/ezstream/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { from standard input without reencoding and thus requires only very little CPU resources. ''; - homepage = "http://icecast.org/ezstream/"; + homepage = "https://icecast.org/ezstream/"; license = licenses.gpl2; maintainers = [ maintainers.barrucadu ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix b/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix index bfeafd0875..8ca6112244 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1ngm0vbx6ryks68bp0zarvncc36gbpkkqavxb3sfph9p959b9hif"; + sha256 = "1vri2xlih7xg0vl4dndjrwf2l5g28bld6kg7adk9v974zxq1h57g"; }; - vendorSha256 = "07p2ka5rbasrgjfd4k2jn0ffshjp39kilz9b714ykyi1qflczr9b"; + vendorSha256 = "1mnhq6kn0pn67l55a9k6irmjlprr295218nms3klsk2720syzdwq"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/backup/pyznap/default.nix b/third_party/nixpkgs/pkgs/tools/backup/pyznap/default.nix index b04aab3453..81f3a99ecd 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/pyznap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/pyznap/default.nix @@ -6,16 +6,16 @@ buildPythonApplication rec { pname = "pyznap"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0s8glb6kbwwha6zgzfrf195r1qkrv1a9wagyhhm3kryv7c88mqnp"; + sha256 = "88bf1d6de2c11f14acbdfa01b61eb95c94f95d829ddebdaee3786b64ccb93ae3"; }; propagatedBuildInputs = [ setuptools - ]; + ]; # tests aren't included in the PyPI packages doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/compression/brotli/default.nix b/third_party/nixpkgs/pkgs/tools/compression/brotli/default.nix index 229c6c8b8e..bf20e0119e 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/brotli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/brotli/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; patches = stdenv.lib.optional staticOnly (fetchpatch { - url = "https://github.com/google/brotli/pull/655/commits/7289e5a378ba13801996a84d89d8fe95c3fc4c11.patch"; + # from https://github.com/google/brotli/pull/655 + url = "https://github.com/google/brotli/commit/7289e5a378ba13801996a84d89d8fe95c3fc4c11.patch"; sha256 = "1bghbdvj24jrvb0sqfdif9vwg7wx6pn8dvl6flkrcjkhpj0gi0jg"; }); diff --git a/third_party/nixpkgs/pkgs/tools/compression/lzbench/default.nix b/third_party/nixpkgs/pkgs/tools/compression/lzbench/default.nix index be0491007e..3609e53304 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/lzbench/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/lzbench/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lzbench"; - version = "1.8"; + version = "1.8.1"; src = fetchFromGitHub { owner = "inikep"; repo = pname; rev = "v${version}"; - sha256 = "0gxw9b3yjj3z2b1y9mx3yfhklyxpfmb8fjf9mfpg9hlbr9mcpff3"; + sha256 = "19zlvcjb1qg4fx30rrp6m650660y35736j8szvdxmqh9ipkisyia"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/sandboxfs/Cargo.lock.patch b/third_party/nixpkgs/pkgs/tools/filesystems/sandboxfs/Cargo.lock.patch new file mode 100644 index 0000000000..fbc4c80872 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/sandboxfs/Cargo.lock.patch @@ -0,0 +1,640 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..5e16611 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,634 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "addr2line" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072" ++dependencies = [ ++ "gimli", ++] ++ ++[[package]] ++name = "adler" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "arc-swap" ++version = "0.4.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034" ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.51" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ec1931848a574faa8f7c71a12ea00453ff5effbb5f51afe7f77d7a48cace6ac1" ++dependencies = [ ++ "addr2line", ++ "cfg-if", ++ "libc", ++ "miniz_oxide", ++ "object", ++ "rustc-demangle", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "cc" ++version = "1.0.60" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "cpuprofiler" ++version = "0.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "43f8479dbcfd2bbaa0c0c26779b913052b375981cdf533091f2127ea3d42e52b" ++dependencies = [ ++ "error-chain", ++ "lazy_static", ++ "pkg-config", ++] ++ ++[[package]] ++name = "env_logger" ++version = "0.5.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38" ++dependencies = [ ++ "atty", ++ "humantime", ++ "log 0.4.11", ++ "regex", ++ "termcolor", ++] ++ ++[[package]] ++name = "error-chain" ++version = "0.12.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" ++dependencies = [ ++ "backtrace", ++ "version_check", ++] ++ ++[[package]] ++name = "failure" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" ++dependencies = [ ++ "backtrace", ++ "failure_derive", ++] ++ ++[[package]] ++name = "failure_derive" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "synstructure", ++] ++ ++[[package]] ++name = "fuse" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "80e57070510966bfef93662a81cb8aa2b1c7db0964354fa9921434f04b9e8660" ++dependencies = [ ++ "libc", ++ "log 0.3.9", ++ "pkg-config", ++ "thread-scoped", ++ "time", ++] ++ ++[[package]] ++name = "getopts" ++version = "0.2.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "wasi 0.9.0+wasi-snapshot-preview1", ++] ++ ++[[package]] ++name = "gimli" ++version = "0.22.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724" ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c30f6d0bc6b00693347368a67d41b58f2fb851215ff1da49e90fe2c5c667151" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "humantime" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" ++dependencies = [ ++ "quick-error", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "libc" ++version = "0.2.78" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa7087f49d294270db4e1928fc110c976cd4b9e5a16348e0a1df09afa99e6c98" ++ ++[[package]] ++name = "log" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" ++dependencies = [ ++ "log 0.4.11", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c60c0dfe32c10b43a144bad8fc83538c52f58302c92300ea7ec7bf7b38d5a7b9" ++dependencies = [ ++ "adler", ++ "autocfg", ++] ++ ++[[package]] ++name = "nix" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "319fffb13b63c0f4ff5a4e1c97566e7e741561ff5d03bf8bbf11653454bbd70b" ++dependencies = [ ++ "bitflags", ++ "cc", ++ "cfg-if", ++ "libc", ++ "void", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++] ++ ++[[package]] ++name = "object" ++version = "0.20.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "quick-error" ++version = "1.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" ++ ++[[package]] ++name = "quote" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "rand" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" ++dependencies = [ ++ "getrandom", ++ "libc", ++ "rand_chacha", ++ "rand_core", ++ "rand_hc", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" ++dependencies = [ ++ "getrandom", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++dependencies = [ ++ "rand_core", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.57" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" ++ ++[[package]] ++name = "regex" ++version = "1.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++ "thread_local", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" ++ ++[[package]] ++name = "ryu" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" ++ ++[[package]] ++name = "sandboxfs" ++version = "0.2.0" ++dependencies = [ ++ "cpuprofiler", ++ "env_logger", ++ "failure", ++ "fuse", ++ "getopts", ++ "log 0.4.11", ++ "nix", ++ "num_cpus", ++ "pkg-config", ++ "serde", ++ "serde_derive", ++ "serde_json", ++ "signal-hook", ++ "tempfile", ++ "threadpool", ++ "time", ++ "users", ++ "xattr", ++] ++ ++[[package]] ++name = "serde" ++version = "1.0.116" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5" ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.116" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.58" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a230ea9107ca2220eea9d46de97eddcb04cd00e92d13dda78e478dd33fa82bd4" ++dependencies = [ ++ "itoa", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "signal-hook" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "604508c1418b99dfe1925ca9224829bb2a8a9a04dda655cc01fcad46f4ab05ed" ++dependencies = [ ++ "libc", ++ "signal-hook-registry", ++] ++ ++[[package]] ++name = "signal-hook-registry" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a3e12110bc539e657a646068aaf5eb5b63af9d0c1f7b29c97113fad80e15f035" ++dependencies = [ ++ "arc-swap", ++ "libc", ++] ++ ++[[package]] ++name = "syn" ++version = "1.0.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c51d92969d209b54a98397e1b91c8ae82d8c87a7bb87df0b29aa2ad81454228" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.12.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "rand", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi", ++] ++ ++[[package]] ++name = "termcolor" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" ++dependencies = [ ++ "winapi-util", ++] ++ ++[[package]] ++name = "thread-scoped" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bcbb6aa301e5d3b0b5ef639c9a9c7e2f1c944f177b460c04dc24c69b1fa2bd99" ++ ++[[package]] ++name = "thread_local" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" ++dependencies = [ ++ "lazy_static", ++] ++ ++[[package]] ++name = "threadpool" ++version = "1.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" ++dependencies = [ ++ "num_cpus", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" ++dependencies = [ ++ "libc", ++ "wasi 0.10.0+wasi-snapshot-preview1", ++ "winapi", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++ ++[[package]] ++name = "users" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c72f4267aea0c3ec6d07eaabea6ead7c5ddacfafc5e22bcf8d186706851fb4cf" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "version_check" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" ++ ++[[package]] ++name = "void" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" ++ ++[[package]] ++name = "wasi" ++version = "0.9.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++ ++[[package]] ++name = "wasi" ++version = "0.10.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" ++dependencies = [ ++ "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 = "xattr" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" ++dependencies = [ ++ "libc", ++] diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/sandboxfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/sandboxfs/default.nix new file mode 100644 index 0000000000..85677a53f4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/sandboxfs/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +, fuse +, pkg-config +, installShellFiles +}: + +rustPlatform.buildRustPackage rec { + pname = "sandboxfs"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "bazelbuild"; + repo = pname; + rev = "sandboxfs-${version}"; + sha256 = "Ia6rq6FN4abnvLXjlQh4Q+8ra5JThKnC86UXC7s9//U="; + }; + + cargoSha256 = "sha256-k303TjWG+n+/ZMmko84KJtYb7swuQ1ZJOc4Vq6aOhX0="; + + # Issue to add Cargo.lock upstream: https://github.com/bazelbuild/sandboxfs/pull/115 + cargoPatches = [ ./Cargo.lock.patch ]; + + nativeBuildInputs = [ pkg-config installShellFiles ]; + + buildInputs = [ fuse ]; + + postInstall = "installManPage man/sandboxfs.1"; + + meta = with stdenv.lib; { + description = "A virtual file system for sandboxing"; + homepage = "https://github.com/bazelbuild/sandboxfs"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ jeremyschlatter ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix index b5254a9202..95e95ff6a1 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://xfs.org/"; + homepage = "https://xfs.org/"; description = "SGI XFS utilities"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/amber/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/amber/default.nix new file mode 100644 index 0000000000..1b8c90c8fb --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/graphics/amber/default.nix @@ -0,0 +1,95 @@ +{ stdenv +, fetchFromGitHub +, cmake +, pkg-config +, python3 +, vulkan-headers +, vulkan-loader +}: +let + glslang = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "glslang"; + rev = "3ee5f2f1d3316e228916788b300d786bb574d337"; + sha256 = "1l5h9d92mzd35pgs0wibqfg7vbl771lwnvdlcsyhf6999khn5dzv"; + }; + + lodepng = fetchFromGitHub { + owner = "lvandeve"; + repo = "lodepng"; + rev = "34628e89e80cd007179b25b0b2695e6af0f57fac"; + sha256 = "10yaf218xnmhv7rsq6dysqrps43r30cgrs1z63h47z40x43ikia0"; + }; + + shaderc = fetchFromGitHub { + owner = "google"; + repo = "shaderc"; + rev = "ba92b11e1fcaf4c38a64f84d643d6429175bf650"; + sha256 = "041hip43siy2sr7h6habk9sxdmd45ag4kqgi8jk0vm1b8pqzkhqn"; + }; + + spirv-headers = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Headers"; + rev = "3fdabd0da2932c276b25b9b4a988ba134eba1aa6"; + sha256 = "17h5cn4dyw8ixp1cpw8vf1z90m0fn1hhlvh0iycmknccbb1z34q7"; + }; + + spirv-tools = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Tools"; + rev = "fd3cabd8b5fc43ce83884ac06486c283b9902b4f"; + sha256 = "1h3smicw5gzpa17syb30085zccydzs4f41fl30bcmiipdn2xfpjr"; + }; + +in +stdenv.mkDerivation rec { + pname = "amber"; + version = "unstable-2020-09-23"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "0eee2d45d053dfc566baa58442a9b1b708e4f2a7"; + sha256 = "1rrbvmn9hvhj7xj89yqvy9mx0vg1qapdm5fkca8mkd3516d9f5pw"; + }; + + buildInputs = [ + vulkan-headers + vulkan-loader + ]; + + nativeBuildInputs = [ + cmake + pkg-config + python3 + ]; + + # Tests are disabled so we do not have to pull in googletest and more dependencies + cmakeFlags = [ "-DAMBER_SKIP_TESTS=ON" ]; + + prePatch = '' + cp -r ${glslang}/ third_party/glslang + cp -r ${lodepng}/ third_party/lodepng + cp -r ${shaderc}/ third_party/shaderc + cp -r ${spirv-tools}/ third_party/spirv-tools + cp -r ${spirv-headers}/ third_party/spirv-headers + chmod u+w -R third_party + + substituteInPlace CMakeLists.txt \ + --replace "-Werror" "" + substituteInPlace tools/update_build_version.py \ + --replace "not os.path.exists(directory)" "True" + ''; + + installPhase = '' + install -Dm755 -t $out/bin amber image_diff + ''; + + meta = with stdenv.lib; { + description = "Multi-API shader test framework"; + homepage = "https://github.com/google/amber"; + license = licenses.asl20; + maintainers = with maintainers; [ Flakebi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix index 4507c4fed8..948b590249 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix @@ -4,6 +4,7 @@ , pkg-config , libjpeg , libpng +, jbigkit , flex , zlib , perl @@ -12,19 +13,20 @@ , libtiff , enableX11 ? false , libX11 +, buildPackages }: stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced - name = "netpbm-10.89.1"; + name = "netpbm-10.92.0"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "3735"; - sha256 = "1m7ks6k53gsjsdazgf22g16dfgj3pqvqy9mhxzlwszv5808sj5w5"; + rev = "3972"; + sha256 = "09fpy4n4f867j23pr3b719wpvp8hjrr4drxp0r1csw74p8j6vfy3"; }; nativeBuildInputs = [ @@ -40,10 +42,17 @@ stdenv.mkDerivation { libjpeg libxml2 libtiff + jbigkit ] ++ lib.optional enableX11 libX11; + + strictDeps = true; + enableParallelBuilding = true; + # Environment variables + STRIPPROG = "${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"; + postPatch = '' # Install libnetpbm.so symlink to correct destination substituteInPlace lib/Makefile \ @@ -58,11 +67,22 @@ stdenv.mkDerivation { # Disable building static library echo "STATICLIB_TOO = N" >> config.mk + # Enable cross-compilation + echo 'AR = ${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar' >> config.mk + echo 'CC = ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc' >> config.mk + echo 'CC_FOR_BUILD = ${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc' >> config.mk + echo 'LD_FOR_BUILD = $(CC_FOR_BUILD)' >> config.mk + echo 'PKG_CONFIG = ${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config' >> config.mk + echo 'RANLIB = ${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib' >> config.mk + # Use libraries from Nixpkgs echo "TIFFLIB = libtiff.so" >> config.mk echo "TIFFLIB_NEEDS_JPEG = N" >> config.mk echo "TIFFLIB_NEEDS_Z = N" >> config.mk echo "JPEGLIB = libjpeg.so" >> config.mk + echo "JBIGLIB = libjbig.a" >> config.mk + # Insecure + echo "JASPERLIB = NONE" >> config.mk # Fix path to rgb.txt echo "RGB_DB_PATH = $out/share/netpbm/misc/rgb.txt" >> config.mk @@ -70,7 +90,7 @@ stdenv.mkDerivation { echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk echo "NETPBMLIBTYPE = dylib" >> config.mk echo "NETPBMLIBSUFFIX = dylib" >> config.mk - + '' + '' runHook postConfigure ''; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix index 334cb00f3c..eb5afebaa6 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.10.0"; + version = "8.10.1"; outputs = [ "bin" "out" "man" "dev" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "1v5kfmv1vmzyvz1198jm1kl763s2i3mgnsn69vh6dslasbh769di"; + sha256 = "0zfhp86vbxs5qdnjy8hvdcjslfkafvd3s3rjr2dppwm0iz4gdbfx"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/hime/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/hime/default.nix new file mode 100644 index 0000000000..cce1ec4951 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/hime/default.nix @@ -0,0 +1,40 @@ +{ +stdenv, fetchFromGitHub, pkgconfig, which, gtk2, gtk3, qt4, qt5, libXtst, lib, +enableChewing ? true, libchewing, +enableAnthy ? true, anthy, +}: + +stdenv.mkDerivation { + name = "hime"; + version = "unstable-2020-06-27"; + + src = fetchFromGitHub { + owner = "hime-ime"; + repo = "hime"; + rev = "c89751a58836906e6916355fd037fc74fd7a7a15"; + sha256 = "024w67q0clzxigsrvqbxpiy8firjvrqi7wbkkcapzzhzapv3nm8x"; + }; + + nativeBuildInputs = [ which pkgconfig ]; + buildInputs = [ libXtst gtk2 gtk3 qt4 qt5.qtbase ] + ++ lib.optional enableChewing libchewing + ++ lib.optional enableAnthy anthy; + + patchPhase = '' + patchShebangs configure + ''; + + # The configure script already auto-detect libchewing and anthy, + # so we do not need additional flags for libchewing or anthy + configureFlags = [ "--disable-lib64" "--disable-qt5-immodule" ]; + + + meta = with stdenv.lib; { + homepage = "http://hime-ime.github.io/"; + downloadPage = "https://github.com/hime-ime/hime/downloads"; + description = "A useful input method engine for Asia region"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ yanganto ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix index b4e5501fb7..e5b06521d7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix @@ -1,27 +1,39 @@ -{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, less -, Security, libiconv, installShellFiles, makeWrapper +{ stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, less +, Security +, libiconv +, installShellFiles +, makeWrapper }: rustPlatform.buildRustPackage rec { - pname = "bat"; - version = "0.15.4"; + pname = "bat"; + version = "0.16.0"; src = fetchFromGitHub { - owner = "sharkdp"; - repo = pname; - rev = "v${version}"; - sha256 = "0pjdba2c6p7ldgx2yfffxqlpasrcfrlkw63m1ma34zdq0f287w3p"; + owner = "sharkdp"; + repo = pname; + rev = "v${version}"; + sha256 = "161pfix42j767ziyp4mslffdd20v9i0ncplvjw2pmpccwdm106kg"; }; - cargoSha256 = "0myz06hjv4hwzmyqa9l36i9j9d213a0mnq8rvx6wyff7mr9zk99i"; + cargoSha256 = "19vhhxfyx3nrngcs6dvwldnk9h4lvs7xjkb31aj1y0pyawz882h9"; - nativeBuildInputs = [ pkgconfig installShellFiles makeWrapper ]; + nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ]; + # Remove after https://github.com/NixOS/nixpkgs/pull/97000 lands into master + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + unset SDKROOT + ''; + postInstall = '' installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1 - installShellCompletion $releaseDir/build/bat-*/out/assets/completions/bat.fish + installShellCompletion $releaseDir/build/bat-*/out/assets/completions/bat.{fish,zsh} ''; # Insert Nix-built `less` into PATH because the system-provided one may be too old to behave as @@ -33,8 +45,8 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A cat(1) clone with syntax highlighting and Git integration"; - homepage = "https://github.com/sharkdp/bat"; - license = with licenses; [ asl20 /* or */ mit ]; + homepage = "https://github.com/sharkdp/bat"; + license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ dywedir lilyball zowoq ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/crudini/default.nix b/third_party/nixpkgs/pkgs/tools/misc/crudini/default.nix index f63cd0d32c..1a49446e9c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/crudini/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/crudini/default.nix @@ -1,24 +1,19 @@ -{ stdenv, fetchFromGitHub, python2Packages, help2man, installShellFiles }: +{ stdenv, fetchFromGitHub, python3Packages, help2man, installShellFiles }: -let - # py3 is supposedly working in version 0.9.3 but the tests fail so stick to py2 - pypkgs = python2Packages; - -in -pypkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "crudini"; version = "0.9.3"; src = fetchFromGitHub { - owner = "pixelb"; - repo = "crudini"; - rev = version; + owner = "pixelb"; + repo = "crudini"; + rev = version; sha256 = "0298hvg0fpk0m0bjpwryj3icksbckwqqsr9w1ain55wf5s0v24k3"; }; nativeBuildInputs = [ help2man installShellFiles ]; - propagatedBuildInputs = with pypkgs; [ iniparse ]; + propagatedBuildInputs = with python3Packages; [ iniparse ]; postPatch = '' substituteInPlace crudini-help \ @@ -48,7 +43,7 @@ pypkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "A utility for manipulating ini files "; homepage = "https://www.pixelbeat.org/programs/crudini/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix index 1eb3dd7a0f..20b955f877 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "diskonaut"; - version = "0.9.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "imsnif"; repo = "diskonaut"; rev = version; - sha256 = "125ba9qwh7j8bz74w2zbw729s1wfnjg6dg8yicqrp6559x9k7gq5"; + sha256 = "1pmbag3r2ka30zmy2rs9jps2qxj2zh0gy4a774v9yhf0b6qjid54"; }; - cargoSha256 = "0vvbrlmviyn9w8i416767vhvd1gqm3qjvia730m0rs0w5h8khiqf"; + cargoSha256 = "0y86ikf235lp5j85fgzawgp4vx66rmzqd6p5n8iy3mqwn3c1ggb8"; meta = with stdenv.lib; { description = "Terminal disk space navigator"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix index 70316399e9..e4bec95e13 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "duf"; - version = "0.1.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "muesli"; repo = "duf"; rev = "v${version}"; - sha256 = "1akziaa5wjszflyylvnw284pz1aqngl40civzfabjz94pvyjkp76"; + sha256 = "1y27cc818099drccqg57nq4kcgl2zmg6akxv2k1c8rkz932q718f"; }; - vendorSha256 = "1aj7rxlylgvxdnnfnfzh20v2jvs8falvjjishxd8rdk1jgfpipl8"; + vendorSha256 = "1jmj46yami37r2wmiprpwyljcmj7dir9mcccx5is1jbiai6sx79i"; meta = with lib; { homepage = "https://github.com/muesli/duf/"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix index 1160f4158b..74eccc029a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -1,21 +1,21 @@ -{ lib, python3, platformio, esptool, git, protobuf3_11, fetchpatch }: +{ lib, python3, platformio, esptool, git, protobuf3_12, fetchpatch }: let python = python3.override { packageOverrides = self: super: { protobuf = super.protobuf.override { - protobuf = protobuf3_11; + protobuf = protobuf3_12; }; }; }; in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "1.14.5"; + version = "1.15.2"; src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "176mi361677d5cqbi0hn52kky845byjs6gdad8pdhihyjgv7a9y9"; + sha256 = "1wnmgn0q4n2vp2cdwsc36acsy7c7w5vyxdglii3432mr5drrgcsx"; }; ESPHOME_USE_SUBPROCESS = ""; @@ -28,7 +28,7 @@ in python.pkgs.buildPythonApplication rec { # remove all version pinning (E.g tornado==5.1.1 -> tornado) postPatch = '' - sed -i -e "s/==[0-9.]*//" setup.py + sed -i -e "s/==[0-9.]*//" requirements.txt ''; makeWrapperArgs = [ 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 2f49d0e57e..cb8549c9c9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.5.4"; + version = "1.5.7"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "0w96f86i2jlzjk2plf8jbdw4q748khbhhjkbzfb8dkq2lhc9i80h"; + sha256 = "1kpa2wgpm747w7bnk33m7bip5shlbkavs7rwnlj6yr600dcp8zp5"; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/gammy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gammy/default.nix index 61430c3e41..a5da799502 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gammy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gammy/default.nix @@ -2,7 +2,7 @@ let pname = "gammy"; - version = "0.9.58"; + version = "0.9.58a"; in stdenv.mkDerivation { @@ -12,22 +12,13 @@ stdenv.mkDerivation { owner = "Fushko"; repo = pname; rev = "v${version}"; - sha256 = "02f19b7acrzip4kbfjgqk06xv1c257rq77khpdg5gz0ai6ayvwm8"; + sha256 = "02kwfzh7h2dbsfb6b3qlsc7zga1hq21qvg45wf22vm03mahc28za"; }; nativeBuildInputs = [ qmake wrapQtAppsHook ]; buildInputs = [ libXxf86vm ]; - # FIXME remove when https://github.com/Fushko/gammy/issues/45 is fixed - installPhase = '' - runHook preInstall - - install gammy -Dt $out/bin/ - - runHook postInstall - ''; - meta = with stdenv.lib; { description = "GUI tool for manual- of auto-adjusting of brightness/temperature"; homepage = "https://github.com/Fushko/gammy"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/gh-ost/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gh-ost/default.nix index 17893ef18a..82ff74a041 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gh-ost/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gh-ost/default.nix @@ -1,27 +1,23 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -let +buildGoPackage rec { + pname = "gh-ost"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "github"; + repo = "gh-ost"; + rev = "v${version}"; + sha256 = "0laj5nmf10qn01mqn0flipmhankgvrcfbdl3bc76wa14qkkg722m"; + }; + goPackagePath = "github.com/github/gh-ost"; - version = "1.0.49"; - sha256 = "0mncjhmv25wnhgjkn9gwkz2gzh0v6954w47ql7fs2iqr9al111dq"; -in -buildGoPackage ({ - pname = "gh-ost"; - inherit version; - inherit goPackagePath; - - src = fetchFromGitHub { - owner = "github"; - repo = "gh-ost"; - rev = "v${version}"; - inherit sha256; - }; - - meta = with stdenv.lib; { - description = "Triggerless online schema migration solution for MySQL"; - homepage = "https://github.com/github/gh-ost"; - license = licenses.mit; - }; -}) + buildFlagsArray = [ "-ldflags=-s -w -X main.AppVersion=${version} -X main.BuildDescribe=${src.rev}" ]; + meta = with stdenv.lib; { + description = "Triggerless online schema migration solution for MySQL"; + homepage = "https://github.com/github/gh-ost"; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/git-town/default.nix b/third_party/nixpkgs/pkgs/tools/misc/git-town/default.nix index 34548abd81..ab9f1907a8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/git-town/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/git-town/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Generic, high-level git support for git-flow workflows"; - homepage = "http://www.git-town.com/"; + homepage = "https://www.git-town.com/"; maintainers = [ maintainers.allonsy maintainers.blaggacao ]; license = licenses.mit; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix index 8d81713e7b..cd60f0e98f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotify-cli"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "gotify"; repo = "cli"; rev = "v${version}"; - sha256 = "131gs6xzfggnrzq5jgyky23zvcmhx3q3hd17xvqxd02s2i9x1mg4"; + sha256 = "0hgh1i8rdmf12qmk66cgksv8hz5qzkfbfb6cfmrkhbq765xkm4ir"; }; - vendorSha256 = "1lhhsf944gm1p6qxn05g2s3hdnra5dggj7pdrdq6qr6r2xg7f5qh"; + vendorSha256 = "1l47s0h0v4cgqcsm5008cknvfa4vnv6f7n43d8ga0xq5ikqqzmja"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix b/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix index cb7adf795d..b610b517f8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.3.4"; + version = "3.3.6"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "0wynnb56plch61pzjl46jx5q94c5hclzyrr8567fc1jhnqycfngs"; + sha256 = "0yqs5zllaj7v4j9kzfkqxd4n9jdy2656pgai7v05a8wpri4b6sf5"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/graylog/plugins.nix b/third_party/nixpkgs/pkgs/tools/misc/graylog/plugins.nix index b1abc8a506..60fea1eb54 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/graylog/plugins.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/graylog/plugins.nix @@ -32,7 +32,7 @@ in { }; meta = { homepage = "https://github.com/cvtienhoven/graylog-plugin-aggregates"; - description = "SSO support for Graylog through trusted HTTP headers set by load balancers or authentication proxies"; + description = "A plugin that enables users to execute term searches and get notified when the given criteria are met"; }; }; auth_sso = glPlugin rec { @@ -64,10 +64,10 @@ in { enterprise-integrations = glPlugin rec { name = "graylog-enterprise-integrations-${version}"; pluginName = "graylog-plugin-enterprise-integrations"; - version = "3.3.4"; + version = "3.3.6"; src = fetchurl { url = "https://downloads.graylog.org/releases/graylog-enterprise-integrations/graylog-enterprise-integrations-plugins-${version}.tgz"; - sha256 = "0ln0vmnfgxg6hdq7sh58xdqn14bl86qrgy3923f3q3hx209v6vn9"; + sha256 = "15sx53ikc49d7a7qlcac9jyx9amrcqqqpk8hwj5lc8iv7d1wnxf9"; }; installPhase = '' mkdir -p $out/bin @@ -96,10 +96,10 @@ in { integrations = glPlugin rec { name = "graylog-integrations-${version}"; pluginName = "graylog-plugin-integrations"; - version = "3.3.4"; + version = "3.3.6"; src = fetchurl { url = "https://downloads.graylog.org/releases/graylog-integrations/graylog-integrations-plugins-${version}.tgz"; - sha256 = "14g6vdyibp3rva8bwss7vjbi9fpxvgp2gbk1r8divbhhpiwsjyxc"; + sha256 = "11cg0rn10sc1gzip88pm2yzyxighiaafw1vznr3ips307ia0c7hm"; }; installPhase = '' mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/tools/misc/hdf5/1_8.nix b/third_party/nixpkgs/pkgs/tools/misc/hdf5/1_8.nix deleted file mode 100644 index 849fa6b9ac..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/hdf5/1_8.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ stdenv -, fetchurl -, removeReferencesTo -, cpp ? false -, gfortran ? null -, fortran2003 ? false -, zlib ? null -, szip ? null -, mpi ? null -, enableShared ? true -}: - -# cpp and mpi options are mutually exclusive -# (--enable-unsupported could be used to force the build) -assert !cpp || mpi == null; - -# Need a Fortran compiler for Fortran2003 bindings -assert fortran2003 -> gfortran != null; - -# No point splitting version 1.8.18 into multiple outputs. -# The library /lib/libhdf5.so has a reference to gcc-wrapper - -let inherit (stdenv.lib) optional optionals; in - -stdenv.mkDerivation rec { - version = "1.8.19"; - pname = "hdf5"; - src = fetchurl { - url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/${pname}-${version}/src/${pname}-${version}.tar.bz2"; - sha256 = "0f3jfbqpaaq21ighi40qzs52nb52kc2d2yjk541rjmsx20b3ih2r" ; - }; - - passthru = { - mpiSupport = (mpi != null); - inherit mpi; - }; - - nativeBuildInputs = [ removeReferencesTo ]; - - buildInputs = [] - ++ optional (gfortran != null) gfortran - ++ optional (szip != null) szip; - - propagatedBuildInputs = [] - ++ optional (zlib != null) zlib - ++ optional (mpi != null) mpi; - - configureFlags = [] - ++ optional cpp "--enable-cxx" - ++ optional (gfortran != null) "--enable-fortran" - ++ optional fortran2003 "--enable-fortran2003" - ++ optional (szip != null) "--with-szlib=${szip}" - ++ optionals (mpi != null) ["--enable-parallel" "CC=${mpi}/bin/mpicc"] - ++ optional enableShared "--enable-shared"; - - patches = [./bin-mv.patch]; - - postInstall = '' - find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' + - ''; - - meta = { - description = "Data model, library, and file format for storing and managing data"; - longDescription = '' - HDF5 supports an unlimited variety of datatypes, and is designed for flexible and efficient - I/O and for high volume and complex data. HDF5 is portable and is extensible, allowing - applications to evolve in their use of HDF5. The HDF5 Technology suite includes tools and - applications for managing, manipulating, viewing, and analyzing data in the HDF5 format. - ''; - license = stdenv.lib.licenses.free; # BSD-like - homepage = "https://www.hdfgroup.org/HDF5/"; - platforms = stdenv.lib.platforms.unix; - broken = (gfortran != null) && stdenv.isDarwin; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix b/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix index de52909a81..fe5d724e69 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "intermodal"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "0vdla0vhvgj1yrg631jdm3kwdm1q0acw8sh2nz57dp3x7chq6ipx"; + sha256 = "1wqf227ljfys16jfbxi6mlkgdczgqrh15ixl9vi6higlxfi2wsj2"; }; - cargoSha256 = "1yl1chh243ixa9lhkmgi94w6mvnrnr7xmsh4kvj7ax693249pzjv"; + cargoSha256 = "0lx8y1y5mf8ga7iz74dnfyf2b9jx15wishw0khfxknmh96h2y99h"; # include_hidden test tries to use `chflags` on darwin checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix b/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix index 6f8dbb21e1..7446b061e0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kepubify"; - version = "3.1.4"; + version = "3.1.5"; src = fetchFromGitHub { owner = "pgaskin"; repo = pname; rev = "v${version}"; - sha256 = "0d71d1ra7lk4ayypq3fcigd9lpb2dafa8ci14h0g7rivm4lz8l1j"; + sha256 = "047pwn7yzm456cs175vgqk2pd6i3iqn8zxp38px3ah15vym2yjnp"; }; vendorSha256 = "0jzx5midawvzims9ghh8fbslvwcdczvlpf0k6a9q0bdf4wlp2z5n"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lbdb/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lbdb/default.nix index 7a6553461c..976e87ba2d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lbdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lbdb/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { pname = "lbdb"; inherit version; src = fetchurl { - url = "http://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz"; + url = "https://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz"; sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh"; }; @@ -47,7 +47,7 @@ stdenv.mkDerivation { + ":${perlldap}/${perl.libPrefix}"; meta = { - homepage = "http://www.spinnaker.de/lbdb/"; + homepage = "https://www.spinnaker.de/lbdb/"; license = licenses.gpl2; platforms = platforms.all; description = "The Little Brother's Database"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lnav/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lnav/default.nix index aab980d76e..9e5fad2698 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lnav/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lnav/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "tstack"; repo = "lnav"; rev = "v${meta.version}"; - sha256 = "0z8bsr0falxlkmd1b5gy871vyafyih0sw7lgg858lqnbsy0q2m4i"; + sha256 = "1frdrr3yjlk2fns3ny0qbr30rpswhwlvv3kyhdl3l6a0q5cqaqsg"; inherit name; }; @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { curl ]; + postPatch = '' + sed -ie '/DUMP_INTERNALS/d' src/Makefile.am + ''; + preConfigure = '' ./autogen.sh ''; @@ -43,7 +47,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/tstack/lnav/releases"; license = licenses.bsd2; - version = "0.8.5"; + version = "0.9.0"; maintainers = with maintainers; [ dochang ma27 ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/logtop/default.nix b/third_party/nixpkgs/pkgs/tools/misc/logtop/default.nix new file mode 100644 index 0000000000..76c287fe39 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/logtop/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, ncurses, uthash, pkg-config }: + +stdenv.mkDerivation { + name = "logtop-0.7"; + + src = fetchFromGitHub { + rev = "a0935ab2e7056feb3e8a90f5129990c9b335a587"; + owner = "JulienPalard"; + repo ="logtop"; + sha256 = "1f8vk9gybldxvc0kwz38jxmwvzwangsvlfslpsx8zf04nvbkqi12"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ncurses uthash ]; + + installFlags = [ "DESTDIR=$(out)" ]; + + postConfigure = '' + substituteInPlace Makefile --replace /usr "" + ''; + + meta = with stdenv.lib; { + description = "Displays a real-time count of strings received from stdin."; + longDescription = '' + logtop displays a real-time count of strings received from stdin. + It can be useful in some cases, like getting the IP flooding your + server or the top buzzing article of your blog + ''; + license = licenses.bsd2; + homepage = "https://github.com/JulienPalard/logtop"; + platforms = platforms.unix; + maintainers = [ maintainers.starcraft66 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix index 415c55fb61..db8c40b6ff 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix @@ -26,6 +26,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Peltoche/lsd"; description = "The next gen ls command"; license = licenses.asl20; - maintainers = with maintainers; [ filalex77 marsam ]; + maintainers = with maintainers; [ filalex77 marsam zowoq ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix index 8e2503d06d..18b4405a46 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix @@ -8,28 +8,32 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "1abmg2zk1qipqdl1yfj8ibm1w8n7fazxqccsg1gq4xzlhhfp3m2l"; + sha256 = "01nsviw5nc5lb6z3j2yiymiwhiq719nwqpvqbyb5p65s98sph7yh"; }; - cargoSha256 = "0l750067x8k92ngg32bb8mnbq09aj65sdnpzdhij9n1mh90rkck9"; + cargoSha256 = "098p4645air5402shqignc57zdm6755shahhby17nqv1s27gfinc"; RUSTC_BOOTSTRAP = 1; nativeBuildInputs = [ pkg-config zlib ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + # Remove after https://github.com/NixOS/nixpkgs/pull/97000 lands into master + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + unset SDKROOT + ''; + meta = with stdenv.lib; { description = "For when you really just want to serve some files over HTTP right now!"; homepage = "https://github.com/svenstaro/miniserve"; license = with licenses; [ mit ]; maintainers = with maintainers; [ nequissimus zowoq ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/98181 }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/mysql2pgsql/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mysql2pgsql/default.nix index 829bb7f5be..e3f05e1a76 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mysql2pgsql/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Convert MySQL dump files to PostgreSQL-loadable files"; - homepage = "http://pgfoundry.org/projects/mysql2pgsql/"; + homepage = "https://pgfoundry.org/projects/mysql2pgsql/"; license = stdenv.lib.licenses.bsdOriginal; platforms = stdenv.lib.platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix new file mode 100644 index 0000000000..3322ed0c8a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix @@ -0,0 +1,61 @@ +{ stdenv +, go +, fetchurl +, curl +, perl +, genericUpdater +, writeShellScript +}: + +stdenv.mkDerivation rec { + pname = "nncp"; + version = "5.3.3"; + + src = fetchurl { + url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz"; + sha256 = "1l35ndzrvpfim29jn1p0bwmc8w892z44nsrdnay28k229r9dhz3h"; + }; + + nativeBuildInputs = [ go ]; + + preConfigure = '' + export GOCACHE=$PWD/.cache + ''; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "CFGPATH=/etc/nncp.hjson" + "SENDMAIL=/run/wrappers/bin/sendmail" + ]; + + passthru.updateScript = genericUpdater { + inherit pname version; + versionLister = writeShellScript "nncp-versionLister" '' + echo "# Versions for $1:" >> "$2" + ${curl}/bin/curl -s http://www.nncpgo.org/Tarballs.html | ${perl}/bin/perl -lne 'print $1 if /Release.*>([0-9.]+) starship.$shell + STARSHIP_CACHE=$TMPDIR $out/bin/starship completions $shell > starship.$shell installShellCompletion starship.$shell done ''; - cargoSha256 = "1b5gsw7jpiqjc7kbwf2kp6h6ks7jcgygrwzvn2akz86z40sskyg3"; + cargoSha256 = "0x9a322anwrgpxfqrvqb1ikavp8qffa93wdvj5kln1d2rgmxr2sy"; - preCheck = '' - substituteInPlace tests/testsuite/common.rs \ - --replace "./target/debug/starship" "./$releaseDir/starship" - substituteInPlace tests/testsuite/python.rs \ - --replace "#[test]" "#[test] #[ignore]" - ''; - - checkFlagsArray = [ "--skip=directory::home_directory" "--skip=directory::directory_in_root" ]; + checkFlags = [ + "--skip=directory_in_home" + "--skip=fish_directory_in_home" + "--skip=home_directory" + "--skip=truncated_directory_in_home" + "--skip=directory_in_root" + ]; meta = with stdenv.lib; { description = "A minimal, blazing fast, and extremely customizable prompt for any shell"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix index 8490771ad8..0c7e0141f9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "svtplay-dl"; - version = "2.4"; + version = "2.6"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "146ss7pzh61yw84crk6hzfxkfdnf6bq07m11b6lgsw4hsn71g59w"; + sha256 = "1d969ig4w6irx5822crhpab2f53svpiyf1vfx87irapy309dqy2y"; }; pythonPaths = [ pycrypto pyyaml requests ]; @@ -24,6 +24,9 @@ in stdenv.mkDerivation rec { postPatch = '' substituteInPlace scripts/run-tests.sh \ --replace 'PYTHONPATH=lib' 'PYTHONPATH=lib:$PYTHONPATH' + + sed -i '/def test_sublang2\?(/ i\ @unittest.skip("accesses network")' \ + lib/svtplay_dl/tests/test_postprocess.py ''; makeFlags = [ "PREFIX=$(out)" "SYSCONFDIR=$(out)/etc" "PYTHON=${python.interpreter}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix b/third_party/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix index 8433866928..aae69d8ad3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "systrayhelper"; - version = "0.0.4"; + version = "0.0.5"; rev = "ded1f2ed4d30f6ca2c89a13db0bd3046c6d6d0f9"; goPackagePath = "github.com/ssbc/systrayhelper"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "ssbc"; repo = "systrayhelper"; - sha256 = "1iq643brha5q6w2v1hz5l3d1z0pqzqr43gpwih4cnx3m5br0wg2k"; + sha256 = "0bn3nf43m89qmh8ds5vmv0phgdz32idz1zisr47jmvqm2ky1a45s"; }; # re date: https://github.com/NixOS/nixpkgs/pull/45997#issuecomment-418186178 diff --git a/third_party/nixpkgs/pkgs/tools/misc/vivid/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vivid/default.nix index c8831a6fca..7074628798 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vivid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vivid/default.nix @@ -2,24 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "vivid"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "00xxk1ipr3hndd717q52j7s2wfxis1p4glaa9lvp72gwwzmv5k9w"; + sha256 = "0m928hy2q8byfpm55nziiz86gcnhdnw3zpj78d8wx0pp318zjbla"; }; - postPatch = '' - substituteInPlace src/main.rs --replace /usr/share $out/share - ''; + cargoSha256 = "10xddr5cccc5cmhn4kwi27h3krmgapd7bqcp4rhjlbhdhsw7qxkx"; - cargoSha256 = "1l34i7qalid9mlcbpqhbb2bxgn2ylb2lwki4c0hf4kkq646ql0n1"; - - postInstall = '' - mkdir -p $out/share/${pname} - cp -rv config/* themes $out/share/${pname} + # Remove after https://github.com/NixOS/nixpkgs/pull/97000 lands into master + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + unset SDKROOT ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/watchexec/default.nix b/third_party/nixpkgs/pkgs/tools/misc/watchexec/default.nix index 8e3db232fe..728cdd0c17 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/watchexec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/watchexec/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "watchexec"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0nvd8x60nkk8izqy8m8m1fi0x48s9sjh4zfl8d2ig46lqc8n5cpm"; + sha256 = "0m4hipjgg64572lzqy9hz4iq9c4awc93c9rmnpap5iyi855x7idj"; }; - cargoSha256 = "08pv7nr471apzy77da1pffdmx2dgf5mbj09302cfmf8sj49saal6"; + cargoSha256 = "0035pqr61mdx699hd4f8hnxknvsdg67l6ys7gxym3fzd9dcmqqff"; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/xdummy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/xdummy/default.nix index 7d7942f7ca..227829346c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/xdummy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/xdummy/default.nix @@ -1,4 +1,5 @@ -{ writeText, writeScriptBin, xorg, xkeyboard_config, runtimeShell }: +{ writeText, writeScriptBin, xorg, xkeyboard_config, runtimeShell +, unfreeFonts ? false, lib}: let xorgConfig = writeText "dummy-xorg.conf" '' @@ -23,11 +24,13 @@ let XkbDir "${xkeyboard_config}/share/X11/xkb" FontPath "${xorg.fontadobe75dpi}/lib/X11/fonts/75dpi" FontPath "${xorg.fontadobe100dpi}/lib/X11/fonts/100dpi" + FontPath "${xorg.fontmiscmisc}/lib/X11/fonts/misc" + FontPath "${xorg.fontcursormisc}/lib/X11/fonts/misc" + ${lib.optionalString unfreeFonts '' FontPath "${xorg.fontbhlucidatypewriter75dpi}/lib/X11/fonts/75dpi" FontPath "${xorg.fontbhlucidatypewriter100dpi}/lib/X11/fonts/100dpi" FontPath "${xorg.fontbh100dpi}/lib/X11/fonts/100dpi" - FontPath "${xorg.fontmiscmisc}/lib/X11/fonts/misc" - FontPath "${xorg.fontcursormisc}/lib/X11/fonts/misc" + ''} EndSection Section "Module" diff --git a/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix index 1048b3e498..58bb1e3e39 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix @@ -2,28 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bandwhich"; - version = "0.18.1"; + version = "0.19.0"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; rev = version; - sha256 = "0qzmkhrg7pqgblmva7xcww6zc4rryba6kkfkhj05mvd31z3c1rz8"; + sha256 = "0963yfbf88hb5fvyckhs1vfvib5skkj9n17qibpv5vsdlynbaa96"; }; - cargoSha256 = "0iakw42nip0vxq50jjk73r0xl7xp426szb091ap4isad3zxq6saj"; - cargoPatches = [ - # Fixes rDNS support for systems using `systemd-networkd` from v246. - # See https://github.com/imsnif/bandwhich/pull/184 for context - (fetchpatch { - url = "https://github.com/imsnif/bandwhich/commit/19e485a1ce9f749c121d235147e3117cc847379e.patch"; - sha256 = "03hg73gwlfq0l36k3aq7cfak3js7j05ssfpdbfiiwqq7lynm83jr"; - }) - (fetchpatch { - url = "https://github.com/imsnif/bandwhich/commit/35f03b716832fba9a735628d1c728d3e305f75c8.patch"; - sha256 = "1bv837wc1dgg26s640f3lfya28ypnjs0675dykzxxxv5y9ns58l3"; - }) - ]; + cargoSha256 = "0xp45kb0z7wiq6vnws4q7khbzslywh24sb43ssr39l1rajf7w64r"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dropbear/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dropbear/default.nix index dcb05eb848..b80eba3f6c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dropbear/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dropbear/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] ++ lib.optionals enableStatic [ glibc.static zlib.static ]; meta = with stdenv.lib; { - homepage = "http://matt.ucc.asn.au/dropbear/dropbear.html"; + homepage = "https://matt.ucc.asn.au/dropbear/dropbear.html"; description = "A small footprint implementation of the SSH 2 protocol"; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix index a998b25e3e..6bc05139f8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "1z914p20n3i1bf4hx5iq2fylx1s49knb70cbg53ji2n7nrm1q33r"; + sha256 = "1f0cr7211wkam1204x6gsflhw7gc995lia3jq4v6n3ijfwy5vyvm"; }; - vendorSha256 = "0pi661mb5vwj16wwxnyx9b0ic7gzby6qfs3y4w00agn6sn5nahx2"; + vendorSha256 = "1ym4qcqgbbj6pa4cgmxmny7krxwjfl8l02hb3r5jh9qj886fwhdr"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix index fa364dc4ea..8a8ed25a5a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, makeWrapper, gstreamer +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, makeWrapper, gstreamer , gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, libupnp }: let @@ -19,6 +19,14 @@ in sha256 = "14i5jrry6qiap5l2x2jqj7arymllajl3wgnk29ccvr8d45zp4jn1"; }; + patches = [ + (fetchpatch { + url = "https://github.com/hzeller/gmrender-resurrect/commit/dc8c4d4dc234311b3099e7f1efadf5d9733c81e9.patch"; + sha256 = "0fqi58viaq9jg5h5j1725qrach4c3wmfmh0q43q4r8az2pn7dszw"; + name = "libupnp.patch"; + }) + ]; + buildInputs = [ gstreamer libupnp ]; nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix b/third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix index e4f2f16857..2418d7e90c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix @@ -34,12 +34,14 @@ buildPythonApplication rec { sed -i "s/'request.*'/'requests >= 2.2'/" setup.py ''; + # test_timeit2 is flakey, and depends sleep being precise to the milisecond checkPhase = '' ${lib.optionalString stdenv.isDarwin '' # network tests fails on darwin rm tests/test_network.py ''} - pytest --ignore=tests/checker/{test_telnet,telnetserver}.py -k 'not TestLoginUrl' + pytest --ignore=tests/checker/{test_telnet,telnetserver}.py \ + -k 'not TestLoginUrl and not test_timeit2' ''; meta = { diff --git a/third_party/nixpkgs/pkgs/tools/networking/mozwire/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mozwire/default.nix index 6264672cfa..3f50ed41f4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mozwire/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mozwire/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "MozWire"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "NilsIrl"; repo = pname; rev = "v${version}"; - sha256 = "07icgswmfvrvlm3mkm78pbbk6m2hb73j7ffj7r77whzb11v027v1"; + sha256 = "0r3x8y1qxxkkac9lqgd0s339zbrm9zmir1f6qs0r5f0bw3ngzqc4"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - cargoSha256 = "10lhz7bdlfqj7wgsqnsxdfskms33pvj176fhf4kwci7nb8vgai4b"; + + cargoSha256 = "0hyps2wi4wmpllfams3p59jpccwa0ylgzxq7qdn6g6zvf0cajpc0"; meta = with stdenv.lib; { description = "MozillaVPN configuration manager giving Linux, macOS users (among others), access to MozillaVPN"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mtr/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mtr/default.nix index ae5695537a..6b8b2f9237 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mtr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mtr/default.nix @@ -1,27 +1,19 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config , libcap, ncurses -, withGtk ? false, gtk2 ? null }: +, withGtk ? false, gtk3 ? null }: -assert withGtk -> gtk2 != null; +assert withGtk -> gtk3 != null; stdenv.mkDerivation rec { pname = "mtr${lib.optionalString withGtk "-gui"}"; - version = "0.93"; + version = "0.94"; src = fetchFromGitHub { owner = "traviscross"; repo = "mtr"; rev = "v${version}"; - sha256 = "0n0zr9k61w7a9psnzgp7xnc7ll1ic2xzcvqsbbbyndg3v9rff6bw"; + sha256 = "0wnz87cr2lcl74bj8qxq9xgai40az3pk9k0z893scyc8svd61xz6"; }; - - patches = [ - # https://github.com/traviscross/mtr/pull/315 - (fetchpatch { - url = "https://github.com/traviscross/mtr/pull/315.patch?full_index=1"; - sha256 = "18qcsj9058snc2qhq6v6gdbqhz021gi5fgw9h7vfczv45gf0qasa"; - }) - ]; # we need this before autoreconfHook does its thing postPatch = '' @@ -36,10 +28,10 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional (!withGtk) "--without-gtk"; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ncurses ] - ++ stdenv.lib.optional withGtk gtk2 + ++ stdenv.lib.optional withGtk gtk3 ++ stdenv.lib.optional stdenv.isLinux libcap; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix index 178979b2ca..b3cd0d8302 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nebula"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "slackhq"; repo = pname; rev = "v${version}"; - sha256 = "0xrki9w83b4b3l5adq1rxz374f124wf388sdyvy7ngc3b04k7qlb"; + sha256 = "08pjzlqck9524phsmqjwg6237vj1mmwsynkxivnahv1vhwyy9awz"; }; - vendorSha256 = "094mn1r69c40w7k3lsggjh0dpws9l0j7mgiyjy1lpblkvkyk2azm"; + vendorSha256 = "1g6wk5sydxbzpx62k4bdq4qnyk98mn1pljgi5hbffj01ipd82kq8"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix b/third_party/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix index 4204ba1fcd..4b46d63ced 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix @@ -4,13 +4,13 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "networkmanager_dmenu"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "firecat53"; repo = "networkmanager-dmenu"; rev = "${version}"; - sha256 = "1msk4zkm4042av61rgbwc62i62vnv9py93fm1bczmw0b1f54qpmk"; + sha256 = "1liidqh8c33pxyb07qyj0jkd0fdak73g9r2iwiq62vfzrpik09k0"; }; buildInputs = [ glib python pygobject3 gobject-introspection networkmanager python3Packages.wrapPython ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/olsrd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/olsrd/default.nix index bc5a035801..3f83081df5 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/olsrd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/olsrd/default.nix @@ -1,14 +1,25 @@ -{ stdenv, fetchurl, bison, flex }: +{ stdenv, fetchFromGitHub, fetchpatch, bison, flex }: stdenv.mkDerivation rec { pname = "olsrd"; - version = "0.9.6.1"; + version = "0.9.8"; - src = fetchurl { - url = "http://www.olsr.org/releases/0.9/${pname}-${version}.tar.bz2"; - sha256 = "9cac290e9bff5fc7422110b9ccd972853f10962c962d2f31a63de9c6d1520612"; + src = fetchFromGitHub { + owner = "OLSR"; + repo = pname; + rev = "v${version}"; + sha256 = "1xk355dm5pfjil1j4m724vkdnc178lv6hi6s1g0xgpd59avbx90j"; }; + patches = [ + # remove if there's ever an upstream release that incorporates + # https://github.com/OLSR/olsrd/pull/87 + (fetchpatch { + url = "https://raw.githubusercontent.com/openwrt-routing/packages/b3897386771890ba1b15f672c2fed58630beedef/olsrd/patches/011-bison.patch"; + sha256 = "04cl4b8dpr1yjs7wa94jcszmkdzpnrn719a5m9nhm7lvfrn1rzd0"; + }) + ]; + buildInputs = [ bison flex ]; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix index 40fc9e9066..0a1680bfdb 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix @@ -1,34 +1,48 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, openssl, ppp, pkgconfig }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig +, openssl, ppp +, systemd ? null }: -with stdenv.lib; +let + withSystemd = stdenv.isLinux && !(systemd == null); -let repo = "openfortivpn"; - version = "1.14.1"; - -in stdenv.mkDerivation { - name = "${repo}-${version}"; +in +stdenv.mkDerivation rec { + pname = "openfortivpn"; + version = "1.14.1"; src = fetchFromGitHub { owner = "adrienverge"; - inherit repo; + repo = pname; rev = "v${version}"; sha256 = "1r9lp19fmqx9dw33j5967ydijbnacmr80mqnhbbxyqiw4k5c10ds"; }; + # we cannot write the config file to /etc and as we don't need the file, so drop it + postPatch = '' + substituteInPlace Makefile.am \ + --replace '$(DESTDIR)$(confdir)' /tmp + ''; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ openssl ppp ]; - NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; + buildInputs = [ + openssl ppp + ] + ++ lib.optional withSystemd systemd; - configureFlags = [ "--with-pppd=${ppp}/bin/pppd" ]; + configureFlags = [ + "--sysconfdir=/etc" + "--with-pppd=${ppp}/bin/pppd" + ] + ++ lib.optional withSystemd "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Client for PPP+SSL VPN tunnel services"; homepage = "https://github.com/adrienverge/openfortivpn"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.madjar ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = licenses.gpl3; + maintainers = with maintainers; [ madjar ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix b/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix index 264c6fd4e1..6ecc9f7ba1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix @@ -10,28 +10,15 @@ assert client -> libX11 != null; stdenv.mkDerivation rec { pname = "amule"; - version = "2.3.2"; + version = "unstable-20201006"; src = fetchFromGitHub { owner = "amule-project"; repo = "amule"; - rev = version; - sha256 = "010wxm6g9f92x6fympj501zbnjka32rzbx0sk3a2y4zpih5d2nsn"; + rev = "6f8951527eda670c7266984ce476061bfe8867fc"; + sha256 = "12b44b6hz3mb7nsn6xhzvm726xs06xcim013i1appif4dr8njbx1"; }; - patches = [ - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/amule-project/amule/pull/135.patch"; - sha256 = "1n24r1j28083b8ipbnh1nf6i4j6vx59pdkfl1c0g6bb4psx9wvvi"; - name = "libupnp_18.patch"; - }) - (fetchpatch { - name = "amule-cryptopp_6.patch"; - url = "https://github.com/amule-project/amule/commit/27c13f3e622b8a3eaaa05bb62b0149604bdcc9e8.patch"; - sha256 = "0kq095gi3xl665wr864zlhp5f3blk75pr725yany8ilzcwrzdrnm"; - }) - ]; - postPatch = '' substituteInPlace src/libs/ec/file_generator.pl \ --replace /usr/bin/perl ${perl}/bin/perl diff --git a/third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix index 62a9aaf216..ca40012433 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix @@ -2,14 +2,13 @@ stdenv.mkDerivation rec { pname = "smartdns"; - version = - "30"; # This would be used later in the next release as the FHS commit integrated into realse 31. + version = "33"; src = fetchFromGitHub { owner = "pymumu"; repo = pname; - rev = "3ad7cd7f454eec2fbdf338c0eb0541da301f1e73"; - sha256 = "1y9p8gxpj2k4a10maggkxg8l55jvr7x1wyxi69waxf56ggh2dvv0"; + rev = "Release${version}"; + sha256 = "0cmzpm4y1yi96mg2cz2byqw6vl62dgnikldy08q43vi7jl3y0749"; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix new file mode 100644 index 0000000000..07cc5da960 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk2, openssh }: + +stdenv.mkDerivation rec { + pname = "ssh-askpass-fullscreen"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "atj"; + repo = pname; + rev = "v${version}"; + sha256 = "1zldhylln412974cnxyqcrrc6b4ry3m9s5ijq3dnwz2g7nz1bx9d"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + gtk2 + openssh + ]; + + meta = with stdenv.lib; { + description = "A small SSH askpass GUI using GTK+2"; + homepage = "https://github.com/atj/ssh-askpass-fullscreen"; + license = licenses.gpl2; + maintainers = with maintainers; [ caadar ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/sshping/default.nix b/third_party/nixpkgs/pkgs/tools/networking/sshping/default.nix index 20f0eaa7e4..aa3e57d53f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/sshping/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/sshping/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libssh ]; buildPhase = '' - g++ -Wall -I ext/ -o bin/sshping src/sshping.cxx -lssh + $CXX -Wall -I ext/ -o bin/sshping src/sshping.cxx -lssh ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix b/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix index 90cd64b83a..d5ecae75eb 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yggdrasil"; - version = "0.3.14"; + version = "0.3.15"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "147kl2kvv1rn3yk0mlvd998a2yayjl07csxxkjvs6264j6csb860"; + sha256 = "1nf00ygp55l01c0gdkw15f08p3hmn6s2r99lgf2xpq8jn75qra4i"; }; - vendorSha256 = "09xv2p9rydnsb185x61fxhyjqx41wz285c1gdd47ad3s08ay1qc7"; + vendorSha256 = "1zk6h1isxyml9asyb7g4scbhnfwghqwnv40a5f5j7z0s0s4nybdp"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix index b3449566d4..3115b720b6 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - sha256 = "19jnvsbddn52ibjv48jyfss25gg9mmvxzfhbr7s7bqyf3bq68jbm"; + hash = "sha256:0fh1lq793k4ddpqsf2av447hcb74vcq53afkm3g4672k48mjjw1y"; }; - cargoSha256 = "0b06jsilj87rnr1qlarn29hnz0i9p455fdxg6nf6r2fli2xpv1f0"; + cargoSha256 = "1h1sy54p7zxijydnhzvkxli90d72biv1inni17licb0vb9dihmnf"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; 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 5d3d8e15e3..c794566e19 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.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "15d21qv8cbzwpz2gsq1cgvxdbqm45zq2wfphhjqq77z1kay43m3f"; + sha256 = "0ihx6hrzs7wkdz9wzgarmm73dz1fb2bhssmxrgv5nzmkhygn4xfy"; }; - cargoSha256 = "0xd1b0rfrf3a6j0xkyfqz2pd0lkb6dpqyyghli9a8kh0kdfxvndj"; + cargoSha256 = "0yqg2hagsjaxvrj96qg6k1llkmqdqp792c2844h7fhnhlx6v2wd2"; meta = with lib; { description = "Mirror installed software on multiple machines"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix index 18a1da8ce5..2ecc64a09b 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "0jmxafvxzqg65zg5cnjd2nsz1mmw06mc7qz3lbs5h2gkxiah8264"; + sha256 = "0hg15k9bz5iw7mv4m31rg4f5anfiirr3vjvy16z532vwfh05ixw3"; }; - vendorSha256 = "0yvzwbm0xb1h45x96h658avbjz9w79aaa6z042xpvjqc4wsr8155"; + vendorSha256 = "032l0xrf4ny4ildinxlfjy8sslhcl2krmgnm07dnx999jxlswxym"; doCheck = false; 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 935f6553f9..89be8b5842 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.4.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - sha256 = "0kca4442mla8j9980gi8kgp0vgm0f15hcjd0w0wdj8rlmkx9yf2l"; + sha256 = "0qc2m2nr7w7sgpg3yzwfxxpqi9acnw46kj2hlalg5ldjffiqdjxa"; }; makeWrapperArgs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/1password-gui/default.nix b/third_party/nixpkgs/pkgs/tools/security/1password-gui/default.nix index ad3bb6eeb1..94549c2e77 100644 --- a/third_party/nixpkgs/pkgs/tools/security/1password-gui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/1password-gui/default.nix @@ -13,11 +13,11 @@ in stdenv.mkDerivation rec { pname = "1password"; - version = "0.8.7"; + version = "0.8.9"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - sha256 = "1101q5yavzl8imf8gqa3h929gcyy6lh7dy2dw0zs52qdcrb4z49j"; + sha256 = "0gmflx7psyajxx6g82lrhmfwnh306sixwd1hykrn2xl3ncw65ydr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/chipsec/default.nix b/third_party/nixpkgs/pkgs/tools/security/chipsec/default.nix index 5dccf29506..0f162347cc 100644 --- a/third_party/nixpkgs/pkgs/tools/security/chipsec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/chipsec/default.nix @@ -11,6 +11,8 @@ pythonPackages.buildPythonApplication rec { sha256 = "1rxr9i08a22m15slvlkrhnki30jixi2ds096kmmc2nqzfr9yibmb"; }; + disabled = !stdenv.isLinux; + nativeBuildInputs = [ nasm libelf ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/eid-mw/default.nix b/third_party/nixpkgs/pkgs/tools/security/eid-mw/default.nix index 1fdd5b9a72..a55c1d8db6 100644 --- a/third_party/nixpkgs/pkgs/tools/security/eid-mw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/eid-mw/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub , autoreconfHook, pkgconfig , gtk3, nssTools, pcsclite -, libxml2, libproxy +, libxml2, libproxy , openssl, curl , makeWrapper , substituteAll }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { --replace "modutil" "${nssTools}/bin/modutil" rm $out/bin/about-eid-mw - wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name" + wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name" ''; enableParallelBuilding = true; @@ -58,11 +58,11 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Belgian electronic identity card (eID) middleware"; - homepage = "http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/"; + homepage = "https://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/"; license = licenses.lgpl3; longDescription = '' Allows user authentication and digital signatures with Belgian ID cards. - Also requires a running pcscd service and compatible card reader. + Also requires a running pcscd service and compatible card reader. eid-viewer is also installed. diff --git a/third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix b/third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix index fc81a39507..63752b5f12 100644 --- a/third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxdumptool"; - version = "6.1.1"; + version = "6.1.2"; src = fetchFromGitHub { owner = "ZerBea"; repo = "hcxdumptool"; rev = version; - sha256 = "0v6dq6x2mrmavazknmhb08ks53773sll367anfrrramild8350bh"; + sha256 = "0y73a5p23rg4zx6vkgpq1p3j2dzqcvzwn1ymswfkqm5zihbi17d7"; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix b/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix index 191b4f3515..b61a39d603 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kbs2"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "woodruffw"; repo = pname; rev = "v${version}"; - sha256 = "1hjcx651nqj1plxw4i2nv72zc0igd8pl31dy2zwm5yyky6dl7qla"; + sha256 = "1zyggdsnxzdbfyxk5jcx9r4ra049ddb51krc81s6nik27d5nivmf"; }; - cargoSha256 = "11fw097r4mim3rgb0db7naqlf3ws0bavqdd4z84mpdg6714dga0n"; + cargoSha256 = "0yxqn8jhcj4rxp0g77jsdp02g5qbc0axaaz1j4gp1bkcww6a9k7v"; nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/nmap/default.nix b/third_party/nixpkgs/pkgs/tools/security/nmap/default.nix index bd54315449..f03a794b68 100644 --- a/third_party/nixpkgs/pkgs/tools/security/nmap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/nmap/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; - version = "7.80"; + version = "7.90"; src = fetchurl { url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "1aizfys6l9f9grm82bk878w56mg0zpkfns3spzj157h98875mypw"; + sha256 = "1s20i84m9bci70lrl0p2j7h3kpbi9snmvyhc3lzc9s3mh92w6msm"; }; patches = [ ./zenmap.patch ] 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 62f4c3e855..02e38bbe24 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 @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SCM Microsystems SCL011 chipcard reader user space driver"; - homepage = "http://www.scm-pc-card.de/index.php?lang=en&page=product&function=show_product&product_id=630"; + homepage = "https://www.scm-pc-card.de/index.php?lang=en&page=product&function=show_product&product_id=630"; downloadPage = "https://support.identiv.com/scl010-scl011/"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ sephalon ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/phrasendrescher/default.nix b/third_party/nixpkgs/pkgs/tools/security/phrasendrescher/default.nix index 71a9824bb6..f62288c062 100644 --- a/third_party/nixpkgs/pkgs/tools/security/phrasendrescher/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/phrasendrescher/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A modular and multi processing pass phrase cracking tool"; - homepage = "http://leidecker.info/projects/phrasendrescher/index.shtml"; + homepage = "https://leidecker.info/projects/phrasendrescher/index.shtml"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ bjornfor ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/pinentry/default.nix b/third_party/nixpkgs/pkgs/tools/security/pinentry/default.nix index e6d07888d1..a72e8f9f5b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pinentry/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pinentry/default.nix @@ -2,7 +2,7 @@ , libgpgerror, libassuan, qtbase, wrapQtAppsHook , ncurses, gtk2, gcr , libcap ? null, libsecret ? null -, enabledFlavors ? [ "curses" "tty" "gtk2" "qt" "gnome3" "emacs" ] +, enabledFlavors ? [ "curses" "tty" "gtk2" "qt" "emacs" ] ++ lib.optionals stdenv.isLinux [ "gnome3" ] }: with stdenv.lib; diff --git a/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix b/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix index 9eb670102f..dd7d96c361 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix @@ -1,11 +1,12 @@ { lib +, stdenv , rustPlatform , fetchCrate , pinentry , openssl , pkgconfig , makeWrapper -, cargo +, Security # rbw-fzf , withFzf ? false, fzf, perl @@ -34,9 +35,11 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + postPatch = '' substituteInPlace src/pinentry.rs \ - --replace "Command::new(\"pinentry\")" "Command::new(\"${pinentry}/bin/pinentry\")" + --replace 'Command::new("pinentry")' 'Command::new("${pinentry}/${pinentry.binaryPath or "bin/pinentry"}")' '' + lib.optionalString withFzf '' patchShebangs bin/rbw-fzf substituteInPlace bin/rbw-fzf \ diff --git a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix index c535bf7067..a3a76dd7b8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.3.6"; + version = "0.4.4.5"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "0qmcrkjip0ywq77232m73pjwqiaj0q2klwklqlpbw575shvhcbba"; + sha256 = "09lr6l98qmc69pzsi8r02z86v969dbfwjrwphfm3npknzq5a0p54"; }; outputs = [ "out" "geoip" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix index eb999b5ced..9e5f48c46f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "149if5s4rdpxgzakh8s79j1fcfcqk1w7gvgchc044xlicl1r49ic"; + sha256 = "0bin0r0qmyz8xal910csbclzc6ng2xv69jszyi69gd6n6f43vqw8"; }; goPackagePath = "github.com/hashicorp/vault"; diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix b/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix index b8a70eb82f..457d45111a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix @@ -1,30 +1,30 @@ { stdenv, fetchurl, unzip }: let - version = "1.5.3"; + version = "1.5.4"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "1chhi7piq04j8rgk15rcszqqp37xd9cjj67plr5pgvdps3s1zihy"; + sha256 = "1cyk9v70w0px2sxg8dichqgk38br9hc4kdl37jk57ci5gdl6w5ah"; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "0jbnvypapang025wfyj6i70jdz3g29ggg7rzmg8xh6gfyhwk3vmb"; + sha256 = "1n6hmhd4g2c6zzbimslxpghma5dyqwb96w60srbf9gn2vrimg4l4"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "1m54258lfdr79p2j8janbkhp0a8bs8xbrcr51lqx2s620n7sfbya"; + sha256 = "05d5m8kdwl6mcx3swkasm5zcmddlyl6m9lwj26vbg9pllx9zxvqm"; }; i686-darwin = fetchurl { url = "${base}/vault_${version}_darwin_386.zip"; - sha256 = "038qkkhlwj86fz9vpcycvv5nb41y8mqypqvhfp0ia11birp8xlsr"; + sha256 = "109hisdwd58za541qhw61bscfrh3szzfn8vdmr4c7nh5praiqznb"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "1vivkwcy9j9zs7w65k7y8chix8jnii5pz8zck6rlpwgz5vs0h04k"; + sha256 = "0q8icl5ncvixrdmsd2ilzvpa6c1pswa6zgh3vccsj7sg8mxprjmr"; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix b/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix new file mode 100644 index 0000000000..498ab1136f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, rustPlatform, darwin }: + +rustPlatform.buildRustPackage rec { + pname = "bottom"; + version = "0.4.7"; + + src = fetchFromGitHub { + owner = "ClementTsang"; + repo = pname; + rev = version; + sha256 = "rDcJ5XF7L13MKZ8/J4sYD+UqC+HkZvxRtDkY9IVLH50="; + }; + + buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; + + cargoSha256 = "XeX6QM0a628mcaptNZkKAvDnGfW5tx+aWNBpMyjz44M="; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A cross-platform graphical process/system monitor with a customizable interface"; + homepage = "https://github.com/ClementTsang/bottom"; + license = licenses.mit; + maintainers = with maintainers; [ berbiche ]; + platforms = platforms.unix; + }; +} + diff --git a/third_party/nixpkgs/pkgs/tools/system/htop/default.nix b/third_party/nixpkgs/pkgs/tools/system/htop/default.nix index fe4622f338..29f361195d 100644 --- a/third_party/nixpkgs/pkgs/tools/system/htop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/htop/default.nix @@ -1,27 +1,27 @@ { lib, fetchFromGitHub, stdenv, autoreconfHook -, ncurses, IOKit, python3 +, ncurses, IOKit }: stdenv.mkDerivation rec { pname = "htop"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "htop-dev"; repo = pname; rev = version; - sha256 = "0kjlphdvwwbj91kk91s4ksc954d3c2bznddzx2223jmb1bn9rcsa"; + sha256 = "1qmqhbnc5yw4brd24yrp85k09770c1c00nl03mkv5pdz2bvqivk7"; }; - nativeBuildInputs = [ autoreconfHook python3 ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; meta = with stdenv.lib; { description = "An interactive process viewer for Linux"; - homepage = "https://hisham.hm/htop/"; - license = licenses.gpl2Plus; + homepage = "https://htop.dev"; + license = licenses.gpl2Only; platforms = with platforms; linux ++ freebsd ++ openbsd ++ darwin; maintainers = with maintainers; [ rob relrod ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix b/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix index 4a59facb27..f19f50e5e3 100644 --- a/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix @@ -22,13 +22,13 @@ let ++ recommendedDisplayInformationPrograms; in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.1.06-1"; + version = "3.1.07-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "11z90x7rwzm7krkcnmcs9f41i1d284vrj0aqk2xnvl3p79vx25f7"; + sha256 = "0hs4m2vmfc6srscaz72r6zpkn6n7msgzlps376ks38gj1l103xfn"; }; buildInputs = [ perl makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/minijail/default.nix b/third_party/nixpkgs/pkgs/tools/system/minijail/default.nix index 2f5adc3f4c..fac934f7bb 100644 --- a/third_party/nixpkgs/pkgs/tools/system/minijail/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/minijail/default.nix @@ -11,12 +11,12 @@ in stdenv.mkDerivation rec { pname = "minijail"; - version = "14"; + version = "16"; src = fetchFromGitiles { url = "https://android.googlesource.com/platform/external/minijail"; rev = "linux-v${version}"; - sha256 = "00dq854n4zg3ca2b46f90k15n32zn2sgabi76mnq2w985k9v977n"; + sha256 = "0pxazds3w12c30msq6bxs4a9cbds0dkj6n3ca0i1wqvgz864yrgs"; }; nativeBuildInputs = diff --git a/third_party/nixpkgs/pkgs/tools/system/opencl-info/default.nix b/third_party/nixpkgs/pkgs/tools/system/opencl-info/default.nix index a5013a6888..34295c90ae 100644 --- a/third_party/nixpkgs/pkgs/tools/system/opencl-info/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/opencl-info/default.nix @@ -10,6 +10,14 @@ stdenv.mkDerivation { sha256 = "114lxgnjg40ivjjszkv4n3f3yq2lbrvywryvbazf20kqmdz7315l"; }; + patches = [ + # The cl.hpp header was removed from opencl-clhpp. This patch + # updates opencl-info to use the new cp2.hpp header. + # + # Submitted upstream: https://github.com/marchv/opencl-info/pull/2 + ./opencl-info-clhpp2.diff + ]; + buildInputs = [ opencl-clhpp ocl-icd ]; NIX_LDFLAGS = "-lOpenCL"; diff --git a/third_party/nixpkgs/pkgs/tools/system/opencl-info/opencl-info-clhpp2.diff b/third_party/nixpkgs/pkgs/tools/system/opencl-info/opencl-info-clhpp2.diff new file mode 100644 index 0000000000..013222beeb --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/opencl-info/opencl-info-clhpp2.diff @@ -0,0 +1,22 @@ +diff --git a/opencl-info.cpp b/opencl-info.cpp +index a23015d..a6de0c1 100644 +--- a/opencl-info.cpp ++++ b/opencl-info.cpp +@@ -7,7 +7,7 @@ + #if defined(__APPLE__) || defined(__MACOSX) + # include + #else +-# include ++# include + #endif + + #include +@@ -130,7 +130,7 @@ int main() { + PconstEnd; + P(device, CL_DEVICE_LOCAL_MEM_SIZE); + Pbool(device, CL_DEVICE_ERROR_CORRECTION_SUPPORT); +- Pbool(device, CL_DEVICE_HOST_UNIFIED_MEMORY); ++ // Pbool(device, CL_DEVICE_HOST_UNIFIED_MEMORY); /* Deprecated in 2.0 */ + P(device, CL_DEVICE_PROFILING_TIMER_RESOLUTION); + Pbool(device, CL_DEVICE_ENDIAN_LITTLE); + Pbool(device, CL_DEVICE_AVAILABLE); diff --git a/third_party/nixpkgs/pkgs/tools/system/pciutils/default.nix b/third_party/nixpkgs/pkgs/tools/system/pciutils/default.nix index 1814d4b976..cf6616417e 100644 --- a/third_party/nixpkgs/pkgs/tools/system/pciutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/pciutils/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, zlib, kmod, which , static ? stdenv.targetPlatform.isStatic +, darwin ? null }: stdenv.mkDerivation rec { @@ -11,7 +12,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ zlib kmod which ]; + buildInputs = [ zlib kmod which ] ++ + stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; + + preConfigure = if stdenv.cc.isGNU then null else '' + substituteInPlace Makefile --replace 'CC=$(CROSS_COMPILE)gcc' "" + ''; makeFlags = [ "SHARED=${if static then "no" else "yes"}" diff --git a/third_party/nixpkgs/pkgs/tools/system/systemd-journal2gelf/default.nix b/third_party/nixpkgs/pkgs/tools/system/systemd-journal2gelf/default.nix index 3f23624071..d10cbb197c 100644 --- a/third_party/nixpkgs/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "SystemdJournal2Gelf-unstable"; - version = "20190702"; + version = "20200813"; src = fetchFromGitHub { - rev = "b1aa5ff31307d11a3c9b4dd08c3cd6230d935ec5"; + rev = "d389dc8583b752cbd37c389a55a6c82200e47394"; owner = "parse-nl"; repo = "SystemdJournal2Gelf"; - sha256 = "13jyh34wprjixinmh6l7wj7lr1f6qy6nrjcf8l29a74mczbphnvv"; + sha256 = "0p38r5kdfcn6n2d44dygrs5xgv51s5qlsfhzzwn16r3n6x91s62b"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix b/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix index ae4e26e2ca..438681e172 100644 --- a/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "chroma"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "alecthomas"; repo = "chroma"; rev = "v${version}"; - sha256 = "066a6rdmf670d3v5sc7chbn7db09ldgxjympb03pcqwk644dixb1"; + sha256 = "1gwwfn26aipzzvyy466gi6r54ypfy3ylnbi8c4xwch9pkgw16w98"; }; vendorSha256 = "16cnc4scgkx8jan81ymha2q1kidm6hzsnip5mmgbxpqcc2h7hv9m"; diff --git a/third_party/nixpkgs/pkgs/tools/text/jsawk/default.nix b/third_party/nixpkgs/pkgs/tools/text/jsawk/default.nix index 4f2ad403e3..51075c2ce1 100644 --- a/third_party/nixpkgs/pkgs/tools/text/jsawk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/jsawk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, spidermonkey }: +{ stdenv, fetchFromGitHub, makeWrapper, spidermonkey_38 }: stdenv.mkDerivation { pname = "jsawk"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { mkdir -p $out/bin cp $src/jsawk $out/bin/ wrapProgram $out/bin/jsawk \ - --prefix PATH : "${spidermonkey}/bin" + --prefix PATH : "${spidermonkey_38}/bin" ''; meta = { diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix index 9cfdc9c9b7..0a5eae9047 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; rev = "v${version}"; - sha256 = "0rkl5k7a9a0vx06jqvbgki2bwag0ar2pcbg3qi88xnjnnmphzpzj"; + sha256 = "1566jabmvafv6aiw5nvb6y2zcnxc7pbb9dl3s4vi6mx21kqp68ag"; }; - cargoSha256 = "1zhlb6wnjnayq833h62nm3ndlhiz1qajw8w5ccc88b8q8m4ipd7c"; + cargoSha256 = "0sa1h3qzdhgk2h3wrc0kg0ajq6zbkvn1ry4672gfn3j9gpgvy2bb"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix b/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix index 4dcaed16bb..ab3eae1150 100644 --- a/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { highly interactive front-end (basexgui). Apart from two local standalone modes, BaseX offers a client/server architecture. ''; - homepage = "http://basex.org/"; + homepage = "https://basex.org/"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/sile/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/sile/default.nix index d61e97857c..1084ee37ea 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/sile/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/sile/default.nix @@ -38,11 +38,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.10.10"; + version = "0.10.11"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "0m7yyvw8ypz89rfx8nm70mf87l357w5qac73pmfgl84f24cbxh7g"; + sha256 = "0c4azy2iqcj5qg09caqzzjzvig5h0sjilkprphdxvg2bi7dr9g5c"; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix index 23432e1d46..34060ffb05 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix @@ -3,24 +3,23 @@ rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.1.15"; + version = "0.1.16"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; - sha256 = "0pzhdfsi4jsj9p5cv8ia4kc4inl7q7jsw694dfyxkcpka6ywyzsh"; + sha256 = "0dzqf67y4ci1vsl3zhmjkzfnf22w2bbk5w5qj2gryzrhp1q9ajyr"; }; - cargoSha256 = "017f1f49svx4inyv6xjx31lnb7dbl6gzwrrzpfz1gimqvdj2gm6j"; + cargoSha256 = "1p0wzylkw1gxaff0m47il7qa0dfflxdyshvkvdirvjidg5cam9bk"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontconfig harfbuzz openssl ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); - # tests fail due to read-only nix store - doCheck = false; + doCheck = true; meta = with stdenv.lib; { description = "Modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive"; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix index 1a71ae04d4..098ecb76d7 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -145,6 +145,7 @@ core = stdenv.mkDerivation rec { configureFlags = common.configureFlags ++ [ "--without-x" ] # disable xdvik and xpdfopen ++ map (what: "--disable-${what}") ([ + "chktex" "dvisvgm" "dvipng" # ghostscript dependency "luatex" "luajittex" "mp" "pmp" "upmp" "mf" # cairo would bring in X and more "xetex" "bibtexu" "bibtex8" "bibtex-x" "upmendex" # ICU isn't small @@ -271,6 +272,24 @@ core-big = stdenv.mkDerivation { #TODO: upmendex }; +chktex = stdenv.mkDerivation { + pname = "texlive-chktex.bin"; + inherit version; + + inherit (common) src; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ core/*kpathsea*/ ]; + + preConfigure = "cd texk/chktex"; + + configureFlags = common.configureFlags + ++ [ "--with-system-kpathsea" ]; + + enableParallelBuilding = true; +}; + + dvisvgm = stdenv.mkDerivation { pname = "texlive-dvisvgm.bin"; inherit version; diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wtype/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wtype/default.nix new file mode 100644 index 0000000000..a1c4744318 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/wayland/wtype/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub + +, meson +, ninja +, pkg-config + +, libxkbcommon +, wayland +}: + +stdenv.mkDerivation { + pname = "wtype"; + version = "2020-09-14"; + + src = fetchFromGitHub { + owner = "atx"; + repo = "wtype"; + rev = "74071228dea4047157ae82960a2541ecc431e4a1"; + sha256 = "1ncspxpnbwv1vkfmxs58q7aykjb6skaa1pg5sw5h798pss5j80rd"; + }; + + nativeBuildInputs = [ meson ninja pkg-config wayland ]; + buildInputs = [ libxkbcommon wayland ]; + + meta = with lib; { + description = "xdotool type for wayland"; + homepage = "https://github.com/atx/wtype"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ justinlovinger ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 3337b66e9f..645d70bc31 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -67,6 +67,7 @@ mapAliases ({ 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 + caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # added 2020-10-02 cantarell_fonts = cantarell-fonts; # added 2018-03-03 cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # added 2020-08-20 casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken."; @@ -97,6 +98,7 @@ mapAliases ({ d1x_rebirth = dxx-rebirth; # added 2018-04-25 d2x_rebirth = dxx-rebirth; # added 2018-04-25 dat = nodePackages.dat; + dbvisualizer = throw "dbvisualizer has been remove from nixpkgs, as it's unmaintained"; # added 2020-09-20 dbus_daemon = dbus.daemon; # added 2018-04-25 dbus_glib = dbus-glib; # added 2018-02-25 dbus_libs = dbus; # added 2018-04-25 @@ -173,6 +175,7 @@ mapAliases ({ gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 gnome_doc_utils = gnome-doc-utils; # added 2018-02-25 gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 + gnunet_git = throw "gnunet_git was removed due to gnunet becoming stable"; # added 2019-05-27 gnuradio-nacl = gr-nacl; # added 2019-05-27 gnuradio-gsm = gr-gsm; # added 2019-05-27 gnuradio-ais = gr-ais; # added 2019-05-27 @@ -596,6 +599,7 @@ mapAliases ({ tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03 tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03 tftp_hpa = tftp-hpa; # added 2015-04-03 + timescale-prometheus = promscale; # added 2020-09-29 tomcat85 = tomcat8; # added 2020-03-11 torbrowser = tor-browser-bundle-bin; # added 2017-04-05 torch = throw "torch has been removed, as the upstream project has been abandoned"; # added 2020-03-28 @@ -657,6 +661,7 @@ mapAliases ({ youtubeDL = youtube-dl; # added 2014-10-26 zdfmediathk = mediathekview; # added 2019-01-19 gnome_user_docs = gnome-user-docs; # added 2019-11-20 + spidermonkey = spidermonkey_68; # added 2020-09-30 # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 # branch-off diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 724b6f597c..c60cfea4e8 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -583,10 +583,7 @@ in acpica-tools = callPackage ../tools/system/acpica-tools { }; - act = callPackage ../development/tools/misc/act { - # go 1.15 cannot connect to docker-for-mac https://github.com/docker/for-mac/issues/4855 - buildGoModule = if stdenv.isDarwin then buildGo114Module else buildGoModule; - }; + act = callPackage ../development/tools/misc/act { }; actdiag = with python3.pkgs; toPythonApplication actdiag; @@ -845,6 +842,8 @@ in chamber = callPackage ../tools/admin/chamber { }; + charm = callPackage ../applications/misc/charm { }; + ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; @@ -1101,6 +1100,8 @@ in glyr = callPackage ../tools/audio/glyr { }; + google-amber = callPackage ../tools/graphics/amber { }; + hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; http2tcp = callPackage ../tools/networking/http2tcp { }; @@ -1528,12 +1529,9 @@ in ''; }); - caddy = callPackage ../servers/caddy { buildGoModule = buildGo114Module; }; # https://github.com/lucas-clemente/quic-go/issues/2614 - caddy1 = callPackage ../servers/caddy/v1.nix { buildGoModule = buildGo114Module; }; + caddy = callPackage ../servers/caddy { }; - # Traefik 2.2 uses go1.14, pinning can be removed with 2.3 - # https://github.com/containous/traefik/issues/7234#issuecomment-684950612 - traefik = callPackage ../servers/traefik { buildGoModule = buildGo114Module; }; + traefik = callPackage ../servers/traefik { }; calamares = libsForQt514.callPackage ../tools/misc/calamares { python = python3; @@ -1844,6 +1842,8 @@ in dosage = callPackage ../applications/graphics/dosage { }; + dot-merlin-reader = callPackage ../development/tools/ocaml/merlin/dot-merlin-reader.nix { }; + dozenal = callPackage ../applications/misc/dozenal { }; dpic = callPackage ../tools/graphics/dpic { }; @@ -2344,7 +2344,7 @@ in psstop = callPackage ../tools/system/psstop { }; - precice = callPackage ../development/libraries/precice { }; + precice = callPackage ../development/libraries/precice { python3 = python37; }; pueue = callPackage ../applications/misc/pueue { }; @@ -2398,6 +2398,8 @@ in bash-supergenpass = callPackage ../tools/security/bash-supergenpass { }; + swappy = callPackage ../applications/misc/swappy { gtk = gtk3; }; + sweep-visualizer = callPackage ../tools/misc/sweep-visualizer { }; syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {}; @@ -2459,6 +2461,8 @@ in libmaxminddb = null; }; + xmlsort = perlPackages.XMLFilterSort; + xmousepasteblock = callPackage ../tools/X11/xmousepasteblock { }; mar1d = callPackage ../games/mar1d { } ; @@ -2630,9 +2634,7 @@ in davix = callPackage ../tools/networking/davix { }; - cantata = libsForQt5.callPackage ../applications/audio/cantata { - inherit vlc; - }; + cantata = libsForQt5.callPackage ../applications/audio/cantata { }; can-utils = callPackage ../os-specific/linux/can-utils { }; @@ -3401,6 +3403,8 @@ in wob = callPackage ../tools/misc/wob { }; + wtype = callPackage ../tools/wayland/wtype { }; + wrangler = callPackage ../development/tools/wrangler { }; xkcdpass = with pythonPackages; toPythonApplication xkcdpass; @@ -4366,12 +4370,6 @@ in mpi = null; }; - hdf5_1_8 = callPackage ../tools/misc/hdf5/1_8.nix { - gfortran = null; - szip = null; - mpi = null; - }; - hdf5-mpi = appendToName "mpi" (hdf5.override { szip = null; mpi = pkgs.openmpi; @@ -5038,49 +5036,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; - netsurf = recurseIntoAttrs (let callPackage = newScope pkgs.netsurf; in rec { - # ui could be gtk, sixel or framebuffer. Note that console display (sixel) - # requires a terminal that supports `sixel` capabilities such as mlterm - # or xterm -ti 340 - ui = "sixel"; - - uilib = if ui == "gtk" then "gtk" else "framebuffer"; - - SDL = if ui == "gtk" then null else if ui == "sixel" then SDL_sixel else SDL; - - buildsystem = callPackage ../applications/misc/netsurf/buildsystem { }; - - libwapcaplet = callPackage ../applications/misc/netsurf/libwapcaplet { }; - - nsgenbind = callPackage ../applications/misc/netsurf/nsgenbind { }; - - libparserutils = callPackage ../applications/misc/netsurf/libparserutils { }; - - libnslog = callPackage ../applications/misc/netsurf/libnslog { }; - - libcss = callPackage ../applications/misc/netsurf/libcss { }; - - libhubbub = callPackage ../applications/misc/netsurf/libhubbub { }; - - libdom = callPackage ../applications/misc/netsurf/libdom { }; - - libnsbmp = callPackage ../applications/misc/netsurf/libnsbmp { }; - - libnsgif = callPackage ../applications/misc/netsurf/libnsgif { }; - - libnsfb = callPackage ../applications/misc/netsurf/libnsfb { }; - - libnsutils = callPackage ../applications/misc/netsurf/libnsutils { }; - - libsvgtiny = callPackage ../applications/misc/netsurf/libsvgtiny { }; - - libnspsl = callPackage ../applications/misc/netsurf/libnspsl { }; - - libutf8proc = callPackage ../applications/misc/netsurf/libutf8proc { }; - - browser = callPackage ../applications/misc/netsurf/browser { }; - - }); + netsurf = recurseIntoAttrs (callPackage ../applications/networking/browsers/netsurf { }); + netsurf-browser = netsurf.browser; netperf = callPackage ../applications/networking/netperf { }; @@ -5634,6 +5591,13 @@ in nabi = callPackage ../tools/inputmethods/nabi { }; + hime = callPackage ../tools/inputmethods/hime {}; + + hime-all = callPackage ../tools/inputmethods/hime { + enableChewing = true; + enableAnthy = true; + }; + nahid-fonts = callPackage ../data/fonts/nahid-fonts { }; namazu = callPackage ../tools/text/namazu { }; @@ -5745,13 +5709,13 @@ in nm-tray = libsForQt5.callPackage ../tools/networking/network-manager/tray.nix { }; newsboat = callPackage ../applications/networking/feedreaders/newsboat { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security Foundation; }; grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud17 nextcloud18 nextcloud19; + nextcloud17 nextcloud18 nextcloud19 nextcloud20; nextcloud-client = libsForQt514.callPackage ../applications/networking/nextcloud-client { }; @@ -6121,6 +6085,8 @@ in pacman = callPackage ../tools/package-management/pacman { }; + paco = callPackage ../development/compilers/paco { }; + padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { }; page = callPackage ../tools/misc/page { }; @@ -6501,7 +6467,9 @@ in pywal = with python3Packages; toPythonApplication pywal; - rbw = callPackage ../tools/security/rbw { }; + rbw = callPackage ../tools/security/rbw { + inherit (darwin.apple_sdk.frameworks) Security; + }; remarshal = callPackage ../development/tools/remarshal { }; @@ -6845,6 +6813,8 @@ in samplicator = callPackage ../tools/networking/samplicator { }; + sandboxfs = callPackage ../tools/filesystems/sandboxfs { }; + sasquatch = callPackage ../tools/filesystems/sasquatch { }; sasview = callPackage ../applications/science/misc/sasview {}; @@ -7081,6 +7051,8 @@ in soapui = callPackage ../applications/networking/soapui { }; + ssh-askpass-fullscreen = callPackage ../tools/networking/ssh-askpass-fullscreen { }; + sshguard = callPackage ../tools/security/sshguard {}; sshping = callPackage ../tools/networking/sshping {}; @@ -7307,6 +7279,8 @@ in t = callPackage ../tools/misc/t { }; + tabnine = callPackage ../development/tools/tabnine { }; + t1utils = callPackage ../tools/misc/t1utils { }; talkfilters = callPackage ../misc/talkfilters {}; @@ -8579,9 +8553,7 @@ in cmucl_binary = pkgsi686Linux.callPackage ../development/compilers/cmucl/binary.nix { }; - compcert = callPackage ../development/compilers/compcert { - inherit (coqPackages_8_10) coq; - }; + compcert = callPackage ../development/compilers/compcert {}; computecpp-unwrapped = callPackage ../development/compilers/computecpp {}; computecpp = wrapCCWith rec { @@ -9364,6 +9336,8 @@ in asciidoc = asciidoc-full; }; + knightos-patchrom = callPackage ../development/tools/knightos/patchrom { }; + knightos-scas = callPackage ../development/tools/knightos/scas { }; kotlin = callPackage ../development/compilers/kotlin { }; @@ -9372,6 +9346,11 @@ in fpc = fpc; }; + lazarus-qt = libsForQt5.callPackage ../development/compilers/fpc/lazarus.nix { + fpc = fpc; + withQt = true; + }; + lessc = nodePackages.less; liquibase = callPackage ../development/tools/database/liquibase { }; @@ -9393,7 +9372,7 @@ in lld_10 = llvmPackages_10.lld; lld_11 = llvmPackages_11.lld; - lldb = llvmPackages.lldb; + lldb = llvmPackages_latest.lldb; lldb_5 = llvmPackages_5.lldb; lldb_6 = llvmPackages_6.lldb; lldb_7 = llvmPackages_7.lldb; @@ -9596,9 +9575,11 @@ in picat = callPackage ../development/compilers/picat { }; ponyc = callPackage ../development/compilers/ponyc { - llvm = llvm_7; + # Upstream pony has dropped support for versions compiled with gcc. + stdenv = clangStdenv; }; + pony-corral = callPackage ../development/compilers/ponyc/pony-corral.nix { }; pony-stable = callPackage ../development/compilers/ponyc/pony-stable.nix { }; qbe = callPackage ../development/compilers/qbe { }; @@ -10124,19 +10105,21 @@ in octave = callPackage ../development/interpreters/octave { python = python3; + mkDerivation = stdenv.mkDerivation; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; octave-jit = callPackage ../development/interpreters/octave { python = python3; enableJIT = true; + mkDerivation = stdenv.mkDerivation; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - octaveFull = (lowPrio (libsForQt512.callPackage ../development/interpreters/octave { + octaveFull = libsForQt5.callPackage ../development/interpreters/octave { python = python3; enableQt = true; overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - })); + }; ocropus = callPackage ../applications/misc/ocropus { }; @@ -10380,6 +10363,7 @@ in })); spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { }; spidermonkey_68 = callPackage ../development/interpreters/spidermonkey/68.nix { }; + spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { }; spidermonkey = spidermonkey_38; ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; @@ -10779,6 +10763,8 @@ in chruby = callPackage ../development/tools/misc/chruby { rubies = null; }; + chruby-fish = callPackage ../development/tools/misc/chruby-fish { }; + cl-launch = callPackage ../development/tools/misc/cl-launch {}; cloud-nuke = callPackage ../development/tools/cloud-nuke { }; @@ -11177,7 +11163,7 @@ in iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils { }; ikos = callPackage ../development/tools/analysis/ikos { - inherit (llvmPackages_7) stdenv clang llvm; + inherit (llvmPackages_9) stdenv clang llvm; }; include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { @@ -11210,6 +11196,8 @@ in jenkins-job-builder = with python3Packages; toPythonApplication jenkins-job-builder; + jpexs = callPackage ../development/tools/jpexs { }; + julius = callPackage ../games/julius { }; augustus = callPackage ../games/augustus { }; @@ -11533,6 +11521,7 @@ in rolespec = callPackage ../development/tools/misc/rolespec { }; rr = callPackage ../development/tools/analysis/rr { }; + rr-unstable = callPackage ../development/tools/analysis/rr/unstable.nix { }; # This is a temporary attribute, please see the corresponding file for details. samurai = callPackage ../development/tools/build-managers/samurai { }; @@ -11542,6 +11531,8 @@ in scaff = callPackage ../development/tools/scaff { }; + sd-local = callPackage ../development/tools/sd-local { }; + selenium-server-standalone = callPackage ../development/tools/selenium/server { }; selendroid = callPackage ../development/tools/selenium/selendroid { }; @@ -11847,6 +11838,8 @@ in adns = callPackage ../development/libraries/adns { }; + adslib = callPackage ../development/libraries/adslib { }; + afflib = callPackage ../development/libraries/afflib { }; aften = callPackage ../development/libraries/aften { }; @@ -11891,6 +11884,10 @@ in argp-standalone = callPackage ../development/libraries/argp-standalone {}; + aribb25 = callPackage ../development/libraries/aribb25 { + inherit (darwin.apple_sdk.frameworks) PCSC; + }; + armadillo = callPackage ../development/libraries/armadillo {}; arrayfire = callPackage ../development/libraries/arrayfire {}; @@ -13924,9 +13921,7 @@ in libmilter = callPackage ../development/libraries/libmilter { }; - libminc = callPackage ../development/libraries/libminc { - hdf5 = hdf5_1_8; - }; + libminc = callPackage ../development/libraries/libminc { }; libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; @@ -14072,7 +14067,7 @@ in libqalculate = callPackage ../development/libraries/libqalculate { }; - libqt5pas = callPackage ../development/compilers/fpc/libqt5pas.nix { }; + libqt5pas = libsForQt5.callPackage ../development/compilers/fpc/libqt5pas.nix { }; libroxml = callPackage ../development/libraries/libroxml { }; @@ -14662,6 +14657,7 @@ in inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; }; opencascade-occt = callPackage ../development/libraries/opencascade-occt { }; + opencascade-occt730 = callPackage ../development/libraries/opencascade-occt/7.3.nix { }; opencl-headers = callPackage ../development/libraries/opencl-headers { }; @@ -14706,7 +14702,9 @@ in opendmarc = callPackage ../development/libraries/opendmarc { }; - ois = callPackage ../development/libraries/ois {}; + ois = callPackage ../development/libraries/ois { + inherit (darwin.apple_sdk.frameworks) Cocoa IOKit Kernel; + }; openh264 = callPackage ../development/libraries/openh264 { }; @@ -15138,8 +15136,6 @@ in telepathy = callPackage ../development/libraries/telepathy/qt { }; - vlc = callPackage ../applications/video/vlc {}; - qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { }; }; @@ -16503,9 +16499,7 @@ in gofish = callPackage ../servers/gopher/gofish { }; - grafana = callPackage ../servers/monitoring/grafana { - buildGoModule = buildGo114Module; - }; + grafana = callPackage ../servers/monitoring/grafana { }; grafana-loki = callPackage ../servers/monitoring/loki { buildGoPackage = buildGo114Package; @@ -16513,6 +16507,8 @@ in grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; + gerbera = callPackage ../servers/gerbera { }; + gobetween = callPackage ../servers/gobetween { }; h2o = callPackage ../servers/http/h2o { }; @@ -16521,7 +16517,7 @@ in hashi-ui = callPackage ../servers/hashi-ui {}; - hasura-graphql-engine = haskellPackages.graphql-engine; + hasura-graphql-engine = haskell.lib.justStaticExecutables haskellPackages.graphql-engine; hasura-cli = callPackage ../servers/hasura/cli.nix { }; @@ -16566,7 +16562,7 @@ in jitsi-videobridge = callPackage ../servers/jitsi-videobridge { }; - kapow = callPackage ../servers/kapow { }; + kapowbang = callPackage ../servers/kapowbang { }; keycloak = callPackage ../servers/keycloak { }; @@ -16948,7 +16944,7 @@ in asciidoc = asciidoc-full; }; - timescale-prometheus = callPackage ../servers/monitoring/timescale-prometheus { }; + promscale = callPackage ../servers/monitoring/prometheus/promscale.nix { }; timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { }; @@ -16960,6 +16956,7 @@ in postgresql_10 postgresql_11 postgresql_12 + postgresql_13 ; postgresql = postgresql_11.override { this = postgresql; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; @@ -17535,6 +17532,8 @@ in gomp = callPackage ../applications/version-management/gomp { }; + gomplate = callPackage ../development/tools/gomplate {}; + gpm = callPackage ../servers/gpm { ncurses = null; # Keep curses disabled for lack of value }; @@ -18102,7 +18101,7 @@ in # Hardened Linux hardenedLinuxPackagesFor = kernel': overrides: let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: - linux_latest_for_hardened = pkgs.linux_5_7; + linux_latest_for_hardened = pkgs.linux_5_8; kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; in linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { @@ -18644,9 +18643,6 @@ in ubootWandboard ; - # Non-upstream U-Boots: - ubootNanonote = callPackage ../misc/uboot/nanonote.nix { }; - uclibc = callPackage ../os-specific/linux/uclibc { }; uclibcCross = callPackage ../os-specific/linux/uclibc { @@ -19855,6 +19851,8 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; }; + blogc = callPackage ../applications/misc/blogc { }; + bluefish = callPackage ../applications/editors/bluefish { gtk = gtk3; }; @@ -20133,8 +20131,6 @@ in das_watchdog = callPackage ../tools/system/das_watchdog { }; - dbvisualizer = callPackage ../applications/misc/dbvisualizer {}; - dd-agent = callPackage ../tools/networking/dd-agent/5.nix { }; datadog-agent = callPackage ../tools/networking/dd-agent/datadog-agent.nix { pythonPackages = datadog-integrations-core {}; @@ -20794,7 +20790,10 @@ in freecad = libsForQt514.callPackage ../applications/graphics/freecad { mpi = openmpi; - # pyside2 5.12 is broken under python 3.8 + }; + freecadStable = libsForQt514.callPackage ../applications/graphics/freecad/stable.nix { + mpi = openmpi; + opencascade-occt = opencascade-occt730; python3Packages = python37Packages; }; @@ -20964,8 +20963,6 @@ in gnunet = callPackage ../applications/networking/p2p/gnunet { }; - gnunet_git = lowPrio (callPackage ../applications/networking/p2p/gnunet/git.nix { }); - gnunet-gtk = callPackage ../applications/networking/p2p/gnunet/gtk.nix { }; gocr = callPackage ../applications/graphics/gocr { }; @@ -21231,9 +21228,7 @@ in swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { }; - waybar = callPackage ../applications/misc/waybar { - pulseSupport = config.pulseaudio or false; - }; + waybar = callPackage ../applications/misc/waybar { }; hikari = callPackage ../applications/window-managers/hikari { }; @@ -21501,6 +21496,8 @@ in kapitonov-plugins-pack = callPackage ../applications/audio/kapitonov-plugins-pack { }; + kapow = libsForQt5.callPackage ../applications/misc/kapow { }; + kdeApplications = let mkApplications = import ../applications/kde; @@ -21652,6 +21649,8 @@ in kubeless = callPackage ../applications/networking/cluster/kubeless { }; + kubelogin = callPackage ../applications/networking/cluster/kubelogin { }; + k9s = callPackage ../applications/networking/cluster/k9s { }; popeye = callPackage ../applications/networking/cluster/popeye { }; @@ -21871,6 +21870,8 @@ in lynx = callPackage ../applications/networking/browsers/lynx { }; + lyrebird = callPackage ../applications/audio/lyrebird { }; + lyx = libsForQt5.callPackage ../applications/misc/lyx { }; mac = callPackage ../development/libraries/mac { }; @@ -22231,6 +22232,8 @@ in ninjas2 = callPackage ../applications/audio/ninjas2 {}; + nncp = callPackage ../tools/misc/nncp { }; + notion = callPackage ../applications/window-managers/notion { }; nootka = qt5.callPackage ../applications/audio/nootka { }; @@ -22381,7 +22384,7 @@ in imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix { lua = lua5; - }; + }; maxlib = callPackage ../applications/audio/pd-plugins/maxlib { }; @@ -22981,11 +22984,13 @@ in pkgs_ = pkgs.extend(_: prev: { pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { pkgs = oldAttrs.pkgs.extend(_: _: { - inherit (pkgs) qt5 libsForQt5; + inherit (pkgs) qt5 libsForQt514; }); }); }); - in pkgs_.libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { }; + in pkgs_.libsForQt514.callPackage ../applications/networking/browsers/qutebrowser { }; + + qxw = callPackage ../applications/editors/qxw {}; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; @@ -23065,6 +23070,10 @@ in rofi-systemd = callPackage ../tools/system/rofi-systemd { }; + rofimoji = callPackage ../applications/misc/rofimoji { + inherit (python3Packages) buildPythonApplication ConfigArgParse pyxdg; + }; + rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; rpcs3 = libsForQt514.callPackage ../misc/emulators/rpcs3 { }; @@ -23453,9 +23462,7 @@ in # this can be changed to python3 once pyside2 is updated to support the latest python version syncplay = python37.pkgs.callPackage ../applications/networking/syncplay { }; - inherit (callPackages ../applications/networking/syncthing { - buildGoModule = buildGo114Module; - }) + inherit (callPackages ../applications/networking/syncthing { }) syncthing syncthing-cli syncthing-discovery @@ -23585,6 +23592,7 @@ in thonny = callPackage ../applications/editors/thonny { }; + thunderbird = thunderbird-78; thunderbird-78 = callPackage ../applications/networking/mailreaders/thunderbird { inherit (rustPackages_1_44) cargo rustc; libpng = libpng_apng; @@ -23593,7 +23601,7 @@ in gtk3Support = true; }; - thunderbird = callPackage ../applications/networking/mailreaders/thunderbird/68.nix { + thunderbird-68 = callPackage ../applications/networking/mailreaders/thunderbird/68.nix { inherit (rustPackages_1_44) cargo rustc; libpng = libpng_apng; nss = nss_3_44; @@ -23602,9 +23610,10 @@ in thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; + thunderbird-bin = thunderbird-bin-78; thunderbird-bin-78 = callPackage ../applications/networking/mailreaders/thunderbird-bin { }; - thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin/68.nix { }; + thunderbird-bin-68 = callPackage ../applications/networking/mailreaders/thunderbird-bin/68.nix { }; ticpp = callPackage ../development/libraries/ticpp { }; @@ -23796,7 +23805,7 @@ in vimiv = callPackage ../applications/graphics/vimiv { }; - macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; }; + macvim = callPackage ../applications/editors/vim/macvim-configurable.nix { stdenv = clangStdenv; }; vimHugeX = vim_configurable; @@ -23828,7 +23837,7 @@ in neovim = wrapNeovim neovim-unwrapped { }; - neovim-qt = libsForQt514.callPackage ../applications/editors/neovim/qt.nix { }; + neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; olifant = callPackage ../applications/misc/olifant { }; @@ -23924,10 +23933,19 @@ in vkeybd = callPackage ../applications/audio/vkeybd {}; - vlc = libsForQt514.vlc; + vlc = libsForQt514.callPackage ../applications/video/vlc {}; vlc_qt5 = vlc; + libvlc = vlc.override { + withQt5 = false; + qtbase = null; + qtsvg = null; + qtx11extras = null; + wrapQtAppsHook = null; + onlyLibVLC = true; + }; + vmpk = callPackage ../applications/audio/vmpk { }; vocproc = callPackage ../applications/audio/vocproc { }; @@ -25705,6 +25723,7 @@ in gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { }; icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { }; impatience = callPackage ../desktops/gnome-3/extensions/impatience { }; + material-shell = callPackage ../desktops/gnome-3/extensions/material-shell { }; mpris-indicator-button = callPackage ../desktops/gnome-3/extensions/mpris-indicator-button { }; night-theme-switcher = callPackage ../desktops/gnome-3/extensions/night-theme-switcher { }; no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { }; @@ -26514,6 +26533,8 @@ in ngspice = callPackage ../applications/science/electronics/ngspice { }; + openems = callPackage ../applications/science/electronics/openems { }; + pcb = callPackage ../applications/science/electronics/pcb { }; qcsxcad = libsForQt514.callPackage ../applications/science/electronics/qcsxcad { }; @@ -27008,6 +27029,8 @@ in idsk = callPackage ../tools/filesystems/idsk { }; + logtop = callPackage ../tools/misc/logtop { }; + igraph = callPackage ../development/libraries/igraph { }; igprof = callPackage ../development/tools/misc/igprof { }; @@ -27612,6 +27635,8 @@ in terragrunt = callPackage ../applications/networking/cluster/terragrunt {}; + terranix = callPackage ../applications/networking/cluster/terranix {}; + tilt = callPackage ../applications/networking/cluster/tilt {}; timeular = callPackage ../applications/office/timeular {}; @@ -28182,4 +28207,6 @@ in fac-build = callPackage ../development/tools/build-managers/fac {}; + bottom = callPackage ../tools/system/bottom {}; + } diff --git a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix index c6c75cd7ff..fe6cd81f9e 100644 --- a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix @@ -59,6 +59,7 @@ let tlc = callPackage ../development/coq-modules/tlc {}; Velisarios = callPackage ../development/coq-modules/Velisarios {}; Verdi = callPackage ../development/coq-modules/Verdi {}; + VST = callPackage ../development/coq-modules/VST {}; filterPackages = filterCoqPackages; }; diff --git a/third_party/nixpkgs/pkgs/top-level/default.nix b/third_party/nixpkgs/pkgs/top-level/default.nix index 904ef8d397..dfa68ba31b 100644 --- a/third_party/nixpkgs/pkgs/top-level/default.nix +++ b/third_party/nixpkgs/pkgs/top-level/default.nix @@ -38,6 +38,9 @@ # environment. See below for the arguments given to that function, the type of # list it returns. stdenvStages ? import ../stdenv + +, # Ignore unexpected args. + ... } @ args: let # Rename the function arguments diff --git a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix index 3e85109527..693f8fe827 100644 --- a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -5,6 +5,7 @@ let integerSimpleExcludes = [ "ghc822Binary" "ghc865Binary" + "ghc8102Binary" "ghcjs" "ghcjs86" "integer-simple" @@ -49,6 +50,10 @@ in { ghc865Binary = callPackage ../development/compilers/ghc/8.6.5-binary.nix { }; + ghc8102Binary = callPackage ../development/compilers/ghc/8.10.2-binary.nix { + llvmPackages = pkgs.llvmPackages_9; + }; + ghc865 = callPackage ../development/compilers/ghc/8.6.5.nix { bootPkgs = packages.ghc822Binary; inherit (buildPackages.python3Packages) sphinx; @@ -85,6 +90,12 @@ in { buildLlvmPackages = buildPackages.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; }; + ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { + bootPkgs = packages.ghc8102Binary; + inherit (buildPackages.python3Packages) sphinx; + buildLlvmPackages = buildPackages.llvmPackages_10; + llvmPackages = pkgs.llvmPackages_10; + }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = packages.ghc883; # no binary yet inherit (buildPackages.python3Packages) sphinx; @@ -139,6 +150,12 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; packageSetConfig = bootstrapPackageSet; }; + ghc8102Binary = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc8102Binary; + ghc = bh.compiler.ghc8102Binary; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; + packageSetConfig = bootstrapPackageSet; + }; ghc865 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc865; ghc = bh.compiler.ghc865; @@ -169,6 +186,11 @@ in { ghc = bh.compiler.ghc8102; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; }; + ghc901 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc901; + ghc = bh.compiler.ghc901; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { }; + }; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; diff --git a/third_party/nixpkgs/pkgs/top-level/impure.nix b/third_party/nixpkgs/pkgs/top-level/impure.nix index 88440f711d..3ba6c08a14 100644 --- a/third_party/nixpkgs/pkgs/top-level/impure.nix +++ b/third_party/nixpkgs/pkgs/top-level/impure.nix @@ -81,7 +81,7 @@ in # not be passed. assert args ? localSystem -> !(args ? system || args ? platform); -import ./. (builtins.removeAttrs args [ "system" "platform" "inNixShell" ] // { +import ./. (builtins.removeAttrs args [ "system" "platform" ] // { inherit config overlays crossSystem crossOverlays; # Fallback: Assume we are building packages on the current (build, in GNU # Autotools parlance) system. diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index ae1fe050b8..95c1bb300a 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -993,6 +993,10 @@ let yojson = callPackage ../development/ocaml-modules/yojson { }; + z3 = callPackage ../development/ocaml-modules/z3 { + inherit (pkgs) z3; + }; + zarith = callPackage ../development/ocaml-modules/zarith { }; zed = callPackage ../development/ocaml-modules/zed { }; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index 64fc2011ff..c9b6f78364 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -1268,6 +1268,54 @@ let buildInputs = [ ExtUtilsCppGuess ExtUtilsTypemapsDefault ExtUtilsXSpp ModuleBuildWithXSpp ]; }; + BotTraining = buildPerlPackage { + pname = "Bot-Training"; + version = "0.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AV/AVAR/Bot-Training-0.07.tar.gz"; + sha256 = "ee66bbf814f0dc3d1e80680e050fad10b1e018fed7929f653ed40e088b2aa295"; + }; + buildInputs = [ FileSlurp ]; + propagatedBuildInputs = [ ClassLoad DirSelf FileShareDir ModulePluggable MooseXGetopt namespaceclean ]; + meta = { + homepage = "http://metacpan.org/release/Bot-Training"; + description = "Plain text training material for bots like Hailo and AI::MegaHAL"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + BotTrainingMegaHAL = buildPerlPackage { + pname = "Bot-Training-MegaHAL"; + version = "0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AV/AVAR/Bot-Training-MegaHAL-0.03.tar.gz"; + sha256 = "956072aff04f216e5c3b8196965b5d80d4d47695d77ecaabd56e59d65f22bf60"; + }; + buildInputs = [ FileShareDirInstall ]; + propagatedBuildInputs = [ BotTraining ]; + meta = { + homepage = "http://metacpan.org/release/Bot-Training-MegaHAL"; + description = "Provide megahal.trn via Bot::Training"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + BotTrainingStarCraft = buildPerlPackage { + pname = "Bot-Training-StarCraft"; + version = "0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AV/AVAR/Bot-Training-StarCraft-0.03.tar.gz"; + sha256 = "e7ceb8d01c62e732dd89bfe5f4d83e781c1cd912542d177c22e761b7c8614d5e"; + }; + buildInputs = [ FileShareDirInstall ]; + propagatedBuildInputs = [ BotTraining ]; + meta = { + homepage = "http://metacpan.org/release/Bot-Training-StarCraft"; + description = "Provide starcraft.trn via Bot::Training"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + BSDResource = buildPerlPackage { pname = "BSD-Resource"; version = "1.2911"; @@ -3993,7 +4041,7 @@ let sha256 = "ea64a1e9eb42f3d79855a392e7cca6b86e8e0bcc9aabcc5efa5fa32415b67dba"; }; meta = { - homepage = "http://wiki.github.com/toddr/Crypt-RIPEMD160"; + homepage = "https://wiki.github.com/toddr/Crypt-RIPEMD160"; description = "Perl extension for the RIPEMD-160 Hash function"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; @@ -6140,6 +6188,20 @@ let }; }; + DirSelf = buildPerlPackage { + pname = "Dir-Self"; + version = "0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MAUKE/Dir-Self-0.11.tar.gz"; + sha256 = "e251a51abc7d9ba3e708f73c2aa208e09d47a0c528d6254710fa78cc8d6885b5"; + }; + meta = { + homepage = "https://github.com/mauke/Dir-Self"; + description = "A __DIR__ constant for the directory your source file is in"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DispatchClass = buildPerlPackage { pname = "Dispatch-Class"; version = "0.02"; @@ -7109,6 +7171,20 @@ let }; }; + ExpectSimple = buildPerlPackage { + pname = "Expect-Simple"; + version = "0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DJ/DJERIUS/Expect-Simple-0.04.tar.gz"; + sha256 = "af83b92185e642695913ff138efe819752e80857759996deafcaab2700ad5db5"; + }; + propagatedBuildInputs = [ Expect ]; + meta = { + description = "Wrapper around the Expect module"; + license = stdenv.lib.licenses.free; + }; + }; + ExtUtilsCChecker = buildPerlModule { pname = "ExtUtils-CChecker"; version = "0.10"; @@ -7508,6 +7584,19 @@ let }; }; + FileCountLines = buildPerlPackage { + pname = "File-CountLines"; + version = "0.0.3"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MO/MORITZ/File-CountLines-v0.0.3.tar.gz"; + sha256 = "cfd97cce7c9613e4e569d47874a2b5704f1be9eced2f0739c870725694382a62"; + }; + meta = { + description = "Efficiently count the number of line breaks in a file"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + FileDesktopEntry = buildPerlPackage { version = "0.22"; pname = "File-DesktopEntry"; @@ -8824,6 +8913,29 @@ let }; }; + Hailo = buildPerlPackage { + pname = "Hailo"; + version = "0.75"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AV/AVAR/Hailo-0.75.tar.gz"; + sha256 = "bba99cb0cfa3ee8632dd89906c6e6fa05fe6bb367f2282e88909cefd8f9174c2"; + }; + buildInputs = [ BotTrainingMegaHAL BotTrainingStarCraft DataSection FileSlurp PodSection TestException TestExpect TestOutput TestScript TestScriptRun ]; + propagatedBuildInputs = [ ClassLoad DBDSQLite DataDump DirSelf FileCountLines GetoptLongDescriptive IOInteractive IPCSystemSimple ListMoreUtils Moose MooseXGetopt MooseXStrictConstructor MooseXTypes RegexpCommon TermSk namespaceclean ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + postPatch = '' + patchShebangs bin + ''; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/hailo + ''; + meta = { + homepage = "https://github.com/hailo/hailo"; + description = "A pluggable Markov engine analogous to MegaHAL"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + HashDiff = buildPerlPackage { pname = "Hash-Diff"; version = "0.010"; @@ -9669,6 +9781,21 @@ let }; }; + ImagerQRCode = buildPerlPackage { + pname = "Imager-QRCode"; + version = "0.035"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KU/KURIHARA/Imager-QRCode-0.035.tar.gz"; + sha256 = "2a848deba29eb3942c44709a6853e318acab0c468cbfedbb9baae54760032513"; + }; + propagatedBuildInputs = [ Imager ]; + meta = { + description = "Generate QR Code with Imager using libqrencode"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ sgo ]; + }; + }; + ImageInfo = buildPerlPackage { pname = "Image-Info"; version = "1.42"; @@ -10149,7 +10276,7 @@ let sha256 = "c7d6311eb6c79e983833c9e6b4e8d426d07a9874d20f4bc641b313b99c9bc8a0"; }; meta = { - homepage = "http://metacpan.org/release/IRC-Utils"; + homepage = "https://metacpan.org/release/IRC-Utils"; description = "Common utilities for IRC-related tasks"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ sgo ]; @@ -10763,10 +10890,10 @@ let LinkEmbedder = buildPerlPackage { pname = "LinkEmbedder"; - version = "1.12"; + version = "1.14"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.12.tar.gz"; - sha256 = "1fd25bd6047b45cdcb1ab71a3d3bb0b36c71ec844a8742dee0bb34f8587fbd08"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.14.tar.gz"; + sha256 = "1dzbh40g773ivawn1smii6jz3kisz07pcn9sbqarc857q5zaf8dq"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ Mojolicious ]; @@ -12725,6 +12852,72 @@ let }; }; + ModuleInstallGithubMeta = buildPerlPackage { + pname = "Module-Install-GithubMeta"; + version = "0.30"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BI/BINGOS/Module-Install-GithubMeta-0.30.tar.gz"; + sha256 = "2ead44c973c748d72d9f199e41c44dc1801fe9ae06b0fadc59447693a3c98281"; + }; + buildInputs = [ CaptureTiny ]; + propagatedBuildInputs = [ ModuleInstall ]; + meta = { + homepage = "https://github.com/bingos/module-install-githubmeta/"; + description = "A Module::Install extension to include GitHub meta information in META.yml"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + + ModuleInstallReadmeFromPod = buildPerlPackage { + pname = "Module-Install-ReadmeFromPod"; + version = "0.30"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BI/BINGOS/Module-Install-ReadmeFromPod-0.30.tar.gz"; + sha256 = "79f6df5536619faffbda696bdd25ccad17c469bf32e51cd3e613366d49400169"; + }; + buildInputs = [ TestInDistDir ]; + propagatedBuildInputs = [ CaptureTiny IOAll ModuleInstall PodMarkdown ]; + meta = { + homepage = "https://github.com/bingos/module-install-readmefrompod/"; + description = "A Module::Install extension to automatically convert POD to a README"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + + ModuleInstallReadmeMarkdownFromPod = buildPerlPackage { + pname = "Module-Install-ReadmeMarkdownFromPod"; + version = "0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MATTN/Module-Install-ReadmeMarkdownFromPod-0.04.tar.gz"; + sha256 = "300b2e244f83b9a54a95f8404c1cd3af0635b4fae974ca65390ee428ec668591"; + }; + buildInputs = [ URI ]; + propagatedBuildInputs = [ ModuleInstall PodMarkdown ]; + meta = { + homepage = "http://search.cpan.org/dist/Module-Install-ReadmeMarkdownFromPod/"; + description = "Create README.mkdn from POD"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + + ModuleInstallRepository = buildPerlPackage { + pname = "Module-Install-Repository"; + version = "0.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Module-Install-Repository-0.06.tar.gz"; + sha256 = "00e2590d09339ccccbdaa328d12ad8ec77e831a38c9ad663705e59ecbb18722b"; + }; + buildInputs = [ PathClass ]; + meta = { + description = "Automatically sets repository URL from svn/svk/Git checkout"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + ModuleManifest = buildPerlPackage { pname = "Module-Manifest"; version = "1.09"; @@ -12950,6 +13143,21 @@ let }; }; + MojoliciousPluginGravatar = buildPerlPackage { + pname = "Mojolicious-Plugin-Gravatar"; + version = "0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KO/KOORCHIK/Mojolicious-Plugin-Gravatar-0.04.tar.gz"; + sha256 = "a49f970c6c70f9930b304a752163cb95f1d998712f79cb13640832e4b7b675dd"; + }; + propagatedBuildInputs = [ Mojolicious ]; + meta = { + description = "Globally Recognized Avatars for Mojolicious"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ sgo ]; + }; + }; + MojoliciousPluginMail = buildPerlModule { pname = "Mojolicious-Plugin-Mail"; version = "1.5"; @@ -16485,6 +16693,20 @@ let }; }; + PodAbstract = buildPerlPackage { + pname = "Pod-Abstract"; + version = "0.20"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BL/BLILBURNE/Pod-Abstract-0.20.tar.gz"; + sha256 = "956ef7bb884c55456e2fb6e7f229f9a87dd50a61d700500c738db8f2ba277f87"; + }; + propagatedBuildInputs = [ IOString TaskWeaken PodParser ]; + meta = { + description = "An abstract, tree-based interface to perl POD documents"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PodChecker = buildPerlPackage { pname = "Pod-Checker"; version = "1.73"; @@ -16608,6 +16830,21 @@ let }; }; + PodSection = buildPerlModule { + pname = "Pod-Section"; + version = "0.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KT/KTAT/Pod-Section-0.02.tar.gz"; + sha256 = "c9d1d75292f321881184ec56983c16f408fd2d312d5a720f8fb0d2cafa729238"; + }; + propagatedBuildInputs = [ PodAbstract ]; + meta = { + homepage = "https://github.com/ktat/Pod-Section"; + description = "Select specified section from Module's POD"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PodLaTeX = buildPerlModule { pname = "Pod-LaTeX"; version = "0.61"; @@ -17897,6 +18134,29 @@ let }; }; + StringDiff = buildPerlModule { + pname = "String-Diff"; + version = "0.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/Y/YA/YAPPO/String-Diff-0.07.tar.gz"; + sha256 = "7215b67cbc3226e2d0e18b38ec58c93be0bf6090278698bef955348826cd0af3"; + }; + patches = [ + (fetchpatch { + url = "https://salsa.debian.org/perl-team/modules/packages/libstring-diff-perl/-/raw/d8120a93f73f4d4aa40d10819b2f0a312608ca9b/debian/patches/0001-Fix-the-test-suite-for-YAML-1.21-compatibility.patch"; + sha256 = "0rggwcp7rfnp3zhnxpn5pb878v2dhpk3x6682w9dnsym92gjrij5"; + }) + ]; + buildInputs = [ TestBase ModuleBuildTiny ModuleInstallGithubMeta ModuleInstallRepository ModuleInstallReadmeFromPod ModuleInstallReadmeMarkdownFromPod YAML ]; + propagatedBuildInputs = [ AlgorithmDiff ]; + meta = { + homepage = "https://github.com/yappo/p5-String-Diff"; + description = "Simple diff to String"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + StringErrf = buildPerlPackage { pname = "String-Errf"; version = "0.008"; @@ -18300,7 +18560,7 @@ let meta = { description = "lib/Safe/Hole.pm"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "http://github.com/toddr/Safe-Hole"; + homepage = "https://github.com/toddr/Safe-Hole"; }; }; @@ -18890,6 +19150,19 @@ let }; }; + TermSk = buildPerlPackage { + pname = "Term-Sk"; + version = "0.18"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KE/KEICHNER/Term-Sk-0.18.tar.gz"; + sha256 = "f2e491796061205b08688802b287792d7d803b08972339fb1070ba05612af885"; + }; + meta = { + description = "Perl extension for displaying a progress indicator on a terminal."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TermUI = buildPerlPackage { pname = "Term-UI"; version = "0.46"; @@ -19266,6 +19539,20 @@ let propagatedBuildInputs = [ SubUplevel ]; }; + TestExpect = buildPerlPackage { + pname = "Test-Expect"; + version = "0.34"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BP/BPS/Test-Expect-0.34.tar.gz"; + sha256 = "2628fcecdda5f649bd25323f646b96a1a07e4557cadcb327c9bad4dc41bbb999"; + }; + propagatedBuildInputs = [ ClassAccessorChained ExpectSimple ]; + meta = { + description = "Automated driving and testing of terminal-based programs"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestFailWarnings = buildPerlPackage { pname = "Test-FailWarnings"; version = "0.008"; @@ -20121,6 +20408,20 @@ let propagatedBuildInputs = [ CaptureTiny ProbePerl ]; }; + TestScriptRun = buildPerlPackage { + pname = "Test-Script-Run"; + version = "0.08"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SU/SUNNAVY/Test-Script-Run-0.08.tar.gz"; + sha256 = "1fef216e70bc425ace3e2c4370dfcdddb5e798b099efba2679244a4d5bc1ab0a"; + }; + propagatedBuildInputs = [ IPCRun3 TestException ]; + meta = { + description = "Test scripts with run"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestSharedFork = buildPerlPackage { pname = "Test-SharedFork"; version = "0.35"; @@ -20567,6 +20868,21 @@ let }; }; + TextDiffFormattedHTML = buildPerlPackage { + pname = "Text-Diff-FormattedHTML"; + version = "0.08"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AM/AMBS/Text-Diff-FormattedHTML-0.08.tar.gz"; + sha256 = "39ab775a5c056745f2abd8cc7c1cbc5496dfef7e52a9f4bd8ada6aa6c9c7b70d"; + }; + propagatedBuildInputs = [ FileSlurp StringDiff ]; + meta = { + description = "Generate a colorful HTML diff of strings/files"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + TextGerman = buildPerlPackage { pname = "Text-German"; version = "0.06"; @@ -20611,6 +20927,21 @@ let }; }; + TestInDistDir = buildPerlPackage { + pname = "Test-InDistDir"; + version = "1.112071"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MITHALDU/Test-InDistDir-1.112071.tar.gz"; + sha256 = "922c5c63314f406f4cbb35ec423ac2154d2c2b71a65addb7732c9d240a83fefb"; + }; + meta = { + homepage = "https://github.com/wchristian/Test-InDistDir"; + description = "Test environment setup for development with IDE"; + license = stdenv.lib.licenses.wtfpl; + maintainers = [ maintainers.sgo ]; + }; + }; + TestInter = buildPerlPackage { pname = "Test-Inter"; version = "1.09"; @@ -22148,6 +22479,23 @@ let doCheck = false; }; + XMLFilterSort = buildPerlPackage { + pname = "XML-Filter-Sort"; + version = "1.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GR/GRANTM/XML-Filter-Sort-1.01.tar.gz"; + sha256 = "sha256-UQWF85pJFszV+o1UXpYXnJHq9vx8l6QBp1aOhBFi+l8="; + }; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + propagatedBuildInputs = [ + XMLSAX + XMLSAXWriter + ]; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/xmlsort + ''; + }; + XMLGrove = buildPerlPackage { pname = "XML-Grove"; version = "0.46alpha"; diff --git a/third_party/nixpkgs/pkgs/top-level/php-packages.nix b/third_party/nixpkgs/pkgs/top-level/php-packages.nix index 578dcaf761..8f052ee87b 100644 --- a/third_party/nixpkgs/pkgs/top-level/php-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/php-packages.nix @@ -57,12 +57,41 @@ in }; composer = mkDerivation rec { - version = "1.10.8"; + version = "1.10.13"; pname = "composer"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "1rbqa56bsc3wrhk8djxdzh755zx1qrqp3wrdid7x0djzbmzp6h2c"; + sha256 = "13vhfdlkmpvmk1h30f1i688xk7sdgfj0b82am32jgpa8zmf499sw"; + }; + + dontUnpack = true; + + nativeBuildInputs = [ pkgs.makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/composer/composer.phar + makeWrapper ${php}/bin/php $out/bin/composer \ + --add-flags "$out/libexec/composer/composer.phar" \ + --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]} + ''; + + meta = with pkgs.lib; { + description = "Dependency Manager for PHP"; + license = licenses.mit; + homepage = "https://getcomposer.org/"; + maintainers = with maintainers; [ offline ] ++ teams.php.members; + }; + }; + + composer2 = mkDerivation rec { + version = "2.0.0-RC1"; + pname = "composer"; + + src = pkgs.fetchurl { + url = "https://getcomposer.org/download/${version}/composer.phar"; + sha256 = "0wzr360gaa59cbjpa3vw9yrpc55a4fmdv68q0rn7vj0mjnz60fhd"; }; dontUnpack = true; @@ -86,12 +115,12 @@ in }; php-cs-fixer = mkDerivation rec { - version = "2.16.3"; + version = "2.16.4"; pname = "php-cs-fixer"; src = pkgs.fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "195j61qbgbdn5xi0l6030mklji8m7fan2kf3446a1m2n4df3f5hb"; + sha256 = "05rdvypxc86hjs8b7id2csa7g1rf7dk2swzfvd5768abdgfasvr8"; }; phases = [ "installPhase" ]; @@ -232,12 +261,12 @@ in }; phpstan = mkDerivation rec { - version = "0.12.32"; + version = "0.12.48"; pname = "phpstan"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "0sb7yhjjh4wj8wbv4cdf0n1lvhx1ciz7ch8lr73maajj2xbvy1zk"; + sha256 = "170yzz23lyipyckv8y2x9masv5qdmbskwwlbfc8750xb3g2q7pzl"; }; phases = [ "installPhase" ]; @@ -492,13 +521,13 @@ in maxminddb = buildPecl rec { pname = "maxminddb"; - version = "1.6.0"; + version = "1.7.0"; src = pkgs.fetchFromGitHub { owner = "maxmind"; repo = "MaxMind-DB-Reader-php"; rev = "v${version}"; - sha256 = "0sa943ij9pgz55aik93lllb8lh063bvr66ibn77p3y3p41vdiabz"; + sha256 = "16msc9s15y43lxw89kj51aldlkd57dc8gms199i51jc984b68ljc"; }; buildInputs = [ pkgs.libmaxminddb ]; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index af2ec27f73..4928fdd7c1 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -146,6 +146,8 @@ in { aafigure = callPackage ../development/python-modules/aafigure { }; + abodepy = callPackage ../development/python-modules/abodepy { }; + absl-py = callPackage ../development/python-modules/absl-py { }; accupy = callPackage ../development/python-modules/accupy { }; @@ -164,8 +166,12 @@ in { adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { }; + adb-shell = callPackage ../development/python-modules/adb-shell { }; + addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; + adguardhome= callPackage ../development/python-modules/adguardhome { }; + aenum = callPackage ../development/python-modules/aenum { }; afdko = callPackage ../development/python-modules/afdko { }; @@ -228,6 +234,8 @@ in { aiomysql = callPackage ../development/python-modules/aiomysql { }; + aionotify = callPackage ../development/python-modules/aionotify { }; + aioprocessing = callPackage ../development/python-modules/aioprocessing { }; aioredis = callPackage ../development/python-modules/aioredis { }; @@ -276,6 +284,8 @@ in { amqplib = callPackage ../development/python-modules/amqplib { }; + androidtv = callPackage ../development/python-modules/androidtv { }; + androguard = callPackage ../development/python-modules/androguard { }; aniso8601 = callPackage ../development/python-modules/aniso8601 { }; @@ -494,6 +504,8 @@ in { aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; + azure-appconfiguration = callPackage ../development/python-modules/azure-appconfiguration { }; + azure-applicationinsights = callPackage ../development/python-modules/azure-applicationinsights { }; azure-batch = callPackage ../development/python-modules/azure-batch { }; @@ -520,6 +532,8 @@ in { azure-keyvault = callPackage ../development/python-modules/azure-keyvault { }; + azure-keyvault-administration = callPackage ../development/python-modules/azure-keyvault-administration { }; + azure-keyvault-certificates = callPackage ../development/python-modules/azure-keyvault-certificates { }; azure-keyvault-keys = callPackage ../development/python-modules/azure-keyvault-keys { }; @@ -1150,6 +1164,8 @@ in { ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; + class-registry = callPackage ../development/python-modules/class-registry { }; + cld2-cffi = callPackage ../development/python-modules/cld2-cffi { }; cleo = callPackage ../development/python-modules/cleo { }; @@ -1313,6 +1329,8 @@ in { cozy = callPackage ../development/python-modules/cozy { }; + cppheaderparser = callPackage ../development/python-modules/cppheaderparser { }; + cppy = callPackage ../development/python-modules/cppy { }; cram = callPackage ../development/python-modules/cram { }; @@ -1459,8 +1477,9 @@ in { datashape = callPackage ../development/python-modules/datashape { }; - datatable = - callPackage ../development/python-modules/datatable { inherit (pkgs.llvmPackages) openmp libcxx libcxxabi; }; + datatable = callPackage ../development/python-modules/datatable { + inherit (pkgs.llvmPackages) libcxx; + }; dateparser = callPackage ../development/python-modules/dateparser { }; @@ -1869,6 +1888,8 @@ in { entrance-with-router-features = callPackage ../development/python-modules/entrance { routerFeatures = true; }; + entrypoint2 = callPackage ../development/python-modules/entrypoint2 { }; + entrypoints = callPackage ../development/python-modules/entrypoints { }; enum34 = callPackage ../development/python-modules/enum34 { }; @@ -3479,6 +3500,8 @@ in { logzero = callPackage ../development/python-modules/logzero { }; + lomond = callPackage ../development/python-modules/lomond { }; + loo-py = callPackage ../development/python-modules/loo-py { }; lpod = callPackage ../development/python-modules/lpod { }; @@ -3815,6 +3838,8 @@ in { msgpack-numpy = callPackage ../development/python-modules/msgpack-numpy { }; + mss = callPackage ../development/python-modules/mss { }; + msrestazure = callPackage ../development/python-modules/msrestazure { }; msrest = callPackage ../development/python-modules/msrest { }; @@ -4050,6 +4075,8 @@ in { notify = callPackage ../development/python-modules/notify { }; + notify-py = callPackage ../development/python-modules/notify-py { }; + notmuch = callPackage ../development/python-modules/notmuch { inherit (pkgs) notmuch; }; nototools = callPackage ../data/fonts/noto-fonts/tools.nix { }; @@ -4471,6 +4498,8 @@ in { pkuseg = callPackage ../development/python-modules/pkuseg { }; + python-csxcad = callPackage ../development/python-modules/python-csxcad { }; + pkutils = callPackage ../development/python-modules/pkutils { }; plac = callPackage ../development/python-modules/plac { }; @@ -4675,6 +4704,8 @@ in { purepng = callPackage ../development/python-modules/purepng { }; + pure-python-adb = callPackage ../development/python-modules/pure-python-adb { }; + pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { }; purl = callPackage ../development/python-modules/purl { }; @@ -4705,6 +4736,8 @@ in { pyacoustid = callPackage ../development/python-modules/pyacoustid { }; + pyads = callPackage ../development/python-modules/pyads { }; + pyaes = callPackage ../development/python-modules/pyaes { }; pyairvisual = callPackage ../development/python-modules/pyairvisual { }; @@ -5395,6 +5428,8 @@ in { pysolr = callPackage ../development/python-modules/pysolr { }; + py-sonic = callPackage ../development/python-modules/py-sonic { }; + pysonos = callPackage ../development/python-modules/pysonos { }; pysoundfile = self.soundfile; # Alias added 23-06-2019 @@ -5737,6 +5772,8 @@ in { python-multipart = callPackage ../development/python-modules/python-multipart { }; + python-nest = callPackage ../development/python-modules/python-nest { }; + pythonnet = callPackage ../development/python-modules/pythonnet { # `mono >= 4.6` required to prevent crashes encountered with earlier versions. mono = pkgs.mono4; @@ -5892,6 +5929,10 @@ in { pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; + pyvips = callPackage ../development/python-modules/pyvips { + inherit (pkgs) pkg-config vips glib; + }; + pyvmomi = callPackage ../development/python-modules/pyvmomi { }; pyvoro = callPackage ../development/python-modules/pyvoro { }; @@ -6077,6 +6118,8 @@ in { requests-cache = callPackage ../development/python-modules/requests-cache { }; + requests-hawk = callPackage ../development/python-modules/requests-hawk { }; + requests = callPackage ../development/python-modules/requests { }; requests_download = callPackage ../development/python-modules/requests_download { }; @@ -6501,6 +6544,8 @@ in { jre = pkgs.jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; + skidl = callPackage ../development/python-modules/skidl { }; + sklearn-deap = callPackage ../development/python-modules/sklearn-deap { }; skorch = callPackage ../development/python-modules/skorch { }; @@ -6737,6 +6782,8 @@ in { sseclient = callPackage ../development/python-modules/sseclient { }; + sseclient-py = callPackage ../development/python-modules/sseclient-py { }; + sshpubkeys = callPackage ../development/python-modules/sshpubkeys { }; sshtunnel = callPackage ../development/python-modules/sshtunnel { }; @@ -6745,8 +6792,6 @@ in { sslyze = callPackage ../development/python-modules/sslyze { }; - starfish = callPackage ../development/python-modules/starfish { }; - starlette = callPackage ../development/python-modules/starlette { }; staticjinja = callPackage ../development/python-modules/staticjinja { }; @@ -6913,10 +6958,9 @@ in { tensorflow-build_2 = callPackage ../development/python-modules/tensorflow/2 { cudaSupport = pkgs.config.cudaSupport or false; - inherit (pkgs.linuxPackages) nvidia_x11; - cudatoolkit = pkgs.cudatoolkit_10; - cudnn = pkgs.cudnn_cudatoolkit_10; - nccl = pkgs.nccl_cudatoolkit_10; + cudatoolkit = pkgs.cudatoolkit_11; + cudnn = pkgs.cudnn_cudatoolkit_11; + nccl = pkgs.nccl_cudatoolkit_11; openssl = pkgs.openssl_1_1; inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; }; @@ -7198,6 +7242,8 @@ in { typeguard = callPackage ../development/python-modules/typeguard { }; + typer = callPackage ../development/python-modules/typer { }; + typesentry = callPackage ../development/python-modules/typesentry { }; typesystem = callPackage ../development/python-modules/typesystem { }; diff --git a/third_party/nixpkgs/pkgs/top-level/static.nix b/third_party/nixpkgs/pkgs/top-level/static.nix index 4fa5b92e95..865e5cf290 100644 --- a/third_party/nixpkgs/pkgs/top-level/static.nix +++ b/third_party/nixpkgs/pkgs/top-level/static.nix @@ -14,15 +14,18 @@ self: super: let inherit (super.stdenvAdapters) makeStaticBinaries makeStaticLibraries propagateBuildInputs; - inherit (super.lib) foldl optional flip id composeExtensions optionalAttrs; + inherit (super.lib) foldl optional flip id composeExtensions optionalAttrs optionalString; inherit (super) makeSetupHook; # Best effort static binaries. Will still be linked to libSystem, # but more portable than Nix store binaries. - makeStaticDarwin = stdenv: stdenv // { + makeStaticDarwin = stdenv_: let stdenv = stdenv_.override { + # extraBuildInputs are dropped in cross.nix, but darwin still needs them + extraBuildInputs = [ self.buildPackages.darwin.CF ]; + }; in stdenv // { mkDerivation = args: stdenv.mkDerivation (args // { NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") - + " -static-libgcc"; + + optionalString stdenv.cc.isGNU " -static-libgcc"; nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ (makeSetupHook { substitutions = { libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib";